From ff12f7569b2adf4b064c850db9a13c3e0c4a493e Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Mon, 16 Oct 2006 03:19:17 +0000 Subject: [PATCH] New files: muse-import-docbook.el and muse-import-xml.el * AUTHORS: Bookkeeping. * lisp/muse-import-docbook.el (muse-import-docbook) (muse-import-docbook-files): Docfix. (muse-import-docbook-get-title): Remove cl.el-ism. * lisp/muse-import-xml.el (muse-import-xml): Fix compiler warning. * NEWS: Mention new files. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-222 --- AUTHORS | 5 +++++ ChangeLog | 16 ++++++++++++++++ NEWS | 4 ++++ lisp/muse-import-docbook.el | 26 ++++++++++++-------------- lisp/muse-import-xml.el | 16 ++++++++-------- 5 files changed, 45 insertions(+), 22 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5a2f316..308f822 100644 --- a/AUTHORS +++ b/AUTHORS @@ -59,6 +59,11 @@ Jim Ottaway: Author of muse-backlink.el, Contributor (assigned past and future changes) +Elena Pomohaci: Author of: + - muse-import-docbook.el + - muse-import-xml.el + (assigned past and future changes) + Andrea Riciputi: Idea taken from code, but re-implemented Stefan Schlee: Contributor diff --git a/ChangeLog b/ChangeLog index 2504b1d..6b363d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,12 @@ * lisp/muse-html.el (muse-html-markup-tags): Ditto. + * lisp/muse-import-docbook.el (muse-import-docbook) + (muse-import-docbook-files): Docfix. + (muse-import-docbook-get-title): Remove cl.el-ism. + + * lisp/muse-import-xml.el (muse-import-xml): Fix compiler warning. + * lisp/muse-journal.el (muse-journal-latex-markup-tags): Ditto. * lisp/muse-latex2png.el (muse-publish-markup-tags): Ditto. @@ -35,6 +41,16 @@ * muse.texi (Markup Tags): Mention nestable tags. + * NEWS: Mention new files. + +2006-10-15 Elena Pomohaci + + * lisp/muse-import-docbook.el: New file that converts Docbook XML + into Muse format. + + * lisp/muse-import-xml.el: New file that provides helper routines + for converting XML-ish files to Muse format. + 2006-10-10 Michael Olson * NEWS: Update for 3.02.7 bugfix release. diff --git a/NEWS b/NEWS index 6fb8727..18fa275 100644 --- a/NEWS +++ b/NEWS @@ -185,6 +185,10 @@ where the current page will be published. *** lisp/muse-groff.el -- This introduces the publishing styles "groff" and "groff-pdf". +*** lisp/muse-import-docbook.el -- Convert Docbook XML into Muse format. + +*** lisp/muse-import-xml.el -- Helper file for muse-import-docbook.el. + *** lisp/muse-latex2png.el -- Publish embedded LaTeX content to a PNG file. This introduces the tag. diff --git a/lisp/muse-import-docbook.el b/lisp/muse-import-docbook.el index f0dc483..719a86f 100644 --- a/lisp/muse-import-docbook.el +++ b/lisp/muse-import-docbook.el @@ -1,4 +1,4 @@ -;;; muse-import-docbook.el --- convert docbook xml to muse +;;; muse-import-docbook.el --- convert Docbook XML into Muse format ;; Copyright (C) 2006 Free Software Foundation, Inc. @@ -23,15 +23,13 @@ ;;; Commentary: -;; It works only for article type docbook docs and recognize followings elements: -;; article, sect1, sect2, sect3, title +;; It works only for article type docbook docs and recognize +;; followings elements: article, sect1, sect2, sect3, title, ;;; Contributors: ;;; Code: -(provide 'muse-import-docbook) - (require 'muse-import-xml) (defvar muse-import-docbook-prefix "muse-import-docbook-" @@ -44,16 +42,17 @@ (setq muse-import-docbook-para-indent "\n\n")) - +;;;###autoload (defun muse-import-docbook (src dest) - "Convert the xml SRC buffer in a muse DEST buffer" + "Convert the Docbook buffer SRC to Muse, writing output in the DEST buffer." (interactive "bDocbook buffer:\nBMuse buffer:") (setq muse-import-xml-prefix muse-import-docbook-prefix) (setq muse-import-xml-generic-function-name "muse-import-xml-node") (muse-import-xml src dest)) +;;;###autoload (defun muse-import-docbook-files (src dest) - "Convert the xml SRC file in a muse DEST file" + "Convert the Docbook file SRC to Muse, writing output to the DEST file." (interactive "fDocbook file:\nFMuse file:") (with-temp-file dest (muse-import-docbook (find-file-noselect src) (current-buffer)))) @@ -63,9 +62,9 @@ (defun muse-import-docbook-get-title (node) (let ((tit (car (xml-get-children node 'title)))) - (insert (caddr tit) ?\n ?\n) + (insert (car (cddr tit)) ?\n ?\n) (muse-import-xml-parse-tree (xml-node-children (remove tit node))))) - + (defun muse-import-docbook-article (node) "Article conversion function" @@ -113,12 +112,12 @@ (insert "*") (muse-import-xml-node node) (insert "*")) - + (defun muse-import-docbook-quote (node) (insert "\"") (muse-import-xml-node node) (insert "\"")) - + (defun muse-import-docbook-blockquote (node) (setq muse-import-docbook-para-indent "\n\n ") (muse-import-xml-node node) @@ -132,7 +131,6 @@ (insert "\n* ") (muse-import-xml-node node)) - +(provide 'muse-import-docbook) ;;; muse-import-docbook.el ends here - diff --git a/lisp/muse-import-xml.el b/lisp/muse-import-xml.el index 42b7ef4..c9fa0d6 100644 --- a/lisp/muse-import-xml.el +++ b/lisp/muse-import-xml.el @@ -43,10 +43,10 @@ (insert-buffer-substring buf) (goto-char (point-min)) (while (re-search-forward ">[ \n\t]*<" nil t) - (replace-match "><" nil nil)) ; clean all superfluous blank characters + (replace-match "><" nil nil)) ; clean all superfluous blank characters (xml-parse-region (point-min) - (point-max) - (current-buffer)))) + (point-max) + (current-buffer)))) (defun muse-import-xml-generic (node) @@ -65,10 +65,10 @@ (if (stringp node) (insert (replace-regexp-in-string "^[ \t]+" "" node)) (let ((fname (intern-soft (concat muse-import-xml-prefix - (symbol-name (xml-node-name node)))))) + (symbol-name (xml-node-name node)))))) (if (functionp fname) - (funcall fname node) - (funcall (intern muse-import-xml-generic-function-name) node))))) + (funcall fname node) + (funcall (intern muse-import-xml-generic-function-name) node))))) (defun muse-import-xml-node (node) @@ -79,8 +79,8 @@ (defun muse-import-xml (src dest) "Convert the xml SRC buffer in a muse DEST buffer" (set-buffer (get-buffer-create dest)) - (muse-mode) + (when (fboundp 'muse-mode) + (muse-mode)) (muse-import-xml-parse-tree (muse-import-xml-convert-to-list src))) ;;; muse-import-xml.el ends here - -- 2.11.4.GIT