From 549d706f3102b1b1126646557727f3bb03371da5 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Mon, 13 Jun 2005 22:01:00 +0000 Subject: [PATCH] WYSIWYG emphasis, XEmacs compatibility hacks. * muse-colors.el (muse-colors-emphasized): Make emphasis more WYSIWIG compliant. Only colorize if we end with the same number of asterisks as we start with, preventing unnoticed syntax errors. Don't colorize in the middle of a word. (muse-colors-underlined): Make underlining more WYSIWIG compliant. Only colorize if we end with an underscore. Don't colorize in the middle of a word. * muse-docbook.el (muse-docbook-markup-paragraph): Move question mark inside of group. This will probably not do anything, but it seems syntactically good. * muse-html.el (muse-html-markup-paragraph): Attempt to deal with case where we start with an image link. JohnW didn't seem to like having

tags inserted before image links, but they don't validate properly as they are. For now, I will surround such links/paragraphs with

in an attempt to be as not invasive and yet standards compliant as possible. * muse-html.el (muse-html-escape-string): Work around distinction between int and char types in XEmacs. Deal with an annoying replace-match bug in XEmacs that rears its head at times. * muse-publish.el (muse-publish-markup-word): Allow underlines to be multi-line. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-54 --- ChangeLog | 38 ++++++++++++++++++++ muse-colors.el | 106 +++++++++++++++++++++++++++++++++++++------------------- muse-docbook.el | 2 +- muse-html.el | 74 +++++++++++++++++++++++---------------- muse-publish.el | 1 + 5 files changed, 155 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7850aaa..aeb847e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,44 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-06-13 22:01:00 GMT Michael Olson patch-54 + + Summary: + WYSIWYG emphasis, XEmacs compatibility hacks. + Revision: + muse--main--1.0--patch-54 + + * muse-colors.el (muse-colors-emphasized): Make emphasis more WYSIWIG + compliant. Only colorize if we end with the same number of asterisks + as we start with, preventing unnoticed syntax errors. Don't colorize + in the middle of a word. + (muse-colors-underlined): Make underlining more WYSIWIG compliant. + Only colorize if we end with an underscore. Don't colorize in the + middle of a word. + + * muse-docbook.el (muse-docbook-markup-paragraph): Move question mark + inside of group. This will probably not do anything, but it seems + syntactically good. + + * muse-html.el (muse-html-markup-paragraph): Attempt to deal with case + where we start with an image link. JohnW didn't seem to like having +

tags inserted before image links, but they don't validate properly + as they are. For now, I will surround such links/paragraphs with

