From f10b5cc0581fd498d2c403896e3cd9fde931b1a0 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 14 Mar 2006 19:21:43 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2006 (patch 61) Patches applied: * mwolson@gnu.org--2006/muse--main--1.0--patch-61 Add COPYING file; update headers. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-59 --- COPYING | 340 ++++++++++++++++++++++++++++++++ ChangeLog | 35 ++++ README | 28 ++- debian/copyright | 11 +- examples/mwolson/muse-init.el | 101 ++++++---- examples/mwolson/stylesheets/blog.css | 28 --- examples/mwolson/stylesheets/common.css | 54 ++++- examples/mwolson/stylesheets/print.css | 2 +- examples/mwolson/stylesheets/screen.css | 50 ++--- experimental/muse-cite.el | 24 +-- experimental/muse-message.el | 26 +-- lisp/muse-blosxom.el | 36 ++-- lisp/muse-book.el | 30 +-- lisp/muse-colors.el | 39 ++-- lisp/muse-convert.el | 26 +-- lisp/muse-docbook.el | 26 +-- lisp/muse-html.el | 24 +-- lisp/muse-http.el | 26 +-- lisp/muse-journal.el | 26 +-- lisp/muse-latex.el | 28 +-- lisp/muse-mode.el | 24 +-- lisp/muse-poem.el | 28 +-- lisp/muse-project.el | 24 +-- lisp/muse-protocols.el | 27 +-- lisp/muse-publish.el | 28 +-- lisp/muse-regexps.el | 26 +-- lisp/muse-texinfo.el | 26 +-- lisp/muse-wiki.el | 20 +- lisp/muse-xml.el | 30 +-- lisp/muse.el | 28 +-- muse.texi | 10 +- 31 files changed, 819 insertions(+), 412 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..3912109 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog index 61e0af1..0200688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,41 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2006-03-14 19:21:43 GMT Michael Olson patch-59 + + Summary: + Merged from mwolson@gnu.org--2006 (patch 61) + Revision: + muse--rel--3.02--patch-59 + + Patches applied: + + * mwolson@gnu.org--2006/muse--main--1.0--patch-61 + Add COPYING file; update headers. + + new files: + .arch-ids/COPYING.id COPYING + + modified files: + ChangeLog README debian/copyright + examples/mwolson/muse-init.el + examples/mwolson/stylesheets/blog.css + examples/mwolson/stylesheets/common.css + examples/mwolson/stylesheets/print.css + examples/mwolson/stylesheets/screen.css + experimental/muse-cite.el experimental/muse-message.el + lisp/muse-blosxom.el lisp/muse-book.el lisp/muse-colors.el + lisp/muse-convert.el lisp/muse-docbook.el lisp/muse-html.el + lisp/muse-http.el lisp/muse-journal.el lisp/muse-latex.el + lisp/muse-mode.el lisp/muse-poem.el lisp/muse-project.el + lisp/muse-protocols.el lisp/muse-publish.el + lisp/muse-regexps.el lisp/muse-texinfo.el lisp/muse-wiki.el + lisp/muse-xml.el lisp/muse.el muse.texi + + new patches: + mwolson@gnu.org--2006/muse--main--1.0--patch-61 + + 2006-01-28 02:49:14 GMT Michael Olson patch-58 Summary: diff --git a/README b/README index e7744b8..ef5849c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ This is the README file for the Emacs Muse. -The terms "the Emacs Muse", "Emacs Muse", and "Muse" will be used +The terms "the Emacs Muse", "Emacs Muse", and "Muse" are used interchangeably throughout this document to refer to this software. Synopsis @@ -11,9 +11,27 @@ Emacs Muse is an authoring and publishing environment for Emacs. It simplifies the process of writings documents and publishing them to various output formats. -Muse consists of two main parts: an enhanced text-mode for authoring -documents and navigating within Muse projects, and a set of publishing -styles for generating different kinds of output. +Emacs Muse consists of two main parts: an enhanced text-mode for +authoring documents and navigating within Muse projects, and a set of +publishing styles for generating different kinds of output. + +License +======= + +Emacs Muse is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +Emacs Muse is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Emacs Muse; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Directory contents ================== @@ -142,7 +160,7 @@ more information on bugs, unimplemented features, and user-contributed tweaks. The current maintainer's website is at -http://www.mwolson.org/projects/MuseMode.html. +http://www.mwolson.org/projects/EmacsMuse.html. A mailing list for Muse and some related software exists; consult http://www.emacswiki.org/cgi-bin/wiki/EmacsWikiMailingList for details diff --git a/debian/copyright b/debian/copyright index 62bf336..1b6a761 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,11 +2,10 @@ This package was debianized by Trent Buck on Thu, 23 Jun 2005 13:12:12 +1000. It was downloaded from -http://www.mwolson.org/projects/MuseMode.html +http://www.mwolson.org/projects/EmacsMuse.html Upstream Authors: John Wiegley Michael Olson - Trent Buck Sacha Chua Brad Collins Li Daobing @@ -14,18 +13,10 @@ Upstream Authors: John Wiegley Yann Hodique Andrew J. Korty Peter K. Lee - Na Li - Phillip Lord - Chris Lowis Jim Ottaway - Andrea Riciputi Dale P. Smith John Sullivan Ganesh Swami - G. J. Teale - Gary Vaughan - Sergey Vlasov - Lan Yufeng Copyright: diff --git a/examples/mwolson/muse-init.el b/examples/mwolson/muse-init.el index 747bbf4..00383ec 100644 --- a/examples/mwolson/muse-init.el +++ b/examples/mwolson/muse-init.el @@ -1,6 +1,6 @@ -;;; muse-init.el --- Initialize muse-mode. +;;; muse-init.el --- Initialize Emacs Muse -;; Hacked on by Michael Olson +;; Author: Michael Olson ;; In order to see the scripts that I use to publish my website to a ;; remote webserver, check out @@ -21,9 +21,10 @@ (require 'muse-blosxom) ; load blosxom module (require 'muse-docbook) ; load DocBook publishing style (require 'muse-html) ; load (X)HTML publishing style -(require 'muse-texinfo) ; load Info/PDF publishing styles +(require 'muse-latex) ; load LaTeX/PDF publishing styles +(require 'muse-texinfo) ; load Info publishing style (require 'muse-wiki) ; load Wiki support -(require 'muse-xml) ; load experimental XML support +(require 'muse-xml) ; load XML support ;;(require 'muse-message) ; load message support (experimental) ;; Setup projects @@ -47,54 +48,73 @@ (setq muse-project-alist `( - ("Website" - ("~/proj/wiki/web/" - :force-publish ("WikiIndex") - :default "WelcomePage") + ("Website" ("~/proj/wiki/web/" + :force-publish ("WikiIndex") + :default "WelcomePage") (:base "my-xhtml" - :path "~/personal-site/site/web")) + :path "~/personal-site/site/web") + (:base "my-pdf" + :path "~/personal-site/site/web" + :include "/CurriculumVitae[^/]*$")) - ("Projects" - ("~/proj/wiki/projects/" - :force-publish ("WikiIndex") - :default "WelcomePage") + ("Projects" ("~/proj/wiki/projects/" + :force-publish ("WikiIndex") + :default "WelcomePage") (:base "my-xhtml" :path "~/personal-site/site/projects")) - ("Blog" - (,@(muse-project-alist-dirs "~/proj/wiki/blog") - :default "index") + ("Blog" (,@(muse-project-alist-dirs "~/proj/wiki/blog") + :default "index") + ;; Publish this directory and its subdirectories. Arguments + ;; are as follows. The above `muse-project-alist-dirs' part + ;; is also needed, using Argument 1. + ;; + ;; 1. Source directory + ;; 2. Output directory + ;; 3. Publishing style ,@(muse-project-alist-styles "~/proj/wiki/blog" "~/personal-site/site/blog" "my-blosxom")) - ("MyNotes" - ("~/proj/wiki/notes/" - :force-publish ("WikiIndex") - :default "WelcomePage") - (:base "my-xhtml" + ("MyNotes" ("~/proj/wiki/notes/" + :force-publish ("index") + :default "index") + (:base "xhtml" :path "~/personal-site/site/notes") (:base "my-pdf" :path "~/personal-site/site/notes")) - ("Plans" - ("~/proj/wiki/plans/" - :default "TaskPool" - :major-mode planner-mode - :visit-link planner-visit-link) + ("Private" ("~/Documents" "~/Documents/work-school" + :default "movielist") + ,@(muse-project-alist-styles "~/Documents" + "~/Documents" + "pdf")) + + ("Classes" (,@(muse-project-alist-dirs "~/proj/wiki/classes") + :default "index") + ,@(muse-project-alist-styles "~/proj/wiki/classes" + "~/personal-site/site/classes" + "xhtml")) + + ("Plans" ("~/proj/wiki/plans/" + :default "TaskPool" + :major-mode planner-mode + :visit-link planner-visit-link) (:base "planner-xhtml" :path "~/proj/notmine/planner-out")) )) ;; Wiki settings (setq muse-wiki-interwiki-alist - '(("PlugWiki" . "http://plug.student-orgs.purdue.edu/plugwiki/") + '(("PlugWiki" . "http://plug.student-orgs.purdue.edu/wiki/") ("TheEmacsWiki" . "http://www.emacswiki.org/cgi-bin/wiki/") ("ArchWiki" . "http://wiki.gnuarch.org/") ;; abbreviations ("CERIAS" . "http://www.cerias.purdue.edu/") - ("PLUG" . "http://plug.student-orgs.purdue.edu/plugwiki/"))) + ("Planner" . "http://www.plannerlove.com/") + ("GP2X" . "http://www.gp2x.co.uk/") + ("PLUG" . "http://plug.student-orgs.purdue.edu/wiki/"))) ;;; Functions @@ -119,15 +139,18 @@ (let ((muse-current-project (muse-project project))) (call-interactively 'muse-project-find-file))) -;; Make the current file display correctly in Xanga +;; Determine whether we are publishing a certain kind of output +(defsubst my-muse-format-p (format) + (let ((base (muse-get-keyword :base muse-publishing-current-style))) + (when base (string-match format base)))) (defun my-muse-blosxom-finalize (file output-path target) ;; (my-muse-prepare-entry-for-xanga output-path) ;; For now, do nothing. ) +;; Make the current file display correctly in Xanga ;; I call this using C-c p x now. - (defun my-muse-prepare-entry-for-xanga (file) "Mangle FILE so that Xanga doesn't bug out, saving to X clipboard. @@ -168,9 +191,7 @@ If FILE is not specified, use the published version of the current file." (replace-match "
"))))) ;; Get rid of 2 spaces together and merge lines (goto-char (point-min)) - (while (re-search-forward (concat "[" - muse-regexp-space - "]+") nil t) + (while (re-search-forward (concat "[" muse-regexp-blank "\n]+") nil t) (replace-match " ")) ;; Remove trailing space (goto-char (point-min)) @@ -188,12 +209,16 @@ If FILE is not specified, use the published version of the current file." (global-set-key "\C-cpl" 'muse-blosxom-new-entry) (global-set-key "\C-cpL" #'(lambda () (interactive) (my-muse-project-find-file "Blog"))) +(global-set-key "\C-cpi" #'(lambda () (interactive) + (my-muse-project-find-file "Private"))) (global-set-key "\C-cpn" #'(lambda () (interactive) (my-muse-project-find-file "MyNotes"))) (global-set-key "\C-cpp" #'(lambda () (interactive) (my-muse-project-find-file "Plans"))) (global-set-key "\C-cpr" #'(lambda () (interactive) (my-muse-project-find-file "Projects"))) +(global-set-key "\C-cps" #'(lambda () (interactive) + (my-muse-project-find-file "Classes"))) (global-set-key "\C-cpw" #'(lambda () (interactive) (my-muse-project-find-file "Website"))) (global-set-key "\C-cpx" 'my-muse-prepare-entry-for-xanga) @@ -203,9 +228,12 @@ If FILE is not specified, use the published version of the current file." (custom-set-variables '(muse-blosxom-base-directory "~/proj/wiki/blog/") '(muse-colors-autogen-headings (quote outline)) + '(muse-colors-inline-image-method (quote muse-colors-use-publishing-directory)) '(muse-file-extension "muse") '(muse-html-charset-default "utf-8") '(muse-html-encoding-default (quote utf-8)) + '(muse-html-footer "~/personal-site/muse/generic-footer.html") + '(muse-html-header "~/personal-site/muse/generic-header.html") '(muse-html-meta-content-encoding (quote utf-8)) '(muse-html-style-sheet " @@ -213,9 +241,10 @@ If FILE is not specified, use the published version of the current file." '(muse-latex-header "~/personal-site/muse/header.tex") '(muse-mode-auto-p nil nil (muse-project)) '(muse-mode-highlight-p t nil (muse-colors)) - '(muse-mode-hook (quote (footnote-mode muse-wiki-update-custom-values))) - '(muse-publish-desc-transforms (quote (muse-wiki-publish-pretty-title muse-wiki-publish-pretty-interwiki muse-publish-escape-specials-in-string))) - '(muse-wiki-publish-small-title-words (quote ("the" "and" "at" "on" "of" "for" "in" "an" "a" "page" "anime"))) + '(muse-mode-hook (quote (muse-wiki-update-custom-values flyspell-mode footnote-mode))) + '(muse-publish-comments-p t) + '(muse-publish-desc-transforms (quote (muse-wiki-publish-pretty-title muse-wiki-publish-pretty-interwiki))) + '(muse-wiki-publish-small-title-words (quote ("the" "and" "at" "on" "of" "for" "in" "an" "a" "page"))) '(muse-xhtml-footer "~/personal-site/muse/generic-footer.html") '(muse-xhtml-header "~/personal-site/muse/generic-header.html")) (custom-set-faces diff --git a/examples/mwolson/stylesheets/blog.css b/examples/mwolson/stylesheets/blog.css index 51acd5a..50297f0 100644 --- a/examples/mwolson/stylesheets/blog.css +++ b/examples/mwolson/stylesheets/blog.css @@ -3,34 +3,6 @@ Elements for my blog. */ -.menu { - background-color: #F5F5F5; /* white smoke */ - color: black; - border: 1px solid black; - display: inline; - float: right; - clear: both; - margin-left: 0.2em; - margin-bottom: 0.2em; - padding: .5em; -} - -.menuitem { - text-align: left; -} - -.menuitem a:link, .menuitem a:visited { - color: #006400; /* dark green */ - display: block; - margin: .2em; - padding-top: 4px; - text-decoration: none; -} - -.menuitem a:hover { - background-color: #D3D3D3; /* light gray */ -} - td { } diff --git a/examples/mwolson/stylesheets/common.css b/examples/mwolson/stylesheets/common.css index aa57e53..043a9a7 100644 --- a/examples/mwolson/stylesheets/common.css +++ b/examples/mwolson/stylesheets/common.css @@ -1,4 +1,4 @@ -/* Michael Olson's tweaked emacs-wiki stylesheet +/* Michael Olson's tweaked Muse stylesheet Common elements. */ @@ -47,14 +47,6 @@ body { margin-top: 1%; } -dl.contents { - margin-top: 0; -} - -dt.contents { - margin-bottom: .5em; -} - dt { font-weight: bold; margin-top: .5em; @@ -77,6 +69,7 @@ h1 { h2 { border-bottom: solid 2px #708090; /* slate gray */ + clear: left; font-size: large; margin-top: 2.5em; margin-bottom: .5em; @@ -103,6 +96,10 @@ h4 { padding-right: 6px; } +hr { + clear: right; +} + img { border: 0; } @@ -113,6 +110,7 @@ li { } p.verse { + clear: left; line-height: 2em; margin-left: 5%; } @@ -154,3 +152,41 @@ ul { list-style-type: disc; margin-bottom: 1.5em; } + +/* Menu */ + +.menu { + background-color: #F5F5F5; /* white smoke */ + color: white; + border: 1px solid black; + display: inline; + float: right; + clear: both; + margin-left: 5px; + margin-bottom: 5px; + padding: .5em; +} + +.menuitem { + text-align: left; +} + +.menuitem a:link, .menuitem a:visited { + color: #006400; /* dark green */ + display: block; + margin: .2em; + padding-top: 4px; +} + +.menuitem a:hover { + background-color: #D3D3D3; /* light gray */ +} + +#tooltipbox { + float: right; + visibility: hidden; +} + +#tooltip { + color: #006400; /* dark green */ +} diff --git a/examples/mwolson/stylesheets/print.css b/examples/mwolson/stylesheets/print.css index 92ac288..8958971 100644 --- a/examples/mwolson/stylesheets/print.css +++ b/examples/mwolson/stylesheets/print.css @@ -1,4 +1,4 @@ -/* Michael Olson's tweaked emacs-wiki stylesheet +/* Michael Olson's tweaked Muse stylesheet Elements used when printing. */ diff --git a/examples/mwolson/stylesheets/screen.css b/examples/mwolson/stylesheets/screen.css index bf56333..c426edb 100644 --- a/examples/mwolson/stylesheets/screen.css +++ b/examples/mwolson/stylesheets/screen.css @@ -1,4 +1,4 @@ -/* Michael Olson's tweaked emacs-wiki stylesheet +/* Michael Olson's tweaked Muse stylesheet Elements for most of my web site. */ @@ -25,43 +25,33 @@ padding: 0; } -/* Menu */ - -.menu { - background-color: #F5F5F5; /* white smoke */ - color: white; - border: 1px solid black; - display: inline; - float: right; - clear: both; - margin-left: 0.2em; - margin-bottom: 0.2em; - padding: .5em; -} - -.menuitem { - text-align: left; -} +/* Table of Contents */ -.menuitem a:link, .menuitem a:visited { - color: #006400; /* dark green */ +dl.contents { + background-color: #7cfc00; /* lawn green */ display: block; - margin: .2em; - padding-top: 4px; - text-decoration: none; + float: left; + font-size: small; + margin-right: 5px; + margin-bottom: 15px; + margin-top: 0; + padding-bottom: 5px; } -.menuitem a:hover { - background-color: #D3D3D3; /* light gray */ +dt.contents { + clear: left; + display: block; + padding-right: 5px; + padding-left: 5px; + text-align: left; } -#tooltipbox { - float: right; - visibility: hidden; +.contents dd dt.contents { + display: list-item; } -#tooltip { - color: #006400; /* dark green */ +.contents a:hover { + background-color: #20b2aa; /* light sea green */ } /* Planner */ diff --git a/experimental/muse-cite.el b/experimental/muse-cite.el index e8f573a..3520acd 100644 --- a/experimental/muse-cite.el +++ b/experimental/muse-cite.el @@ -1,19 +1,21 @@ -;;; muse-cire.el --- smart citations for Muse +;;; muse-cite.el --- smart citations for Muse -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005 Free Software Foundation, Inc. -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/experimental/muse-message.el b/experimental/muse-message.el index 9399e9c..e3aa446 100644 --- a/experimental/muse-message.el +++ b/experimental/muse-message.el @@ -1,21 +1,21 @@ ;;; muse-message.el --- publish a file as an email message -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-blosxom.el b/lisp/muse-blosxom.el index 781fd32..89188fd 100644 --- a/lisp/muse-blosxom.el +++ b/lisp/muse-blosxom.el @@ -1,25 +1,24 @@ ;;; muse-blosxom.el --- publish a document tree for serving by (py)Blosxom -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; Date: Wed, 23 March 2005 ;; Author: Michael Olson (mwolson AT gnu DOT org) -;; Maintainer: Michael Olson (mwolson AT gnu DOT org) +;; Date: Wed, 23 March 2005 -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. @@ -99,12 +98,9 @@ ;; Gary Vaughan (gary AT gnu DOT org) is the original author of ;; `emacs-wiki-blosxom.el', which is the ancestor of this file. -;; + ;; Brad Collins (brad AT chenla DOT org) ported this file to Muse. -;; -;; Michael Olson (mwolson AT gnu DOT org) further adapted this file to -;; Muse and continues to maintain it. -;; + ;; Björn Lindström (bkhl AT elektrubadur DOT se) made many valuable ;; suggestions. diff --git a/lisp/muse-book.el b/lisp/muse-book.el index bd407a0..21a9813 100644 --- a/lisp/muse-book.el +++ b/lisp/muse-book.el @@ -1,23 +1,23 @@ ;;; muse-book.el --- publish entries into a compilation -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; along with Emacs Muse; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/muse-colors.el b/lisp/muse-colors.el index 3054b0a..5c26e95 100644 --- a/lisp/muse-colors.el +++ b/lisp/muse-colors.el @@ -1,32 +1,27 @@ ;;; muse-colors.el --- coloring and highlighting used by Muse -;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; Emacs Lisp Archive Entry -;; Filename: muse-colors.el -;; Date: Thu 11-Mar-2004 -;; Keywords: hypermedia ;; Author: John Wiegley (johnw AT gnu DOT org) -;; Maintainer: Michael Olson (mwolson AT gnu DOT org) -;; URL: http://www.mwolson.org/projects/MuseMode.html -;; Compatibility: Emacs21 +;; Keywords: hypermedia +;; Date: Thu 11-Mar-2004 -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; along with Emacs Muse; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/muse-convert.el b/lisp/muse-convert.el index facd8dc..f4a2a40 100644 --- a/lisp/muse-convert.el +++ b/lisp/muse-convert.el @@ -1,21 +1,21 @@ ;;; muse-convert.el --- convert a LaTex file into a Muse file -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-docbook.el b/lisp/muse-docbook.el index a09e837..f6d219a 100644 --- a/lisp/muse-docbook.el +++ b/lisp/muse-docbook.el @@ -1,21 +1,21 @@ ;;; muse-docbook.el --- publish DocBook files -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-html.el b/lisp/muse-html.el index 3c7391e..88486e2 100644 --- a/lisp/muse-html.el +++ b/lisp/muse-html.el @@ -2,20 +2,20 @@ ;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-http.el b/lisp/muse-http.el index e08b019..15237ed 100644 --- a/lisp/muse-http.el +++ b/lisp/muse-http.el @@ -1,21 +1,21 @@ ;;; muse-http.el --- publish HTML files over HTTP -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-journal.el b/lisp/muse-journal.el index 6b88084..00a6778 100644 --- a/lisp/muse-journal.el +++ b/lisp/muse-journal.el @@ -1,21 +1,21 @@ ;;; muse-journal.el --- keep and publish a journal -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el index e314d72..44e8c8d 100644 --- a/lisp/muse-latex.el +++ b/lisp/muse-latex.el @@ -1,21 +1,21 @@ ;;; muse-latex.el --- publish entries in LaTex or PDF format -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. @@ -24,7 +24,7 @@ ;;; Contributors: ;; Li Daobing (lidaobing AT gmail DOT com) provided CJK support. -;; + ;; Trent Buck (trentbuck AT gmail DOT com) gave valuable advice for ;; how to treat LaTeX specials and the like. diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el index f54ba98..2910318 100644 --- a/lisp/muse-mode.el +++ b/lisp/muse-mode.el @@ -2,20 +2,20 @@ ;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-poem.el b/lisp/muse-poem.el index e8b3ed2..80cfbfb 100644 --- a/lisp/muse-poem.el +++ b/lisp/muse-poem.el @@ -1,27 +1,27 @@ ;;; muse-poem.el --- publish a poem to LaTex or PDF -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: -;; I use a very particular for recording poetry. It is: +;; This file specifies a form for recording poetry. It is as follows. ;; ;; Title ;; diff --git a/lisp/muse-project.el b/lisp/muse-project.el index de5398b..966398f 100644 --- a/lisp/muse-project.el +++ b/lisp/muse-project.el @@ -2,20 +2,20 @@ ;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-protocols.el b/lisp/muse-protocols.el index ce0debf..ee75ab3 100644 --- a/lisp/muse-protocols.el +++ b/lisp/muse-protocols.el @@ -1,19 +1,23 @@ ;;; muse-protocols.el --- URL protocols that Muse recognizes -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005 Free Software Foundation, Inc. -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; Author: Brad Collins (brad AT chenla DOT org) -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. @@ -39,9 +43,6 @@ ;;; Contributors: -;; Brad Collins (brad AT chenla DOT org) created the initial version -;; of this. - ;;; Code: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index 2845069..2439396 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -1,21 +1,21 @@ ;;; muse-publish.el --- base publishing implementation -;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. @@ -25,7 +25,7 @@ ;; Yann Hodique (yann DOT hodique AT gmail DOT com) fixed an ;; unnecessary URL description transform in `muse-publish-url'. -;; + ;; Peter K. Lee (saint AT corenova DOT com) provided the ;; `muse-style-elements-list' function. diff --git a/lisp/muse-regexps.el b/lisp/muse-regexps.el index 090dd09..8c8495a 100644 --- a/lisp/muse-regexps.el +++ b/lisp/muse-regexps.el @@ -1,21 +1,21 @@ ;;; muse-regexps.el --- define regexps used by Muse -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-texinfo.el b/lisp/muse-texinfo.el index dda08cc..e95f0d2 100644 --- a/lisp/muse-texinfo.el +++ b/lisp/muse-texinfo.el @@ -1,21 +1,21 @@ ;;; muse-texinfo.el --- publish entries to Texinfo format or PDF -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-wiki.el b/lisp/muse-wiki.el index 0277247..3e3723f 100644 --- a/lisp/muse-wiki.el +++ b/lisp/muse-wiki.el @@ -5,20 +5,20 @@ ;; Author: Yann Hodique ;; Keywords: -;; This file is not part of GNU Emacs. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/lisp/muse-xml.el b/lisp/muse-xml.el index 8e7d6f1..3cf47c5 100644 --- a/lisp/muse-xml.el +++ b/lisp/muse-xml.el @@ -1,19 +1,24 @@ ;;; muse-xml.el --- publish XML files -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; Author: Michael Olson (mwolson AT gnu DOT org) +;; Date: Sat 23-Jul-2005 -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. @@ -31,12 +36,9 @@ ;; Peter K. Lee (saint AT corenova DOT com) made the initial ;; implementation of planner-publish.el, which was heavily borrowed ;; from. -;; + ;; Brad Collins (brad AT chenla DOT org) provided a Compact RelaxNG ;; schema. -;; -;; Michael Olson (mwolson AT gnu DOT org) assembled everything into a -;; usable form. ;;; Code: diff --git a/lisp/muse.el b/lisp/muse.el index e3b433d..1af7c94 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -10,23 +10,23 @@ ;; Author: John Wiegley (johnw AT gnu DOT org) ;; Maintainer: Michael Olson (mwolson AT gnu DOT org) ;; Description: An authoring and publishing tool for Emacs -;; URL: http://www.mwolson.org/projects/MuseMode.html +;; URL: http://www.mwolson.org/projects/EmacsMuse.html ;; Compatibility: Emacs21 XEmacs21 Emacs22 -;; This file is not part of GNU Emacs. - -;; This is free software; you can redistribute it and/or modify it under -;; the terms of the GNU General Public License as published by the Free -;; Software Foundation; either version 2, or (at your option) any later -;; version. -;; -;; This is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -;; for more details. -;; +;; This file is part of Emacs Muse. It is not part of GNU Emacs. + +;; Emacs Muse is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; Emacs Muse is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with Emacs Muse; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. diff --git a/muse.texi b/muse.texi index 23fc518..f432fec 100644 --- a/muse.texi +++ b/muse.texi @@ -748,8 +748,8 @@ link descriptions. The syntax is as follows. @end example Thus, the current maintainer's homepage for Muse can be found -@samp{[[http://www.mwolson.org/projects/MuseMode.html][here]]}, -or at @samp{[[http://www.mwolson.org/projects/MuseMode.html]]}. +@samp{[[http://www.mwolson.org/projects/EmacsMuse.html][here]]}, +or at @samp{[[http://www.mwolson.org/projects/EmacsMuse.html]]}. @node Implicit Links, Images, Explicit Links, Markup Rules @comment node-name, next, previous, up @@ -778,7 +778,7 @@ will be used as InterWiki names by default. Several examples follow. @example Blog::DocumentingMuse -Projects#MuseMode +Projects#EmacsMuse Website @end example @@ -2368,7 +2368,7 @@ emacswiki.org page, and anyone may add tips, hints, or bug descriptions to it. @item -@uref{http://www.mwolson.org/projects/MuseMode.html} is the web page +@uref{http://www.mwolson.org/projects/EmacsMuse.html} is the web page that Michael Olson (the current maintainer) made for Muse. @item @@ -2390,7 +2390,7 @@ questions. The @samp{#muse} channel is also available for Muse-specific help, and its current maintainer hangs out there. @item -The maintainer of MuseMode, Michael Olson, may be contacted at +The maintainer of Emacs Muse, Michael Olson, may be contacted at @email{mwolson@@gnu.org}. @end itemize -- 2.11.4.GIT