summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoost Kremers <joostkremers@fastmail.fm>2017-03-27 08:13:33 +0200
committerJoost Kremers <joostkremers@fastmail.fm>2017-03-27 08:13:33 +0200
commit489d5d800f7801f2182780159fdc494ada79ffe6 (patch)
tree28418a7e16071738e8ebad1b273a81be313af49c
parentb501cdd8bea52579d67e309d4f4c36587cf85649 (diff)
Support @comments without braces.
BibTeX allows @comments to end at eol; these don't require braces.
-rw-r--r--parsebib.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/parsebib.el b/parsebib.el
index ae32a1f..9cd89c9 100644
--- a/parsebib.el
+++ b/parsebib.el
@@ -386,7 +386,7 @@ at the end of the buffer.
POS can be a number or a marker and defaults to point."
(when pos (goto-char pos))
(when (re-search-forward parsebib--entry-start nil 0)
- (if (parsebib--looking-at-goto-end (concat "\\(" parsebib--bibtex-identifier "\\)" "[[:space:]]*[\(\{]") 1)
+ (if (parsebib--looking-at-goto-end (concat "\\(" parsebib--bibtex-identifier "\\)" "[[:space:]]*[\(\{]?") 1)
(match-string-no-properties 1)
(signal 'parsebib-entry-type-error (list (point))))))
@@ -401,11 +401,12 @@ beginning of the line POS is on. If POS is nil, it defaults to
point."
(when pos (goto-char pos))
(beginning-of-line)
- (when (parsebib--looking-at-goto-end (concat parsebib--entry-start "comment[[:space:]]*[\(\{]"))
- (let ((beg (point))) ; we are right after the opening brace / parenthesis
- (forward-char -1) ; move back to the brace / paren
- (when (parsebib--match-paren-forward)
- (buffer-substring-no-properties beg (point))))))
+ (when (parsebib--looking-at-goto-end (concat parsebib--entry-start "\\(comment[[:space:]]*\\)[\(\{]?") 1)
+ (let ((beg (point)))
+ (if (looking-at-p "[\({]")
+ (parsebib--match-paren-forward)
+ (goto-char (point-at-eol)))
+ (buffer-substring-no-properties beg (point)))))
(defun parsebib-read-string (&optional pos strings)
"Read the @String definition beginning at the line POS is on.