diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 5646430dd..ce22bc905 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -202,8 +202,8 @@ The following properties control the creation of a concept index. Other properties affecting publication. :body-only Set this to 't' to publish only the body of the - documents, excluding everything outside and - including the tags in HTML, or + documents, excluding everything outside and + including the tags in HTML, or \begin{document}..\end{document} in LaTeX." :group 'org-publish :type 'alist) @@ -530,9 +530,9 @@ matching filenames." (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$"))) (when (or - (and + (and i (member filename - (mapcar + (mapcar (lambda (file) (expand-file-name file b)) i))) (and @@ -571,8 +571,8 @@ PUB-DIR is the publishing directory." (setq export-buf-or-file (funcall (intern (concat "org-export-as-" format)) (plist-get plist :headline-levels) - nil plist nil - (plist-get plist :body-only) + nil plist nil + (plist-get plist :body-only) pub-dir)) (when (and (bufferp export-buf-or-file) (buffer-live-p export-buf-or-file)) @@ -808,7 +808,7 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." (+ (length indent-str) 2) ?\ ))))))) ;; This is common to 'flat and 'tree (let ((entry - (org-publish-format-file-entry sitemap-file-entry-format + (org-publish-format-file-entry sitemap-file-entry-format file project-plist)) (regexp "\\(.*\\)\\[\\([^][]+\\)\\]\\(.*\\)")) (cond ((string-match-p regexp entry) @@ -817,7 +817,7 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." "[[file:" link "][" (match-string 2 entry) "]]" (match-string 3 entry) "\n"))) - (t + (t (insert (concat indent-str " + [[file:" link "][" entry "]]\n")))))))) @@ -827,10 +827,10 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." (defun org-publish-format-file-entry (fmt file project-plist) (format-spec fmt `((?t . ,(org-publish-find-title file t)) - (?d . ,(format-time-string sitemap-date-format + (?d . ,(format-time-string sitemap-date-format (org-publish-find-date file))) (?a . ,(or (plist-get project-plist :author) user-full-name))))) - + (defun org-publish-find-title (file &optional reset) "Find the title of FILE in project." (or @@ -1160,7 +1160,7 @@ Returns value on success, else nil." (let* ((symlink-maybe (or (file-symlink-p filename) filename)) (src-attr (file-attributes (if (file-name-absolute-p symlink-maybe) symlink-maybe - (expand-file-name + (expand-file-name symlink-maybe (file-name-directory filename)))))) (+