The end_bookmark now takes the Bookmark object as input.

Benjamin-T · Benjamin-T · commit e05d00268c86 · 2017-11-23T22:37:35.000+01:00
diff --git a/docx/document.py b/docx/document.py
@@ -224,14 +224,13 @@ def add_bookmarkStart(self, name):
         bookmarkStart = self._body._add_bookmarkStart()
         bookmarkStart.name = name
         bookmarkStart.bmrk_id = bookmarkStart._next_id
-        return Bookmark(bookmarkStart)
+        return bookmarkStart
 
-    def add_bookmarkEnd(self, name=None):
-        
+    def add_bookmarkEnd(self, bookmark=None):
         bookmarkEnd = self._body._add_bookmarkEnd()
-        if name is not None:
-            bookmarkStart_id = bookmarkEnd.match_bookmarkstart(name)
+        if bookmark is None:
+            bookmarkEnd.bmrk_id = bookmarkEnd._next_id
         else:
-            bookmarkStart_id = bookmarkEnd._next_id
-        bookmarkEnd.bmrk_id = bookmarkStart_id
-        return Bookmark(bookmarkEnd)
+            bookmarkEnd.bmrk_id = bookmark._id
+        return bookmarkEnd
+
diff --git a/docx/oxml/bookmark.py b/docx/oxml/bookmark.py
@@ -35,13 +35,13 @@ 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
+    # 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/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
@@ -35,16 +35,15 @@ def add_bookmarkStart(self, name):
         bookmarkStart = self._add_bookmarkStart()
         bookmarkStart.name = name
         bookmarkStart.bmrk_id = bookmarkStart._next_id
-        return Bookmark(bookmarkStart)
+        return bookmarkStart
 
-    def add_bookmarkEnd(self, name=None):
+    def add_bookmarkEnd(self, bookmark=None):
         bookmarkEnd = self._add_bookmarkEnd()
-        if name is not None:
-            bookmarkStart_id = bookmarkEnd.match_bookmarkstart(name)
+        if bookmark is None:
+            bookmarkEnd.bmrk_id = bookmarkEnd._next_id
         else:
-            bookmarkStart_id = bookmarkEnd._next_id
-        bookmarkEnd.bmrk_id = bookmarkStart_id
-        return Bookmark(bookmarkEnd)
+            bookmarkEnd.bmrk_id = bookmark._id
+        return bookmarkEnd
 
     @property
     def alignment(self):
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
@@ -40,16 +40,15 @@ def add_bookmarkStart(self, name):
         bookmarkStart = self._add_bookmarkStart()
         bookmarkStart.name = name
         bookmarkStart.bmrk_id = bookmarkStart._next_id
-        return Bookmark(bookmarkStart)
+        return bookmarkStart
 
-    def add_bookmarkEnd(self, name=None):
+    def add_bookmarkEnd(self, bookmark=None):
         bookmarkEnd = self._add_bookmarkEnd()
-        if name is not None:
-            bookmarkStart_id = bookmarkEnd.match_bookmarkstart(name)
+        if bookmark is None:
+            bookmarkEnd.bmrk_id = bookmarkEnd._next_id
         else:
-            bookmarkStart_id = bookmarkEnd._next_id
-        bookmarkEnd.bmrk_id = bookmarkStart_id
-        return Bookmark(bookmarkEnd)
+            bookmarkEnd.bmrk_id = bookmark._id
+        return bookmarkEnd
 
     def add_t(self, text):
         """
diff --git a/docx/text/bookmarks.py b/docx/text/bookmarks.py
@@ -51,7 +51,7 @@ class Bookmark(ElementProxy):
     def __init__(self, doc_element):
         super(Bookmark, self).__init__(doc_element)
         self._element = doc_element
-
+        
     @property
     def _id(self):
         return self._element.bmrk_id
@@ -67,8 +67,12 @@ def start_bookmark(self, name):
         bookmarkstart = self._element.add_bookmarkStart(name)
         return Bookmark(bookmarkstart)
 
-    def end_bookmark(self, name=None):
+    def end_bookmark(self, bookmark=None):
         if hasattr(self, '_body'):
             self._element = self._body
-        bookmarkend = self._element.add_bookmarkEnd(name)
+        bookmarkend = self._element.add_bookmarkEnd(bookmark)
+        if bookmark is None:
+            bookmarkend._next_id
+        else:
+            bookmarkend._id = bookmark._id
         return Bookmark(bookmarkend)
