branch: elpa/adoc-mode
commit a88d4ea5d593d6a18037b069f71f847c6ac0387f
Author: Florian Kaufmann <sensor...@gmail.com>
Commit: Florian Kaufmann <sensor...@gmail.com>
bugfix: some regexps did not handle end of buffer correctly
---
adoc-mode-test.el | 52 +++++++++++++++++++++++++++++-----------------------
adoc-mode.el | 14 +++++++-------
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/adoc-mode-test.el b/adoc-mode-test.el
index 75e977b5a8..17aa293fd8 100644
--- a/adoc-mode-test.el
+++ b/adoc-mode-test.el
@@ -57,8 +57,8 @@
;; tear-down
(kill-buffer buf-name)))
-(ert-deftest adoctest-test-titles-simple ()
- (adoctest-faces "titles-simple"
+(ert-deftest adoctest-test-titles-simple-one-line-before ()
+ (adoctest-faces "titles-simple-one-line-before"
"= " markup-meta-hide-face "document title" markup-title-0-face "\n" nil
"\n" nil
"== " markup-meta-hide-face "chapter 1" markup-title-1-face "\n" nil
@@ -67,9 +67,10 @@
"\n" nil
"==== " markup-meta-hide-face "chapter 3" markup-title-3-face "\n" nil
"\n" nil
- "===== " markup-meta-hide-face "chapter 4" markup-title-4-face "\n" nil
- "\n" nil
+ "===== " markup-meta-hide-face "chapter 4" markup-title-4-face))
+(ert-deftest adoctest-test-titles-simple-one-line-enclosed ()
+ (adoctest-faces "titles-simple-one-line-enclosed"
"= " markup-meta-hide-face "document title" markup-title-0-face " ="
markup-meta-hide-face "\n" nil
"\n" nil
"== " markup-meta-hide-face "chapter 1" markup-title-1-face " =="
markup-meta-hide-face "\n" nil
@@ -78,9 +79,10 @@
"\n" nil
"==== " markup-meta-hide-face "chapter 3" markup-title-3-face " ===="
markup-meta-hide-face "\n" nil
"\n" nil
- "===== " markup-meta-hide-face "chapter 4" markup-title-4-face " ====="
markup-meta-hide-face "\n" nil
- "\n" nil
+ "===== " markup-meta-hide-face "chapter 4" markup-title-4-face " ====="
markup-meta-hide-face))
+(ert-deftest adoctest-test-titles-simple-two-line ()
+ (adoctest-faces "titles-simple-two-line"
;; todo
;; ensure somehow adoc-enable-two-line-title is t
"document title" markup-title-0-face "\n" nil
@@ -96,10 +98,11 @@
"^^^^^^^^^" markup-meta-hide-face "\n" nil
"\n" nil
"chapter 4" markup-title-4-face "\n" nil
- "+++++++++" markup-meta-hide-face "\n" nil
- "\n" nil
+ "+++++++++" markup-meta-hide-face))
- "." markup-meta-face "Block title" markup-gen-face "\n" nil ))
+(ert-deftest adoctest-test-titles-simple-block-title ()
+ (adoctest-faces "titles-simple-block-title"
+ "." markup-meta-face "Block title" markup-gen-face))
(ert-deftest adoctest-test-delimited-blocks-simple ()
(adoctest-faces "delimited-blocks-simple"
@@ -132,11 +135,13 @@
"\n" nil
"********" markup-meta-hide-face "\n" nil
"sidebar line 1\nsidebar line 2" markup-secondary-text-face "\n" nil
- "********" markup-meta-hide-face "\n" nil
- "\n" nil
+ "********" markup-meta-hide-face "\n"))
+
+(ert-deftest adoctest-test-open-block ()
+ (adoctest-faces "open-block"
"--" markup-meta-hide-face "\n" nil
"open block line 1\nopen block line 2" nil "\n" nil
- "--" markup-meta-hide-face "\n" nil))
+ "--" markup-meta-hide-face))
(ert-deftest adoctest-test-comments ()
(adoctest-faces "comments"
@@ -148,8 +153,9 @@
"// dolor sit\n" markup-comment-face
"amen\n" 'no-face
"\n" nil
- ;; as delimited block
- ;; tested in delimited-blocks-simple
+ ;; block macro and end of buffer
+ "// lorem ipsum" markup-comment-face
+ ;; as delimited block it's tested in delimited-blocks-simple
))
(ert-deftest adoctest-test-anchors ()
@@ -176,7 +182,7 @@
;; biblio
"lorem " 'no-face "[[" markup-meta-face "[foo]" markup-gen-face "]]"
markup-meta-face
- " ipsum\n" 'no-face
+ " ipsum" 'no-face
))
(ert-deftest adoctest-test-references ()
@@ -185,7 +191,7 @@
"foo" markup-reference-face "[]" markup-meta-face "\n" nil
"lorem " 'no-face "xref" markup-command-face ":" markup-meta-face
"foo" markup-internal-reference-face "[" markup-meta-face
- "bla bli bla blu" markup-reference-face "]" markup-meta-face "\n" nil
+ "bla bli bla blu" markup-reference-face "]" markup-meta-face
))
(ert-deftest adoctest-test-images ()
@@ -225,7 +231,7 @@
"foo " 'no-face "image" markup-complex-replacement-face ":"
markup-meta-face
"./foo/bar.png" markup-internal-reference-face
"[" markup-meta-face "alt" markup-attribute-face "=" markup-meta-face
"lorem ipsum" markup-secondary-text-face "," markup-meta-face
- "title" markup-attribute-face "=" markup-meta-face "lorem ipsum"
markup-secondary-text-face "]" markup-meta-face "bar" 'no-face "\n" nil))
+ "title" markup-attribute-face "=" markup-meta-face "lorem ipsum"
markup-secondary-text-face "]" markup-meta-face "bar" 'no-face))
(ert-deftest adoctest-test-attribute-list ()
(adoctest-faces "attribute-list"
@@ -252,7 +258,7 @@
;; is , within strings really part of the string and not mistaken as
element separator
"[\"" markup-meta-face "lorem,ipsum=dolor" markup-value-face "\"]"
markup-meta-face "\n" nil
;; does escaping " in strings work
- "[\"" markup-meta-face "lorem \\\"ipsum\\\" dolor" markup-value-face "\"]"
markup-meta-face "\n" nil
+ "[\"" markup-meta-face "lorem \\\"ipsum\\\" dolor" markup-value-face "\"]"
markup-meta-face
))
(ert-deftest adoctest-test-block-macro ()
@@ -278,7 +284,7 @@
"Lorem " nil "##" markup-meta-hide-face " ipsum " markup-gen-face "##"
markup-meta-hide-face " dolor\n" nil
"Lorem " nil "#" markup-meta-hide-face "ipsum" markup-gen-face "#"
markup-meta-hide-face " dolor\n" nil
"Lorem " nil "~" markup-meta-hide-face " ipsum " markup-subscript-face "~"
markup-meta-hide-face " dolor\n" nil
- "Lorem " nil "^" markup-meta-hide-face " ipsum " markup-superscript-face
"^" markup-meta-hide-face " dolor\n" nil))
+ "Lorem " nil "^" markup-meta-hide-face " ipsum " markup-superscript-face
"^" markup-meta-hide-face " dolor"))
(ert-deftest adoctest-test-quotes-medium ()
(adoctest-faces "test-quotes-medium"
@@ -319,7 +325,7 @@
"~~~~~~~~~~~" markup-meta-hide-face "\n" nil
"." markup-meta-face "lorem " 'markup-gen-face "_" markup-meta-hide-face
"ipsum" '(markup-gen-face markup-emphasis-face) "_" markup-meta-hide-face "\n"
nil
"\n" nil
- "lorem " markup-gen-face "+" markup-meta-hide-face "ipsum"
'(markup-gen-face markup-typewriter-face) "+" markup-meta-hide-face " sit"
markup-gen-face "::" markup-list-face " " adoc-align "\n" nil
+ "lorem " markup-gen-face "+" markup-meta-hide-face "ipsum"
'(markup-gen-face markup-typewriter-face) "+" markup-meta-hide-face " sit"
markup-gen-face "::" markup-list-face " " adoc-align
))
;; test border cases where the quote delimiter is at the beginning and/or the
@@ -379,7 +385,7 @@
(ert-deftest adoctest-test-inline-macros ()
(adoctest-faces "inline-macros"
- "commandname" markup-command-face ":target[" markup-meta-face "attribute
list" markup-value-face "]" markup-meta-face "\n" nil))
+ "commandname" markup-command-face ":target[" markup-meta-face "attribute
list" markup-value-face "]" markup-meta-face))
(ert-deftest adoctest-test-meta-face-cleanup ()
;; begin with a few simple explicit cases which are easier to debug in case
of troubles
@@ -395,7 +401,7 @@
(adoctest-faces "meta-face-cleanup-2"
"_" markup-meta-hide-face "lorem " markup-emphasis-face
"*" markup-meta-hide-face "ipsum" '(markup-strong-face
markup-emphasis-face) "*" markup-meta-hide-face
- " dolor" markup-emphasis-face "_" markup-meta-hide-face "\n" nil)
+ " dolor" markup-emphasis-face "_" markup-meta-hide-face)
;; now test all possible cases
;; mmm, that is all possible cases inbetween constrained/unconstrained quotes
@@ -453,7 +459,7 @@
"**" markup-list-face " " nil "dolor ** sit\n" 'no-face
;; don't cross list item boundaries in the case of labeled lists
"lorem ** ipsum " markup-gen-face "::" markup-list-face " " nil "sit **
dolor\n" 'no-face
- "lorem ** ipsum " markup-gen-face "::" markup-list-face " " nil "sit **
dolor\n" 'no-face))
+ "lorem ** ipsum " markup-gen-face "::" markup-list-face " " nil "sit **
dolor" 'no-face))
(ert-deftest adoctest-pre-test-byte-compile ()
;; todo: also test for warnings
diff --git a/adoc-mode.el b/adoc-mode.el
index 3801211624..51240ab2be 100644
--- a/adoc-mode.el
+++ b/adoc-mode.el
@@ -415,7 +415,7 @@ match-data has this sub groups:
(concat
"^\\(" del "[ \t]+\\)" ; 1
"\\([^ \t\n].*?\\)" ; 2
- "\\(\\([ \t]+" del "\\)?[ \t]*\n\\)" ))) ; 3 & 4
+ "\\(\\([ \t]+" del "\\)?[ \t]*\\(?:\n\\|\\'\\)\\)" ))) ; 3 & 4
(defun adoc-make-one-line-title (sub-type level text)
"Returns a one line title of LEVEL and SUB-TYPE containing the given text."
@@ -598,12 +598,12 @@ Subgroups:
"[ \t]+[^ \t\n].*"
;; 2nd+ line is neither a blank line nor a list continuation line
"\\(?:\n\\(?:[^+ \t\n]\\|[ \t]+[^ \t\n]\\|\\+[ \t]*[^ \t\n]\\).*?\\)*?"
- ;; paragraph delimited by blank line or list continuation
+ ;; paragraph delimited by blank line or list continuation or end of buffer
;; NOTE: now list continuation belongs the the verbatim paragraph
sequence,
;; but actually we want to highlight it differently. Thus the font lock
;; keywoard handling list continuation must come after verbatim paraphraph
;; sequence.
- "\n\\+?[ \t]*\n"
+ "\\(?:\n[ \t]*\\(?:\n\\|\\'\\)\\|\n\\+[ \t]*\n\\|\\'\\)"
"\\)+"
"\\)" ))
@@ -617,7 +617,7 @@ Subgroups:
Subgroups:
1 delimiter
2 title's text incl trailing whites
-3 newline
+3 newline or end-of-buffer anchor
.foo n
12--23"
@@ -626,7 +626,7 @@ Subgroups:
"\\(\\.?\\(?:"
"[0-9]+[^+*]" ; inserted part, see above
"\\|[^. \t\n]\\).*\\)"
- "\\(\n\\)"))
+ "\\(\n\\|\\'\\)"))
;; (?u)^(?P<name>image|unfloat)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$
(defun adoc-re-block-macro (&optional cmd-name)
@@ -1250,7 +1250,7 @@ When LITERAL-P is non-nil, the contained text is literal
text."
;; comment
;; (?mu)^[\\]?//(?P<passtext>[^/].*|)$
;; I don't know what the [\\]? should mean
- (list "^\\(//\\(?:[^/].*\\|\\)\n\\)"
+ (list "^\\(//\\(?:[^/].*\\|\\)\\(?:\n\\|\\'\\)\\)"
'(1 '(face markup-comment-face adoc-reserved block-del)))
;; image
(list `(lambda (end) (adoc-kwf-std end ,(adoc-re-block-macro "image") '(0)))
@@ -1938,7 +1938,7 @@ Turning on Adoc mode runs the normal hook
`adoc-mode-hook'."
(set (make-local-variable 'comment-start) "// ")
(set (make-local-variable 'comment-end) "")
(set (make-local-variable 'comment-start-skip) "^//[ \t]*")
- (set (make-local-variable 'comment-end-skip) "[ \t]*\n")
+ (set (make-local-variable 'comment-end-skip) "[ \t]*\\(?:\n\\|\\'\\)")
;; paragraphs
(set (make-local-variable 'paragraph-separate) (adoc-re-paragraph-separate))