in an attempt to be as not invasive and yet + standards compliant as possible. + + * muse-html.el (muse-html-escape-string): Work around distinction between + int and char types in XEmacs. Deal with an annoying replace-match bug + in XEmacs that rears its head at times. + + * muse-publish.el (muse-publish-markup-word): Allow underlines to be + multi-line. + + modified files: + ChangeLog muse-colors.el muse-docbook.el muse-html.el + muse-publish.el + + 2005-06-13 01:13:08 GMT Michael Olson patch-53 Summary: diff --git a/muse-colors.el b/muse-colors.el index 0cb9d1c..1ecc99e 100644 --- a/muse-colors.el +++ b/muse-colors.el @@ -143,52 +143,86 @@ whether progress messages should be displayed to the user." (defvar end)) (defun muse-colors-emphasized () - ;; here we need to check four different points - the start and end of the - ;; leading *s, and the start and end of the trailing *s. we allow the - ;; outsides to be surrounded by whitespace or punctuation, but no word - ;; characters, and the insides must not be surrounded by whitespace or - ;; punctuation. thus the following are valid: + ;; Here we need to check four different points - the start and end + ;; of the leading *s, and the start and end of the trailing *s. We + ;; allow the outsides to be surrounded by whitespace or punctuation, + ;; but no word characters, and the insides must not be surrounded by + ;; whitespace or punctuation. Thus the following are valid: + ;; ;; " *foo bar* " ;; "**foo**," ;; and the following is invalid: ;; "** testing **" (let* ((beg (match-beginning 0)) - (e1 (match-end 0)) - (leader (- e1 beg)) - b2 e2 multiline) + (e1 (match-end 0)) + (leader (- e1 beg)) + b2 e2 multiline) (unless (get-text-property beg 'invisible) ;; check if it's a header (if (eq (char-after e1) ?\ ) - (if (or (= beg (point-min)) - (eq (char-before beg) ?\n)) - (add-text-properties - (line-beginning-position) (line-end-position) - (list 'face (intern (concat "muse-header-" - (int-to-string leader)))))) - (save-excursion - (skip-chars-forward "^*\n" end) - (when (eq (char-after) ?\n) - (setq multiline t) - (skip-chars-forward "^*" end)) - (setq b2 (point)) - (skip-chars-forward "*" end) - (setq e2 (point)) - (add-text-properties beg e1 '(invisible t)) - (add-text-properties - e1 b2 (list 'face (cond ((= leader 1) 'italic) - ((= leader 2) 'bold) - ((= leader 3) 'bold-italic)))) - (add-text-properties b2 e2 '(invisible t)) - (goto-char e1) - (if multiline - (add-text-properties beg e2 '(font-lock-multiline t)))))))) + (when (or (= beg (point-min)) + (eq (char-before beg) ?\n)) + (add-text-properties + (line-beginning-position) (line-end-position) + (list 'face (intern (concat "muse-header-" + (int-to-string leader)))))) + ;; beginning of line or space or symbol + (when (or (= beg (point-min)) + (memq (char-syntax (char-before beg)) '(?\ ?\-)) + (memq (char-before beg) + '(?\- ?\[ ?\< ?\( ?\' ?\` ?\" ?\n))) + (save-excursion + (skip-chars-forward "^*<>\n" end) + (when (eq (char-after) ?\n) + (setq multiline t) + (skip-chars-forward "^*<>" end)) + (setq b2 (point)) + (skip-chars-forward "*" end) + (setq e2 (point)) + ;; Abort if space exists just before end + ;; or bad leader + ;; or no '*' at end + (unless (or (> leader 3) + (not (eq leader (- e2 b2))) + (eq (char-before b2) ?\ ) + (not (eq (char-after b2) ?*))) + (add-text-properties beg e1 '(invisible t)) + (add-text-properties + e1 b2 (list 'face (cond ((= leader 1) 'italic) + ((= leader 2) 'bold) + ((= leader 3) 'bold-italic)))) + (add-text-properties b2 e2 '(invisible t)) + (when multiline + (add-text-properties + beg e2 '(font-lock-multiline t)))))))))) (defun muse-colors-underlined () - (let ((start (match-beginning 0))) - (when (search-forward "_" end t) - (add-text-properties start (+ start 1) '(invisible t)) - (add-text-properties (+ start 1) (match-beginning 0) '(face underline)) - (add-text-properties (match-beginning 0) (match-end 0) '(invisible t))))) + (let ((start (match-beginning 0)) + multiline) + (unless (get-text-property start 'invisible) + ;; beginning of line or space or symbol + (when (or (= start (point-min)) + (memq (char-syntax (char-before start)) '(?\ ?\-)) + (memq (char-before start) + '(?\- ?\[ ?\< ?\( ?\' ?\` ?\" ?\n))) + (save-excursion + (skip-chars-forward "^_<>\n" end) + (when (eq (char-after) ?\n) + (setq multiline t) + (skip-chars-forward "^_<>" end)) + ;; Abort if space exists just before end + ;; or no '_' at end + (unless (or (eq (char-before (point)) ?\ ) + (not (eq (char-after (point)) ?_))) + (add-text-properties start (1+ start) '(invisible t)) + (add-text-properties (1+ start) (point) '(face underline)) + (add-text-properties (point) + (min (1+ (point)) (point-max)) + '(invisible t)) + (when multiline + (add-text-properties + start (min (1+ (point)) (point-max)) + '(font-lock-multiline t))))))))) (defun muse-colors-verbatim () (skip-chars-forward (concat "^" muse-regexp-space "=>") end)) diff --git a/muse-docbook.el b/muse-docbook.el index 3278d4b..48cc099 100644 --- a/muse-docbook.el +++ b/muse-docbook.el @@ -157,7 +157,7 @@ differs little between the various styles." (goto-char (match-beginning 0)) (when (save-excursion (save-match-data - (and (re-search-backward "<\\(/\\)?para[ >]" nil t) + (and (re-search-backward "<\\(/?\\)para[ >]" nil t) (not (string-equal (match-string 1) "/"))))) (insert "")) (goto-char end)) diff --git a/muse-html.el b/muse-html.el index 9be0a4d..db05461 100644 --- a/muse-html.el +++ b/muse-html.el @@ -390,29 +390,37 @@ system to an associated HTML coding system. If no match is found, (defun muse-html-markup-paragraph () (let ((end (copy-marker (match-end 0) t))) (goto-char (match-beginning 0)) - (when (save-excursion - (save-match-data - (and (re-search-backward "<\\(/\\)?p[ >]" nil t) - (not (string-equal (match-string 1) "/"))))) - (insert "

")) + (insert + (or (save-excursion + (save-match-data + (and (re-search-backward "<\\(/?\\)\\(p\\|div\\)[ >]" + nil t) + (not (string-equal (match-string 1) "/")) + (if (string-equal (match-string 2) "p") + "

" + "
")))) + "")) (goto-char end)) - (if (eobp) - (cond - ((bolp) - nil) - (t - (insert "\n"))) - (unless (and (eq (char-after) ?\<) - (not (or (looking-at "<\\(em\\|strong\\|code\\)>") - (and (looking-at "]+>\\|
\\)\n\n") - (insert "

")) - ((muse-looking-back "<\\(blockquote\\|center\\)>\n") - (insert "

")) - (t - (insert "

")))))) + (cond + ((eobp) + (unless (bolp) + (insert "\n"))) + ((eq (char-after) ?\<) + (cond + ((looking-at "<\\(em\\|strong\\|code\\|span\\)[ >]") + (insert "

")) + ((looking-at "]+>") + (insert "

"))) + ((looking-at "]") + (insert "

