Merge branch 'master' of git://repo.or.cz/muse-el

alexott · Feb 3, 2010 · 187261b · 187261b
2 parents 16d1f61 + caaa41c
commit 187261b
Show file tree

Hide file tree

Showing 35 changed files with 107 additions and 41 deletions.
diff --git a/Makefile.defs.default b/Makefile.defs.default
@@ -36,7 +36,7 @@ install_info = install-info --info-dir=$(INFODIR) $(1) || :
 
 # Useful only for the maintainer
 PROJECT     = muse
-VERSION     = 3.12
+VERSION     = 3.20
 MANUAL      = muse
 
 # Location of Emacs Lisp Package Archive entries

diff --git a/NEWS b/NEWS
@@ -1,5 +1,59 @@
 Emacs Muse NEWS --- History of user-visible changes    -*- outline -*-
 
+* Changes in Muse 3.20
+
+** Fix bug with duplicates in completing-read of wiki page names.
+
+** Mark some tags as dangerous for text by untrusted contributors.
+
+** Implement <div> tag.
+
+** When viewing a page, publish it first.
+
+** Include non-working alpha of Ikiwiki publishing.
+
+** Make it easier to browse published PDF files.
+
+** Fix bug with C-c C-v on a file not part of any project.
+
+** Add workaround for Emacs 23 and htmlize issue.
+
+** muse-latex2png: Fix handling of filenames with spaces in them.
+
+** muse-colors: Separate highlighting rules according to major mode.
+
+** muse-latex: Make lecture notes and slides work with images,
+title page, and table of contents.
+
+** Publishing
+
+*** Fix end-of-line conversion bug when using Windows.
+
+*** Fix bug where dates in journal entries could be published incorrectly.
+
+*** Preserve the value of muse-current-project.
+
+*** Conditionally interpret local variables.
+
+*** Values set by file-local variables trump project variables.
+
+*** muse-latex: Fix publishing of tags inside of <slide> tags.
+
+*** Render <example> correctly in slides.
+
+*** Fix bug in publishing of table.el style tables.
+
+*** Fix bug where the first paragraph would not be published properly
+if it started with a link.
+
+** Build system
+
+*** Makefile.defs.default (INFODIR): Place files in .../share/info.
+
+** Manual
+
+*** Miscellaneous updates.
+
 * Changes in Muse 3.12
 
 ** New interactive function `muse-update-values': Call this after

diff --git a/contrib/pyblosxom/getstamps.py b/contrib/pyblosxom/getstamps.py
@@ -22,7 +22,7 @@
 License:
 
    Copyright (c) 2006 Nathan Kent Bullock
-   Copyright (c) 2006, 2007, 2008, 2009 Michael Olson
+   Copyright (c) 2006, 2007, 2008, 2009, 2010 Michael Olson
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the

diff --git a/contrib/pyblosxom/hardcodedates.py b/contrib/pyblosxom/hardcodedates.py
@@ -32,7 +32,7 @@
 License:
 
    Copyright (c) 2006 Nathan Kent Bullock
-   Copyright (c) 2006, 2007, 2008, 2009 Michael Olson
+   Copyright (c) 2006, 2007, 2008, 2009, 2010 Michael Olson
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the

diff --git a/etc/muse.rnc b/etc/muse.rnc
@@ -2,7 +2,8 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace rng = "http://relaxng.org/ns/structure/1.0"
 
 #   Emacs Muse RELAX NG Schema v. 1.2
-#   Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+#     Free Software Foundation, Inc.
 
 #   Author: Brad Collins (brad AT chenla DOT org)
 #   Maintainer: Michael Olson <mwolson@gnu.org>

diff --git a/lisp/Makefile b/lisp/Makefile
@@ -63,12 +63,14 @@ muse-html.elc: muse-publish.elc muse-regexps.elc muse-xml-common.elc
 
 muse-http.elc: muse-html.elc muse-project.elc
 
-muse-ikiwiki.elc: muse-html.elc muse-publish.elc muse.elc
+muse-ikiwiki.elc: muse-html.elc muse-ipc.elc muse-publish.elc muse.elc
 
 muse-import-docbook.elc: muse-import-xml.elc
 
 muse-import-latex.elc: muse-regexps.elc muse.elc
 
+muse-ipc.elc: muse-publish.elc muse.elc
+
 muse-journal.elc: muse-book.elc muse-html.elc muse-latex.elc
 muse-journal.elc: muse-publish.elc
 

diff --git a/lisp/muse-backlink.el b/lisp/muse-backlink.el
@@ -1,6 +1,7 @@
 ;;; muse-backlink.el --- backlinks for Muse
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jim Ottaway <j.ottaway@lse.ac.uk>
 ;; Keywords:

diff --git a/lisp/muse-blosxom.el b/lisp/muse-blosxom.el
@@ -1,6 +1,6 @@
 ;;; muse-blosxom.el --- publish a document tree for serving by (py)Blosxom
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Olson <mwolson@gnu.org>

diff --git a/lisp/muse-book.el b/lisp/muse-book.el
@@ -1,6 +1,6 @@
 ;;; muse-book.el --- publish entries into a compilation
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-colors.el b/lisp/muse-colors.el
@@ -1,6 +1,6 @@
 ;;; muse-colors.el --- coloring and highlighting used by Muse
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley (johnw AT gnu DOT org)

diff --git a/lisp/muse-context.el b/lisp/muse-context.el
@@ -1,6 +1,6 @@
 ;;; muse-context.el --- publish entries in ConTeXt or PDF format
 
-;; Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Jean Magnan de Bornier (jean@bornier.net)
 ;; Created: 16-Apr-2007

diff --git a/lisp/muse-docbook.el b/lisp/muse-docbook.el
@@ -1,6 +1,6 @@
 ;;; muse-docbook.el --- publish DocBook files
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-groff.el b/lisp/muse-groff.el
@@ -1,6 +1,6 @@
 ;;; muse-groff.el --- publish groff -mom -mwww files
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Andrew J. Korty (ajk AT iu DOT edu)

diff --git a/lisp/muse-html.el b/lisp/muse-html.el
@@ -1,6 +1,6 @@
 ;;; muse-html.el --- publish to HTML and XHTML
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-http.el b/lisp/muse-http.el
@@ -1,6 +1,6 @@
 ;;; muse-http.el --- publish HTML files over HTTP
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-ikiwiki.el b/lisp/muse-ikiwiki.el
@@ -1,6 +1,6 @@
 ;;; muse-ikiwiki.el --- integrate with Ikiwiki
 
-;; Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.
 
@@ -33,6 +33,7 @@
 
 (require 'muse)
 (require 'muse-html)
+(require 'muse-ipc)
 (require 'muse-publish)
 
 (eval-when-compile
@@ -91,7 +92,7 @@ The name of the style is given by STYLE.  It defaults to \"ikiwiki\"."
   (unless title (setq title (muse-page-name name)))
   (let ((muse-batch-publishing-p t)
         (muse-publishing-current-file name)
-        (muse-publishing-current-output-path file)
+        (muse-publishing-current-output-path name)
         (muse-publishing-current-style style)
         (font-lock-verbose nil)
         (vc-handled-backends nil)) ; don't activate VC when publishing files
@@ -120,7 +121,7 @@ The name of the style is given by STYLE.  It defaults to \"ikiwiki\"."
       (setq muse-current-output-style (list :base style :path file))
       (muse-with-temp-buffer
         (muse-insert-file-contents file)
-        (muse-ikiwiki-publish-buffer name nil nil style)
+        (muse-ikiwiki-publish-buffer name nil style)
         (when (muse-write-file output-path t)
           (muse-style-run-hooks :final style file output-path target))))))
 

diff --git a/lisp/muse-import-docbook.el b/lisp/muse-import-docbook.el
@@ -1,6 +1,7 @@
 ;;; muse-import-docbook.el --- convert Docbook XML into Muse format
 
-;; Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Elena Pomohaci <e.pomohaci@gmail.com>
 

diff --git a/lisp/muse-import-latex.el b/lisp/muse-import-latex.el
@@ -1,6 +1,6 @@
 ;;; muse-import-latex.el --- convert a LaTex file into a Muse file
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-import-xml.el b/lisp/muse-import-xml.el
@@ -1,6 +1,7 @@
 ;;; muse-import-xml.el --- common to all from-xml converters
 
-;; Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Elena Pomohaci <e.pomohaci@gmail.com>
 

diff --git a/lisp/muse-ipc.el b/lisp/muse-ipc.el
@@ -1,6 +1,6 @@
 ;;; muse-ipc.el --- publish Muse documents from other processes
 
-;; Copyright (C) 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.
 

diff --git a/lisp/muse-journal.el b/lisp/muse-journal.el
@@ -1,6 +1,6 @@
 ;;; muse-journal.el --- keep and publish a journal
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el
@@ -1,6 +1,6 @@
 ;;; muse-latex.el --- publish entries in LaTex or PDF format
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-latex2png.el b/lisp/muse-latex2png.el
@@ -1,6 +1,6 @@
 ;; muse-latex2png.el --- generate PNG images from inline LaTeX code
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Olson <mwolson@gnu.org>

diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el
@@ -1,6 +1,6 @@
 ;;; muse-mode.el --- mode for editing Muse files; has font-lock support
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-poem.el b/lisp/muse-poem.el
@@ -1,6 +1,6 @@
 ;;; muse-poem.el --- publish a poem to LaTex or PDF
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-project.el b/lisp/muse-project.el
@@ -1,6 +1,6 @@
 ;;; muse-project.el --- handle Muse projects
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-protocols.el b/lisp/muse-protocols.el
@@ -1,6 +1,7 @@
 ;;; muse-protocols.el --- URL protocols that Muse recognizes
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Brad Collins (brad AT chenla DOT org)
 

diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el
@@ -1,6 +1,6 @@
 ;;; muse-publish.el --- base publishing implementation
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-regexps.el b/lisp/muse-regexps.el
@@ -1,6 +1,6 @@
 ;;; muse-regexps.el --- define regexps used by Muse
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-texinfo.el b/lisp/muse-texinfo.el
@@ -1,6 +1,6 @@
 ;;; muse-texinfo.el --- publish entries to Texinfo format or PDF
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.

diff --git a/lisp/muse-wiki.el b/lisp/muse-wiki.el
@@ -1,6 +1,7 @@
 ;;; muse-wiki.el --- wiki features for Muse
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Yann Hodique <Yann.Hodique@lifl.fr>
 ;; Keywords:

diff --git a/lisp/muse-xml-common.el b/lisp/muse-xml-common.el
@@ -1,6 +1,7 @@
 ;;; muse-xml-common.el --- common routines for XML-like publishing styles
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; This file is part of Emacs Muse.  It is not part of GNU Emacs.
 

diff --git a/lisp/muse-xml.el b/lisp/muse-xml.el
@@ -1,6 +1,6 @@
 ;;; muse-xml.el --- publish XML files
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Olson <mwolson@gnu.org>

diff --git a/lisp/muse.el b/lisp/muse.el
@@ -1,12 +1,12 @@
 ;;; muse.el --- an authoring and publishing tool for Emacs
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: muse.el
-;; Version: 3.12
-;; Date: Fri 28-Jan-2008
+;; Version: 3.20
+;; Date: Sun 31 Jan-2010
 ;; Keywords: hypermedia
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: Michael Olson <mwolson@gnu.org>
@@ -49,7 +49,7 @@
 ;; Indicate that this version of Muse supports nested tags
 (provide 'muse-nested-tags)
 
-(defvar muse-version "3.12"
+(defvar muse-version "3.20"
   "The version of Muse currently loaded")
 
 (defun muse-version (&optional insert)