Implemented working solution in the OXML layer

Benjamin-T · Benjamin-T · commit 84d926e12d4c · 2017-11-17T19:00:16.000+01:00
diff --git a/docx/document.py b/docx/document.py
@@ -23,24 +23,23 @@ class Document(ElementProxy):
     Use :func:`docx.Document` to open or create a document.
     """
 
-    __slots__ = ('_part', '__body', '_Bookmarks')
+    __slots__ = ('_part', '__body')
 
     def __init__(self, element, part):
         super(Document, self).__init__(element)
         self._part = part
         self.__body = None
-        self._Bookmarks = Bookmarks(self._element.body)
 
     def start_bookmark(self, name):
         bookmarkstart = self._body.add_bookmarkStart(name)
         return Bookmark(bookmarkstart)
 
-    def end_bookmark(self):
-        bookmarkend = self._body.add_bookmarkEnd()
+    def end_bookmark(self, name=None):
+        bookmarkend = self._body.add_bookmarkEnd(name)
         return Bookmark(bookmarkend)
 
     def bookmarks(self):
-        return self._Bookmarks  # (self._element.body)
+        return Bookmarks(self._element.body)
 
     def add_heading(self, text='', level=1):
         """
@@ -219,7 +218,6 @@ class _Body(BlockItemContainer):
     def __init__(self, body_elm, parent):
         super(_Body, self).__init__(body_elm, parent)
         self._body = body_elm
-        self._parent = parent
 
     def clear_content(self):
         """
@@ -233,11 +231,15 @@ def clear_content(self):
     def add_bookmarkStart(self, name):
         bookmarkStart = self._body._add_bookmarkStart()
         bookmarkStart.name = name
-        bookmarkStart.bmrk_id = self._parent._Bookmarks._next_id
+        bookmarkStart.bmrk_id = bookmarkStart._next_id
         return Bookmark(bookmarkStart)
 
-    def add_bookmarkEnd(self):
-        open_id = self._parent._Bookmarks._unclosed_bookmark
+    def add_bookmarkEnd(self, name=None):
+        
         bookmarkEnd = self._body._add_bookmarkEnd()
-        bookmarkEnd.bmrk_id = open_id
+        if name is not None:
+            bookmarkStart_id = bookmarkEnd.match_bookmarkstart(name)
+        else:
+            bookmarkStart_id = bookmarkEnd._next_id
+        bookmarkEnd.bmrk_id = bookmarkStart_id
         return Bookmark(bookmarkEnd)
diff --git a/docx/oxml/bookmark.py b/docx/oxml/bookmark.py
@@ -16,10 +16,32 @@ class CT_BookmarkStart(BaseOxmlElement):
     """
     name = RequiredAttribute('w:name', ST_String)
     bmrk_id = RequiredAttribute('w:id', ST_RelationshipId)
+    
+    @property
+    def _next_id(self):
+        root = self.getroottree().getroot()
+        return str(len(root.xpath('.//w:bookmarkStart')))
+
 
 
 class CT_BookmarkEnd(BaseOxmlElement):
     """
     The ``<w:bookmarkEnd>`` element
     """
     bmrk_id = RequiredAttribute('w:id', ST_RelationshipId)
+
+    @property
+    def _next_id(self):
+        root = self.getroottree().getroot()
+        return str(len(root.xpath('.//w:bookmarkStart')))
+
+    def match_bookmarkstart(self, name):
+        """Returns `w:bookmarkStart` element having matching name, None if not present."""
+        root_element = self.getroottree().getroot() 
+        matching_bookmarkStarts = root_element.xpath(
+            './/w:bookmarkStart[@w:name=\'%s\']' % name
+        )
+        if not matching_bookmarkStarts:
+            raise ValueError('Bookmark name not found')
+            return None
+        return matching_bookmarkStarts[0].bmrk_id
diff --git a/docx/text/bookmarks.py b/docx/text/bookmarks.py
@@ -47,19 +47,6 @@ def _bookmarkEnds(self):
     def _next_id(self):
         return str(len(self._bookmarkStarts))
 
-    
-    @property
-    def _unclosed_bookmark(self):
-        open_b = set(Bookmark(bmrk)._id for bmrk in self._bookmarkStarts)
-        closed = set(Bookmark(bmrk)._id for bmrk in self._bookmarkEnds)
-        check = open_b - closed
-        if len(self._bookmarkStarts) == 0:
-            raise ValueError('BookmarkEnd requested without a bookmarkStart present')
-        if len(check) == 0:
-            raise ValueError('No open bookmark found')
-        else:
-            return check.pop()
-
 class Bookmark(ElementProxy):
     def __init__(self, doc_element):
         super(Bookmark, self).__init__(doc_element)