")))) + ((muse-looking-back "\\(\\|
\\)\n\n") + (insert "

")) + ((muse-looking-back "<\\(blockquote\\|center\\)>\n") + (insert "

")) + (t + (insert "

")))) (defun muse-html-markup-anchor () (save-match-data @@ -425,15 +433,23 @@ if not escaped." (when str (let (pos code len) (save-match-data - (while (setq pos (string-match (concat "[^-" + (while (setq pos (string-match (concat "[^-" muse-regexp-alnum "/:._=@\\?~#]") - str pos)) - (setq code (int-to-string (aref str pos)) - len (length code) - str (replace-match (concat "&#" code ";") nil nil str) - pos (+ 3 len pos))) - str)))) + str pos)) + (setq code (int-to-string + (cond ((fboundp 'char-to-ucs) + (char-to-ucs (aref str pos))) + ((fboundp 'char-to-int) + (char-to-int (aref str pos))) + (t (aref str pos)))) + len (length code) + str (concat (substring str 0 pos) + "&#" code ";" + (when (< pos (length str)) + (substring str (1+ pos) nil))) + pos (+ 3 len pos))) + str)))) (defun muse-html-markup-footnote () (if (/= (line-beginning-position) (match-beginning 0)) diff --git a/muse-publish.el b/muse-publish.el index 93780b7..9ba2632 100644 --- a/muse-publish.el +++ b/muse-publish.el @@ -626,6 +626,7 @@ the file is published no matter what." open-tag close-tag mark-read-only loc multi-line) (cond ((string= leader "_") + (setq multi-line t) (setq open-tag (muse-markup-text 'begin-underline) close-tag (muse-markup-text 'end-underline))) ((string= leader "=") -- 2.11.4.GIT