Merge remote-tracking branch 'upstream/master'.

Author: pvc1989

README.md

@@ -13,32 +13,33 @@ $ pip install pdfbookmarker
 
 ## Usage
 
-1)  Turn to your target PDF (e.g. `MyBook.pdf`), record bookmark titles and page
-    numbers of the PDF into a TEXT file (e.g. `my_bookmarks.txt`) **by hand** 
-    with the following format:
+1. Turn to your target PDF (e.g. `MyBook.pdf`), record bookmark titles and page
+   numbers of the PDF into a TEXT file (e.g. `my_bookmarks.txt`) **by hand** 
+   with the following format:
 
     ```
     <nested level>"<bookmark title>"|<page number>
     ```
 
-For samples, see [`sample_bookmarks.txt`](./sample_bookmarks.txt).
+    For samples, see [sample_bookmarks.txt](sample_bookmarks.txt). (Offsets are also
+    supported, see [here](https://github.com/RussellLuo/pdfbookmarker/pull/7#issuecomment-711136889))
 
-2)  Generate a copy of `MyBook.pdf` with additional bookmarks file specified by
-    `my_bookmarks.txt`:
+2. Generate a copy of `MyBook.pdf` with additional bookmarks file specified by
+   `my_bookmarks.txt`:
 
     ```bash
     $ pdfbm MyBook.pdf my_bookmarks.txt
     ```
 
-An auto-detected, expected or suggested filename for bookmarks is `MyBook.txt`,
-when the input filenamne e.g. is `MyBook.pdf`.
-
-The default filename of the output PDF is `MyBook-new.pdf`; You, of course, can
-specify the filename explicitly:
-
-```bash
-$ pdfbm MyBook.pdf my_bookmarks.txt MyBook_with_bookmarks.pdf
-```
+    An auto-detected, expected or suggested filename for bookmarks is `MyBook.txt`,
+    when the input filenamne e.g. is `MyBook.pdf`.
+    
+    The default filename of the output PDF is `MyBook-new.pdf`; You, of course, can
+    specify the filename explicitly:
+    
+    ```bash
+    $ pdfbm MyBook.pdf my_bookmarks.txt MyBook_with_bookmarks.pdf
+    ```
 
 
 ## License

pdfbookmarker.py

@@ -120,20 +120,21 @@ def get_bookmarks_tree(bookmarks_filename):
     offset = 0
     prev_level = 0
     for line in codecs.open(bookmarks_filename, 'r', encoding='utf-8'):
-        if line[0:2] == '//':
+        line = line.strip()
+        if line.startswith('//'):
             try:
                 offset = int(line[2:])
             except ValueError:
                 pass
             continue
-        res = re.match(r'(\+*)\s*?"([^"]+)"\s*\|\s*(\d+)', line.strip())
+        res = re.match(r'(\+*)\s*?"([^"]+)"\s*\|\s*(\d+)', line)
         if res:
             pluses, title, page_num = res.groups()
             cur_level = len(pluses)  # plus count stands for level
             cur_node = (title, int(page_num) - 1 + offset, [])
 
             if not (0 < cur_level <= prev_level + 1):
-                raise Exception('plus (+) count is invalid here: %s' % line.strip())
+                raise Exception('plus (+) count is invalid here: %s' % line)
             else:
                 # append the current node into its parent node (with the level `cur_level` - 1)
                 latest_nodes[cur_level - 1].append(cur_node)