From 6d6d36473616b11d977179bf3e6f30e1761f3c05 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 29 Jan 2008 17:25:39 +0100 Subject: outline: Liberated the list and mode-line syntax. * src/guile/skribilo/reader/outline.scm (%list-processors): Allow leading whitespace for list items. (outline-reader)[modeline-rx]: Allow figures, semi-colons and all. --- src/guile/skribilo/reader/outline.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/guile/skribilo/reader/outline.scm b/src/guile/skribilo/reader/outline.scm index 27ec05f..8c48293 100644 --- a/src/guile/skribilo/reader/outline.scm +++ b/src/guile/skribilo/reader/outline.scm @@ -335,12 +335,12 @@ to @var{node-type}." (regexp-exec node-rx line)) (define %list-processors - (list (make-list-processor (make-regexp "^[-~o] (.+)$" regexp/extended) + (list (make-list-processor (make-regexp "^[[:space:]]*[-~o] (.+)$" regexp/extended) 'itemize (lambda (m) (match:substring m 1)) %line-processor node-markup-line?) - (make-list-processor (make-regexp "^([0-9]+)\\.? (.+)$" + (make-list-processor (make-regexp "^[[:space:]]*([0-9]+)\\.? (.+)$" regexp/extended) 'enumerate (lambda (m) (match:substring m 2)) @@ -410,7 +410,7 @@ to @var{node-type}." (define* (outline-reader :optional (port (current-input-port))) (define modeline-rx - (make-regexp "^[[:space:]]*-\\*- [a-zA-Z-]+ -\\*-[[:space:]]*$")) + (make-regexp "^[[:space:]]*-\\*- ([a-zA-Z0-9;:-]|[[:space:]])+ -\\*-[[:space:]]*$")) (define title-rx (make-regexp "^[Tt]itle: (.+)$" regexp/extended)) (define author-rx (make-regexp "^[Aa]uthors?: (.+)$" regexp/extended)) (define keywords-rx -- cgit v1.2.3