From a9748ffd0764bd5c6c233cad22b56f3a9a9650ee Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 9 Jul 2005 07:41:44 +0000 Subject: [PATCH] Fix image-link goof-up and add pretty titles. * lisp/muse-html.el (muse-html-markup-paragraph): Use

instead of

. I found a bug with the way I was handling both, so I decided to simplify things. * lisp/muse-wiki.el (muse-wiki-output-name): New function that acts like `muse-publish-output-name', but keeps the directory prefix. (muse-wiki-transform-interwiki): Use `muse-publish-output-name'. * lisp/muse-wiki.el (muse-wiki-publish-small-title-words): New customizable option that determines the words to downcase in title. (muse-wiki-publish-pretty-title): New function that Makes a Nicely Capitalized Title out of either a string or the current title. This is not currently used by any other function -- for now it is meant to be called by the user. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-117 --- ChangeLog | 26 ++++++++++++++++++++++++++ lisp/muse-html.el | 21 +++++++-------------- lisp/muse-wiki.el | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 69 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6646d0..fa632ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,32 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-07-09 07:41:44 GMT Michael Olson patch-117 + + Summary: + Fix image-link goof-up and add pretty titles. + Revision: + muse--main--1.0--patch-117 + + * lisp/muse-html.el (muse-html-markup-paragraph): Use

instead of

. I found a bug + with the way I was handling both, so I decided to simplify things. + + * lisp/muse-wiki.el (muse-wiki-output-name): New function that acts like + `muse-publish-output-name', but keeps the directory prefix. + (muse-wiki-transform-interwiki): Use `muse-publish-output-name'. + + * lisp/muse-wiki.el (muse-wiki-publish-small-title-words): New + customizable option that determines the words to downcase in title. + (muse-wiki-publish-pretty-title): New function that Makes a Nicely + Capitalized Title out of either a string or the current title. This is + not currently used by any other function -- for now it is meant to be + called by the user. + + modified files: + ChangeLog lisp/muse-html.el lisp/muse-wiki.el + + 2005-07-09 05:22:12 GMT Michael Olson patch-116 Summary: diff --git a/lisp/muse-html.el b/lisp/muse-html.el index d283d2f..72cb104 100644 --- a/lisp/muse-html.el +++ b/lisp/muse-html.el @@ -395,18 +395,11 @@ 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)) - (insert - (or (save-excursion - (save-match-data - (and (re-search-backward (concat - "<\\(/?\\)\\(p\\|" - "div class=\"image-link\"\\)[ >]") - nil t) - (not (string-equal (match-string 1) "/")) - (if (string-equal (match-string 2) "p") - "

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

")) (goto-char end)) (cond ((eobp) @@ -418,10 +411,10 @@ system to an associated HTML coding system. If no match is found, (insert "

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

") (insert "

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

")))) + (insert "

")))) ((muse-looking-back "\\(\\|

\\)\n\n") (insert "

")) ((muse-looking-back "<\\(blockquote\\|center\\)>\n") diff --git a/lisp/muse-wiki.el b/lisp/muse-wiki.el index a20d1d4..1e40e3a 100644 --- a/lisp/muse-wiki.el +++ b/lisp/muse-wiki.el @@ -109,13 +109,17 @@ this." (set sym value))) :group 'muse-wiki) +(defun muse-wiki-output-name (name) + "Much like `muse-publish-output-name', but keep the directory part." + (concat (file-name-directory name) + (muse-publish-output-name name))) + (defun muse-wiki-transform-interwiki (url explicit) "Return the destination of the given URL if it is an interwiki link. Otherwise return URL. Read-only properties are added to the string." (let ((res (muse-wiki-handle-interwiki url))) (if (and res (not (string-match muse-image-regexp res))) - (setq url (concat (file-name-directory res) - (muse-publish-output-name res))))) + (setq url (muse-wiki-output-name res)))) url) (defun muse-wiki-transform-wikiword (url explicit) @@ -190,6 +194,36 @@ Match 1 is set to the WikiWord." (file-exists-p (match-string 1 string)))) (match-string 1 string))) +;; Pretty title + +(defcustom muse-wiki-publish-small-title-words + '("the" "and" "at" "on" "of" "for" "in" "an" "a") + "Strings that should be downcased in a page title. +This is used by `muse-wiki-publish-pretty-title', which must be +called manually." + :type '(repeat string) + :group 'muse-wiki) + +(defun muse-wiki-publish-pretty-title (&optional title) + "Return a pretty version of the given TITLE." + (unless title (setq title (muse-publishing-directive "title"))) + (save-match-data + (let ((case-fold-search nil)) + (while (string-match (concat "\\([" muse-regexp-upper + muse-regexp-lower + "]\\)\\([" muse-regexp-upper + "0-9]\\)") + title) + (setq title (replace-match "\\1 \\2" t nil title))) + (let* ((words (split-string title)) + (w (cdr words))) + (while w + (if (member (downcase (car w)) + muse-wiki-publish-small-title-words) + (setcar w (downcase (car w)))) + (setq w (cdr w))) + (mapconcat 'identity words " "))))) + ;; Coloring setup (eval-after-load "muse-colors" -- 2.11.4.GIT