;;; org-publish.el --- publish related org-mode files as a website
-
;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: David O'Toole <dto@gnu.org>
;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
;; Keywords: hypermedia, outlines, wp
-;; Version: 5.23a
+;; Version: 6.16
;; This file is part of GNU Emacs.
;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
-;; Requires at least version 4.27 of org.el
-
;; This program allow configurable publishing of related sets of
;; Org-mode files as a complete website.
;;
;; (setq org-publish-project-alist
;; (list
;; '("org" . (:base-directory "~/org/"
-;; :base-extension "org"
-;; :publishing-directory "~/public_html"
-;; :with-section-numbers nil
-;; :table-of-contents nil
-;; :recursive t
-;; :style "<link rel=stylesheet href=\"../other/mystyle.css\" type=\"text/css\">")))
+;; :base-extension "org"
+;; :publishing-directory "~/public_html"
+;; :with-section-numbers nil
+;; :table-of-contents nil
+;; :recursive t
+;; :style "<link rel="stylesheet" href=\"../other/mystyle.css\" type=\"text/css\">")))
;;;; More complex example configuration:
;; (setq org-publish-project-alist
;; (list
;; '("orgfiles" :base-directory "~/org/"
-;; :base-extension "org"
-;; :publishing-directory "/ssh:user@host:~/html/notebook/"
-;; :publishing-function org-publish-org-to-html
-;; :exclude "PrivatePage.org" ;; regexp
-;; :headline-levels 3
-;; :with-section-numbers nil
-;; :table-of-contents nil
-;; :style "<link rel=stylesheet href=\"../other/mystyle.css\" type=\"text/css\">"
-;; :auto-preamble t
-;; :auto-postamble nil)
-;; ("images" :base-directory "~/images/"
-;; :base-extension "jpg\\|gif\\|png"
-;; :publishing-directory "/ssh:user@host:~/html/images/"
-;; :publishing-function org-publish-attachment)
-;; ("other" :base-directory "~/other/"
-;; :base-extension "css"
-;; :publishing-directory "/ssh:user@host:~/html/other/"
-;; :publishing-function org-publish-attachment)
+;; :base-extension "org"
+;; :publishing-directory "/ssh:user@host:~/html/notebook/"
+;; :publishing-function org-publish-org-to-html
+;; :exclude "PrivatePage.org" ;; regexp
+;; :headline-levels 3
+;; :with-section-numbers nil
+;; :table-of-contents nil
+;; :style "<link rel="stylesheet" href=\"../other/mystyle.css\" type=\"text/css\">"
+;; :auto-preamble t
+;; :auto-postamble nil)
+;; ("images" :base-directory "~/images/"
+;; :base-extension "jpg\\|gif\\|png"
+;; :publishing-directory "/ssh:user@host:~/html/images/"
+;; :publishing-function org-publish-attachment)
+;; ("other" :base-directory "~/other/"
+;; :base-extension "css"
+;; :publishing-directory "/ssh:user@host:~/html/other/"
+;; :publishing-function org-publish-attachment)
;; ("website" :components ("orgfiles" "images" "other"))))
;; For more information, see the documentation for the variable
(eval-when-compile
(require 'cl))
+(require 'org)
+(require 'org-exp)
(eval-and-compile
(unless (fboundp 'declare-function)
(defmacro declare-function (fn file &optional arglist fileonly))))
-(require 'dired-aux)
-
(defgroup org-publish nil
- "Options for publishing a set of Org-mode and related files."
- :tag "Org Publishing"
- :group 'org)
+ "Options for publishing a set of Org-mode and related files."
+ :tag "Org Publishing"
+ :group 'org)
(defcustom org-publish-project-alist nil
"Association list to control publishing behavior.
Each element of the alist is a publishing 'project.' The CAR of
-each element is a string, uniquely identifying the project. The
+each element is a string, uniquely identifying the project. The
CDR of each element is in one of the following forms:
(:property value :property value ... )
When the CDR of an element of org-publish-project-alist is in
this second form, the elements of the list after :components are
taken to be components of the project, which group together files
-requiring different publishing options. When you publish such a
-project with M-x org-publish, the components all publish.
+requiring different publishing options. When you publish such a
+project with \\[org-publish], the components all publish.
When a property is given a value in org-publish-project-alist, its
setting overrides the value of the corresponding user variable
- (if any) during publishing. However, options set within a file
+\(if any) during publishing. However, options set within a file
override everything.
Most properties are optional, but some should always be set:
files will be published
The :exclude property may be used to prevent certain files from
-being published. Its value may be a string or regexp matching
+being published. Its value may be a string or regexp matching
file names you don't want to be published.
-The :include property may be used to include extra files. Its
+The :include property may be used to include extra files. Its
value may be a list of filenames to include. The filenames are
-considered relative to the publishing directory.
+considered relative to the base directory.
When both :include and :exclude properties are given values, the
exclusion step happens first.
One special property controls which back-end function to use for
-publishing files in the project. This can be used to extend the
+publishing files in the project. This can be used to extend the
set of file types publishable by org-publish, as well as the set
of output formats.
- :publishing-function Function to publish file. The default is
- org-publish-org-to-html, but other
- values are possible. May also be a
+ :publishing-function Function to publish file. The default is
+ `org-publish-org-to-html', but other
+ values are possible. May also be a
list of functions, in which case
each function in the list is invoked
in turn.
Another property allows you to insert code that prepares a
-project for publishing. For example, you could call GNU Make on a
+project for publishing. For example, you could call GNU Make on a
certain makefile, to ensure published files are built up to date.
:preparation-function Function to be called before publishing
this project.
+ :completion-function Function to be called after publishing
+ this project.
Some properties control details of the Org publishing process,
and are equivalent to the corresponding user variables listed in
-the right column. See the documentation for those variables to
+the right column. See the documentation for those variables to
learn more about their use and default values.
- :language org-export-default-language
- :headline-levels org-export-headline-levels
- :section-numbers org-export-with-section-numbers
- :table-of-contents org-export-with-toc
- :emphasize org-export-with-emphasize
- :sub-superscript org-export-with-sub-superscripts
- :TeX-macros org-export-with-TeX-macros
- :fixed-width org-export-with-fixed-width
- :tables org-export-with-tables
- :table-auto-headline org-export-highlight-first-table-line
- :style org-export-html-style
- :convert-org-links org-export-html-link-org-files-as-html
- :inline-images org-export-html-inline-images
- :expand-quoted-html org-export-html-expand
- :timestamp org-export-html-with-timestamp
- :publishing-directory org-export-publishing-directory
- :preamble org-export-html-preamble
- :postamble org-export-html-postamble
- :auto-preamble org-export-html-auto-preamble
- :auto-postamble org-export-html-auto-postamble
- :author user-full-name
- :email user-mail-address
+ :language `org-export-default-language'
+ :headline-levels `org-export-headline-levels'
+ :section-numbers `org-export-with-section-numbers'
+ :table-of-contents `org-export-with-toc'
+ :emphasize `org-export-with-emphasize'
+ :sub-superscript `org-export-with-sub-superscripts'
+ :TeX-macros `org-export-with-TeX-macros'
+ :fixed-width `org-export-with-fixed-width'
+ :tables `org-export-with-tables'
+ :table-auto-headline `org-export-highlight-first-table-line'
+ :style `org-export-html-style'
+ :convert-org-links `org-export-html-link-org-files-as-html'
+ :inline-images `org-export-html-inline-images'
+ :expand-quoted-html `org-export-html-expand'
+ :timestamp `org-export-html-with-timestamp'
+ :publishing-directory `org-export-publishing-directory'
+ :preamble `org-export-html-preamble'
+ :postamble `org-export-html-postamble'
+ :auto-preamble `org-export-html-auto-preamble'
+ :auto-postamble `org-export-html-auto-postamble'
+ :author `user-full-name'
+ :email `user-mail-address'
The following properties may be used to control publishing of an
index of files or summary page for a given project.
:auto-index Whether to publish an index during
- org-publish-current-project or org-publish-all.
- :index-filename Filename for output of index. Defaults
- to 'index.org' (which becomes 'index.html')
- :index-title Title of index page. Defaults to name of file.
+ `org-publish-current-project' or `org-publish-all'.
+ :index-filename Filename for output of index. Defaults
+ to 'index.org' (which becomes 'index.html').
+ :index-title Title of index page. Defaults to name of file.
:index-function Plugin function to use for generation of index.
- Defaults to 'org-publish-org-index', which
+ Defaults to `org-publish-org-index', which
generates a plain list of links to all files
- in the project."
+ in the project.
+ :index-style Can be `list' (index is just an itemized list
+ of the titles of the files involved) or
+ `tree' (the directory structure of the source
+ files is reflected in the index). Defaults to
+ `tree'."
:group 'org-publish
:type 'alist)
(defcustom org-publish-use-timestamps-flag t
"When non-nil, use timestamp checking to publish only changed files.
-When nil, do no timestamp checking and always publish all
-files."
+When nil, do no timestamp checking and always publish all files."
:group 'org-publish
:type 'boolean)
-(defcustom org-publish-timestamp-directory "~/.org-timestamps/"
+(defcustom org-publish-timestamp-directory (convert-standard-filename
+ "~/.org-timestamps/")
"Name of directory in which to store publishing timestamps."
:group 'org-publish
:type 'directory)
(defun org-publish-timestamp-filename (filename)
"Return path to timestamp file for filename FILENAME."
- (while (string-match
- (if (eq system-type 'windows-nt) "~\\|/\\|:" "~\\|/") filename)
- (setq filename (replace-match "_" nil t filename)))
- (concat org-publish-timestamp-directory filename ".timestamp"))
+ (concat (file-name-as-directory org-publish-timestamp-directory)
+ "X" (if (fboundp 'sha1) (sha1 filename) (md5 filename))))
(defun org-publish-needed-p (filename)
"Return `t' if FILENAME should be published."
- (if org-publish-use-timestamps-flag
- (if (file-exists-p org-publish-timestamp-directory)
- ;; first handle possible wrong timestamp directory
- (if (not (file-directory-p org-publish-timestamp-directory))
- (error "Org publish timestamp: %s is not a directory"
- org-publish-timestamp-directory)
- ;; there is a timestamp, check if FILENAME is newer
- (file-newer-than-file-p
- filename (org-publish-timestamp-filename filename))))
- ;; don't use timestamps, always return t
- t))
+ (let ((rtn
+ (if org-publish-use-timestamps-flag
+ (if (file-exists-p org-publish-timestamp-directory)
+ ;; first handle possible wrong timestamp directory
+ (if (not (file-directory-p org-publish-timestamp-directory))
+ (error "Org publish timestamp: %s is not a directory"
+ org-publish-timestamp-directory)
+ ;; there is a timestamp, check if FILENAME is newer
+ (file-newer-than-file-p
+ filename (org-publish-timestamp-filename filename)))
+ (make-directory org-publish-timestamp-directory)
+ t)
+ ;; don't use timestamps, always return t
+ t)))
+ (if rtn
+ (message "Publishing file %s" filename)
+ (message "Skipping unmodified file %s" filename))
+ rtn))
(defun org-publish-update-timestamp (filename)
"Update publishing timestamp for file FILENAME.
;; Emacs 21 doesn't have `set-file-times'
(if (and (fboundp 'set-file-times)
(not newly-created-timestamp))
- (set-file-times timestamp-file)
+ (set-file-times timestamp-file)
(call-process "touch" nil 0 nil timestamp-file))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Mapping files to project names
(defvar org-publish-files-alist nil
- "Alist of files and their parent project.
+ "Alist of files and their parent projects.
Each element of this alist is of the form:
(file-name . project-name)")
+(defvar org-publish-initial-buffer nil
+ "The buffer `org-publish' has been called from.")
+(defvar org-publish-temp-files nil
+ "Temporary list of files to be published.")
+
(defun org-publish-initialize-files-alist (&optional refresh)
"Set `org-publish-files-alist' if it is not set.
Also set it if the optional argument REFRESH is non-nil."
(setq org-publish-files-alist
(org-publish-get-files org-publish-project-alist))))
+(defun org-publish-validate-link (link &optional directory)
+ "Check if LINK points to a file in the current project."
+ (assoc (expand-file-name link directory) org-publish-files-alist))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Compatibility aliases
all-files))
(defun org-publish-expand-projects (projects-alist)
- "Expand projects contained in PROJECTS-ALIST."
- (let (without-component with-component)
- (mapc (lambda(p)
- (add-to-list
- (if (plist-get (cdr p) :components)
- 'with-component 'without-component) p))
- projects-alist)
- (org-publish-delete-dups
- (append without-component
- (car (mapcar (lambda(p) (org-publish-expand-components p))
- with-component))))))
-
-(defun org-publish-expand-components (project)
- "Expand PROJECT into an alist of its components."
- (let* ((components (plist-get (cdr project) :components)))
- (org-publish-delete-dups
- (delq nil (mapcar (lambda(c) (assoc c org-publish-project-alist))
- components)))))
+ "Expand projects in PROJECTS-ALIST.
+This splices all the components into the list."
+ (let ((rest projects-alist) rtn p components)
+ (while (setq p (pop rest))
+ (if (setq components (plist-get (cdr p) :components))
+ (setq rest (append
+ (mapcar (lambda (x) (assoc x org-publish-project-alist))
+ components)
+ rest))
+ (push p rtn)))
+ (nreverse (org-publish-delete-dups (delq nil rtn)))))
+
+(defun org-publish-get-base-files-1 (base-dir &optional recurse match skip-file skip-dir)
+ "Set `org-publish-temp-files' with files from BASE-DIR directory.
+If RECURSE is non-nil, check BASE-DIR recursively. If MATCH is
+non-nil, restrict this list to the files matching the regexp
+MATCH. If SKIP-FILE is non-nil, skip file matching the regexp
+SKIP-FILE. If SKIP-DIR is non-nil, don't check directories
+matching the regexp SKIP-DIR when recursing through BASE-DIR."
+ (mapc (lambda (f)
+ (let ((fd-p (file-directory-p f))
+ (fnd (file-name-nondirectory f)))
+ (if (and fd-p recurse
+ (not (string-match "^\\.+$" fnd))
+ (if skip-dir (not (string-match skip-dir fnd)) t))
+ (org-publish-get-base-files-1 f recurse match skip-file skip-dir)
+ (unless (or fd-p ;; this is a directory
+ (and skip-file (string-match skip-file fnd))
+ (not (file-exists-p (file-truename f)))
+ (not (string-match match fnd)))
+ (pushnew f org-publish-temp-files)))))
+ (directory-files base-dir t (unless recurse match))))
(defun org-publish-get-base-files (project &optional exclude-regexp)
"Return a list of all files in PROJECT.
(let* ((project-plist (cdr project))
(base-dir (file-name-as-directory
(plist-get project-plist :base-directory)))
- (include-list (plist-get project-plist :include))
- (recursive-p (plist-get project-plist :recursive))
- (extension (or (plist-get project-plist :base-extension) "org"))
- (regexp (concat "^[^\\.].*\\.\\(" extension "\\)$"))
- alldirs allfiles files dir)
- ;; Get all files and directories in base-directory
- (setq files (dired-files-attributes base-dir))
- ;; Get all subdirectories if recursive-p
- (setq alldirs
- (if recursive-p
- (delq nil (mapcar (lambda(f) (if (caaddr f) (cadr f))) files))
- (list base-dir)))
- (while (setq dir (pop alldirs))
- (setq files (directory-files dir t regexp))
- ;; Exclude files
- (setq files
- (if (not exclude-regexp)
- files
- (delq nil
- (mapcar (lambda (x)
- (if (string-match exclude-regexp x) nil x))
- files))))
- ;; Include extra files
- (let (inc)
- (while (setq inc (pop include-list))
- (setq files (cons (expand-file-name inc dir) files))))
- (setq allfiles (append allfiles files)))
- allfiles))
+ (include-list (plist-get project-plist :include))
+ (recurse (plist-get project-plist :recursive))
+ (extension (or (plist-get project-plist :base-extension) "org"))
+ (match (concat "^[^\\.].*\\.\\(" extension "\\)$")))
+ (setq org-publish-temp-files nil)
+ (org-publish-get-base-files-1 base-dir recurse match
+ ;; FIXME distinguish exclude regexp
+ ;; for skip-file and skip-dir?
+ exclude-regexp exclude-regexp)
+ (mapc (lambda (f)
+ (pushnew
+ (expand-file-name (concat base-dir f))
+ org-publish-temp-files))
+ include-list)
+ org-publish-temp-files))
(defun org-publish-get-project-from-filename (filename)
"Return the project FILENAME belongs."
(let* ((project-name (cdr (assoc (expand-file-name filename)
org-publish-files-alist))))
+ (dolist (prj org-publish-project-alist)
+ (if (member project-name (plist-get (cdr prj) :components))
+ (setq project-name (car prj))))
(assoc project-name org-publish-project-alist)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'org)
(unless (file-exists-p pub-dir)
(make-directory pub-dir t))
- (find-file filename)
- (let ((init-buf (current-buffer))
- (init-point (point))
- (init-buf-string (buffer-string)) export-buf)
- ;; run hooks before exporting
- (run-hooks 'org-publish-before-export-hook)
- ;; export the possibly modified buffer
- (setq export-buf
- (funcall (intern (concat "org-export-as-" format))
- (plist-get plist :headline-levels)
- nil plist nil nil pub-dir))
- (set-buffer export-buf)
- ;; run hooks after export and save export
- (and (run-hooks 'org-publish-after-export-hook)
- (if (buffer-modified-p) (save-buffer)))
- ;; maybe restore buffer's content
- (set-buffer init-buf)
- (when (buffer-modified-p init-buf)
- (erase-buffer)
- (insert init-buf-string)
- (save-buffer)
- (goto-char init-point))))
+ (let ((visiting (find-buffer-visiting filename)))
+ (save-excursion
+ (switch-to-buffer (or visiting (find-file filename)))
+ (let* ((plist (cons :buffer-will-be-killed (cons t plist)))
+ (init-buf (current-buffer))
+ (init-point (point))
+ (init-buf-string (buffer-string))
+ export-buf-or-file)
+ ;; run hooks before exporting
+ (run-hooks 'org-publish-before-export-hook)
+ ;; export the possibly modified buffer
+ (setq export-buf-or-file
+ (funcall (intern (concat "org-export-as-" format))
+ (plist-get plist :headline-levels)
+ nil plist nil nil pub-dir))
+ (when (and (bufferp export-buf-or-file)
+ (buffer-live-p export-buf-or-file))
+ (set-buffer export-buf-or-file)
+ ;; run hooks after export and save export
+ (and (run-hooks 'org-publish-after-export-hook)
+ (if (buffer-modified-p) (save-buffer)))
+ (kill-buffer export-buf-or-file))
+ ;; maybe restore buffer's content
+ (set-buffer init-buf)
+ (when (buffer-modified-p init-buf)
+ (erase-buffer)
+ (insert init-buf-string)
+ (save-buffer)
+ (goto-char init-point))
+ (unless visiting
+ (kill-buffer init-buf))))))
(defun org-publish-org-to-latex (plist filename pub-dir)
"Publish an org file to LaTeX.
See `org-publish-org-to' to the list of arguments."
(org-publish-org-to "latex" plist filename pub-dir))
+(defun org-publish-org-to-pdf (plist filename pub-dir)
+ "Publish an org file to PDF (via LaTeX).
+See `org-publish-org-to' to the list of arguments."
+ (org-publish-org-to "pdf" plist filename pub-dir))
+
(defun org-publish-org-to-html (plist filename pub-dir)
"Publish an org file to HTML.
See `org-publish-org-to' to the list of arguments."
"Publish a file with no transformation of any kind.
See `org-publish-org-to' to the list of arguments."
;; make sure eshell/cp code is loaded
- (eval-and-compile
- (require 'eshell)
- (require 'esh-maint)
- (require 'em-unix))
- (eshell/cp filename pub-dir))
+ (unless (file-directory-p pub-dir)
+ (make-directory pub-dir t))
+ (copy-file filename pub-dir t))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Publishing files, sets of files, and indices
(abbreviate-file-name filename))))
(error "Can't publish file outside of a project")))))
(project-plist (cdr project))
- (publishing-function
+ (ftname (file-truename filename))
+ (publishing-function
(or (plist-get project-plist :publishing-function)
'org-publish-org-to-html))
(base-dir (file-name-as-directory
(setq tmp-pub-dir
(file-name-directory
(concat pub-dir
- (and (string-match (regexp-quote base-dir) filename)
- (substring filename (match-end 0))))))
+ (and (string-match (regexp-quote base-dir) ftname)
+ (substring ftname (match-end 0))))))
(if (listp publishing-function)
;; allow chain of publishing functions
(mapc (lambda (f)
If :auto-index is set, publish the index too."
(mapc
(lambda (project)
- (let* ((project-plist (cdr project))
- (exclude-regexp (plist-get project-plist :exclude))
- (index-p (plist-get project-plist :auto-index))
- (index-filename (or (plist-get project-plist :index-filename)
- "index.org"))
- (index-function (or (plist-get project-plist :index-function)
- 'org-publish-org-index))
- (preparation-function (plist-get project-plist :preparation-function))
- (files (org-publish-get-base-files project exclude-regexp)) file)
+ (let*
+ ((project-plist (cdr project))
+ (exclude-regexp (plist-get project-plist :exclude))
+ (index-p (plist-get project-plist :auto-index))
+ (index-filename (or (plist-get project-plist :index-filename)
+ "index.org"))
+ (index-function (or (plist-get project-plist :index-function)
+ 'org-publish-org-index))
+ (preparation-function (plist-get project-plist :preparation-function))
+ (completion-function (plist-get project-plist :completion-function))
+ (files (org-publish-get-base-files project exclude-regexp)) file)
(when preparation-function (funcall preparation-function))
(if index-p (funcall index-function project index-filename))
(while (setq file (pop files))
- (org-publish-file file project))))
+ (org-publish-file file project))
+ (when completion-function (funcall completion-function))))
(org-publish-expand-projects projects)))
(defun org-publish-org-index (project &optional index-filename)
(let* ((project-plist (cdr project))
(dir (file-name-as-directory
(plist-get project-plist :base-directory)))
+ (localdir (file-name-directory dir))
+ (indent-str (make-string 2 ?\ ))
(exclude-regexp (plist-get project-plist :exclude))
- (files (org-publish-get-base-files project exclude-regexp))
+ (files (nreverse (org-publish-get-base-files project exclude-regexp)))
(index-filename (concat dir (or index-filename "index.org")))
- (index-buffer (find-buffer-visiting index-filename))
+ (index-title (or (plist-get project-plist :index-title)
+ (concat "Index for project " (car project))))
+ (index-style (or (plist-get project-plist :index-style)
+ 'tree))
+ (visiting (find-buffer-visiting index-filename))
(ifn (file-name-nondirectory index-filename))
- file)
- ;; if buffer is already open, kill it to prevent error message
- (if index-buffer
- (kill-buffer index-buffer))
- (with-temp-buffer
+ file index-buffer)
+ (with-current-buffer (setq index-buffer
+ (or visiting (find-file index-filename)))
+ (erase-buffer)
+ (insert (concat "#+TITLE: " index-title "\n\n"))
(while (setq file (pop files))
- (let ((fn (file-name-nondirectory file)))
+ (let ((fn (file-name-nondirectory file))
+ (link (file-relative-name file dir))
+ (oldlocal localdir))
;; index shouldn't index itself
- (unless (string= fn ifn)
- (insert (concat " + [[file:" fn "]["
- (file-name-sans-extension fn)
+ (unless (equal (file-truename index-filename)
+ (file-truename file))
+ (if (eq index-style 'list)
+ (message "Generating list-style index for %s" index-title)
+ (message "Generating tree-style index for %s" index-title)
+ (setq localdir (concat (file-name-as-directory dir)
+ (file-name-directory link)))
+ (unless (string= localdir oldlocal)
+ (if (string= localdir dir)
+ (setq indent-str (make-string 2 ?\ ))
+ (let ((subdirs
+ (split-string
+ (directory-file-name
+ (file-name-directory
+ (file-relative-name localdir dir))) "/"))
+ (subdir "")
+ (old-subdirs (split-string
+ (file-relative-name oldlocal dir) "/")))
+ (setq indent-str (make-string 2 ?\ ))
+ (while (string= (car old-subdirs) (car subdirs))
+ (setq indent-str (concat indent-str (make-string 2 ?\ )))
+ (pop old-subdirs)
+ (pop subdirs))
+ (dolist (d subdirs)
+ (setq subdir (concat subdir d "/"))
+ (insert (concat indent-str " + " d "\n"))
+ (setq indent-str (make-string
+ (+ (length indent-str) 2) ?\ )))))))
+ ;; This is common to 'flat and 'tree
+ (insert (concat indent-str " + [[file:" link "]["
+ (org-publish-find-title file)
"]]\n")))))
- (write-file index-filename)
- (kill-buffer (current-buffer)))))
+ (save-buffer))
+ (or visiting (kill-buffer index-buffer))))
+
+(defun org-publish-find-title (file)
+ "Find the title of file in project."
+ (let* ((visiting (find-buffer-visiting file))
+ (buffer (or visiting (find-file-noselect file)))
+ title)
+ (save-excursion
+ (set-buffer buffer)
+ (let* ((opt-plist (org-combine-plists (org-default-export-plist)
+ (org-infile-export-plist))))
+ (setq title
+ (or (plist-get opt-plist :title)
+ (and (not
+ (plist-get opt-plist :skip-before-1st-heading))
+ (org-export-grab-title-from-buffer))
+ (file-name-nondirectory (file-name-sans-extension file))))))
+ (unless visiting
+ (kill-buffer buffer))
+ title))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Interactive publishing functions
-(defalias 'org-publish-project 'org-publish "Publish project.")
+;;;###autoload
+(defalias 'org-publish-project 'org-publish)
;;;###autoload
(defun org-publish (project &optional force)
"Publish PROJECT."
(interactive "P")
+ (setq org-publish-initial-buffer (current-buffer))
(save-window-excursion
(let* ((force current-prefix-arg)
(org-publish-use-timestamps-flag
(if force nil org-publish-use-timestamps-flag)))
(org-publish-projects
(list (or project
- (assoc (completing-read
+ (assoc (org-ido-completing-read
"Publish project: "
org-publish-project-alist nil t)
org-publish-project-alist)))))))
;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
+
;;; org-publish.el ends here