From 03a9191dd3be397715c8f919ae656d1c8221f8fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 27 Jan 2013 23:14:33 +0100 Subject: [PATCH] Move previous export framework into contrib * contrib/lisp/org-ascii.el: New file. * contrib/lisp/org-beamer.el: New file. * contrib/lisp/org-docbook.el: New file. * contrib/lisp/org-exp-blocks.el: New file. * contrib/lisp/org-exp.el: New file. * contrib/lisp/org-freemind.el: New file. * contrib/lisp/org-html.el: New file. * contrib/lisp/org-icalendar.el: New file. * contrib/lisp/org-jsinfo.el: New file. * contrib/lisp/org-latex.el: New file. * contrib/lisp/org-lparse.el: New file. * contrib/lisp/org-odt.el: New file. * contrib/lisp/org-publish.el: New file. * contrib/lisp/org-special-blocks.el: New file. * contrib/lisp/org-taskjuggler.el: New file. * contrib/lisp/org-xoxo.el: New file. * lisp/org-ascii.el: Removed file. * lisp/org-beamer.el: Removed file. * lisp/org-docbook.el: Removed file. * lisp/org-exp-blocks.el: Removed file. * lisp/org-exp.el: Removed file. * lisp/org-freemind.el: Removed file. * lisp/org-html.el: Removed file. * lisp/org-icalendar.el: Removed file. * lisp/org-jsinfo.el: Removed file. * lisp/org-latex.el: Removed file. * lisp/org-lparse.el: Removed file. * lisp/org-odt.el: Removed file. * lisp/org-publish.el: Removed file. * lisp/org-special-blocks.el: Removed file. * lisp/org-taskjuggler.el: Removed file. * lisp/org-xoxo.el: Removed file. * testing/lisp/test-org-exp.el: Removed file. * testing/lisp/test-org-html.el: Removed file. --- {lisp => contrib/lisp}/org-ascii.el | 10 ----- {lisp => contrib/lisp}/org-beamer.el | 2 - {lisp => contrib/lisp}/org-docbook.el | 7 ---- {lisp => contrib/lisp}/org-exp-blocks.el | 0 {lisp => contrib/lisp}/org-exp.el | 8 ---- contrib/lisp/org-export-generic.el | 2 - {lisp => contrib/lisp}/org-freemind.el | 6 --- {lisp => contrib/lisp}/org-html.el | 9 ---- {lisp => contrib/lisp}/org-icalendar.el | 3 -- {lisp => contrib/lisp}/org-jsinfo.el | 0 {lisp => contrib/lisp}/org-latex.el | 7 ---- {lisp => contrib/lisp}/org-lparse.el | 0 {lisp => contrib/lisp}/org-odt.el | 7 ---- {lisp => contrib/lisp}/org-publish.el | 5 --- {lisp => contrib/lisp}/org-special-blocks.el | 0 {lisp => contrib/lisp}/org-taskjuggler.el | 2 - {lisp => contrib/lisp}/org-xoxo.el | 1 - testing/lisp/test-org-exp.el | 31 -------------- testing/lisp/test-org-html.el | 44 -------------------- 19 files changed, 144 deletions(-) rename {lisp => contrib/lisp}/org-ascii.el (99%) rename {lisp => contrib/lisp}/org-beamer.el (99%) rename {lisp => contrib/lisp}/org-docbook.el (99%) rename {lisp => contrib/lisp}/org-exp-blocks.el (100%) rename {lisp => contrib/lisp}/org-exp.el (99%) rename {lisp => contrib/lisp}/org-freemind.el (99%) rename {lisp => contrib/lisp}/org-html.el (99%) rename {lisp => contrib/lisp}/org-icalendar.el (99%) rename {lisp => contrib/lisp}/org-jsinfo.el (100%) rename {lisp => contrib/lisp}/org-latex.el (99%) rename {lisp => contrib/lisp}/org-lparse.el (100%) rename {lisp => contrib/lisp}/org-odt.el (99%) rename {lisp => contrib/lisp}/org-publish.el (99%) rename {lisp => contrib/lisp}/org-special-blocks.el (100%) rename {lisp => contrib/lisp}/org-taskjuggler.el (99%) rename {lisp => contrib/lisp}/org-xoxo.el (99%) delete mode 100644 testing/lisp/test-org-exp.el delete mode 100644 testing/lisp/test-org-html.el diff --git a/lisp/org-ascii.el b/contrib/lisp/org-ascii.el similarity index 99% rename from lisp/org-ascii.el rename to contrib/lisp/org-ascii.el index c5a4b3775..caeb1ef6c 100644 --- a/lisp/org-ascii.el +++ b/contrib/lisp/org-ascii.el @@ -90,21 +90,18 @@ utf8 Use all UTF-8 characters") (defvar org-ascii-current-indentation nil) ; For communication -;;;###autoload (defun org-export-as-latin1 (&rest args) "Like `org-export-as-ascii', use latin1 encoding for special symbols." (interactive) (org-export-as-encoding 'org-export-as-ascii (org-called-interactively-p 'any) 'latin1 args)) -;;;###autoload (defun org-export-as-latin1-to-buffer (&rest args) "Like `org-export-as-ascii-to-buffer', use latin1 encoding for symbols." (interactive) (org-export-as-encoding 'org-export-as-ascii-to-buffer (org-called-interactively-p 'any) 'latin1 args)) -;;;###autoload (defun org-export-as-utf8 (&rest args) "Like `org-export-as-ascii', use encoding for special symbols." (interactive) @@ -112,7 +109,6 @@ utf8 Use all UTF-8 characters") (org-called-interactively-p 'any) 'utf8 args)) -;;;###autoload (defun org-export-as-utf8-to-buffer (&rest args) "Like `org-export-as-ascii-to-buffer', use utf8 encoding for symbols." (interactive) @@ -126,7 +122,6 @@ utf8 Use all UTF-8 characters") (apply command args)))) -;;;###autoload (defun org-export-as-ascii-to-buffer (arg) "Call `org-export-as-ascii` with output to a temporary buffer. No file is created. The prefix ARG is passed through to `org-export-as-ascii'." @@ -135,7 +130,6 @@ No file is created. The prefix ARG is passed through to `org-export-as-ascii'." (when org-export-show-temporary-export-buffer (switch-to-buffer-other-window "*Org ASCII Export*"))) -;;;###autoload (defun org-replace-region-by-ascii (beg end) "Assume the current region has org-mode syntax, and convert it to plain ASCII. This can be used in any buffer. For example, you could write an @@ -159,7 +153,6 @@ command to convert it." (delete-region beg end) (insert ascii))) -;;;###autoload (defun org-export-region-as-ascii (beg end &optional body-only buffer) "Convert region from BEG to END in org-mode buffer to plain ASCII. If prefix arg BODY-ONLY is set, omit file header, footer, and table of @@ -189,7 +182,6 @@ in a window. A non-interactive call will only return the buffer." (switch-to-buffer-other-window rtn) rtn))) -;;;###autoload (defun org-export-as-ascii (arg &optional ext-plist to-buffer body-only pub-dir) "Export the outline as a pretty ASCII file. If there is an active region, export only the region. @@ -549,7 +541,6 @@ publishing directory." (kill-buffer (current-buffer))) (current-buffer)))) -;;;###autoload (defun org-export-ascii-preprocess (parameters) "Do extra work for ASCII export." ;; @@ -724,7 +715,6 @@ publishing directory." (provide 'org-ascii) ;; Local variables: -;; generated-autoload-file: "org-loaddefs.el" ;; End: ;;; org-ascii.el ends here diff --git a/lisp/org-beamer.el b/contrib/lisp/org-beamer.el similarity index 99% rename from lisp/org-beamer.el rename to contrib/lisp/org-beamer.el index 78b57a4c0..21227c539 100644 --- a/lisp/org-beamer.el +++ b/contrib/lisp/org-beamer.el @@ -228,7 +228,6 @@ the tag does not have any semantic meaning." (org-entry-put nil "BEAMER_env" (match-string 1 tags))) (t (org-entry-delete nil "BEAMER_env")))))) -;;;###autoload (defun org-beamer-sectioning (level text) "Return the sectioning entry for the current headline. LEVEL is the reduced level of the headline. @@ -370,7 +369,6 @@ org-beamer-extra are all scoped into this function dynamically." "The keymap for `org-beamer-mode'.") (define-key org-beamer-mode-map "\C-c\C-b" 'org-beamer-select-environment) -;;;###autoload (define-minor-mode org-beamer-mode "Special support for editing Org-mode files made to export to beamer." nil " Bm" nil) diff --git a/lisp/org-docbook.el b/contrib/lisp/org-docbook.el similarity index 99% rename from lisp/org-docbook.el rename to contrib/lisp/org-docbook.el index 5253d9100..5e2c9f93b 100644 --- a/lisp/org-docbook.el +++ b/contrib/lisp/org-docbook.el @@ -264,7 +264,6 @@ the variable to ;;; Autoload functions: -;;;###autoload (defun org-export-as-docbook-batch () "Call `org-export-as-docbook' in batch style. This function can be used in batch processing. @@ -276,7 +275,6 @@ $ emacs --batch --visit=MyOrgFile.org --funcall org-export-as-docbook-batch" (org-export-as-docbook)) -;;;###autoload (defun org-export-as-docbook-to-buffer () "Call `org-export-as-docbook' with output to a temporary buffer. No file is created." @@ -285,7 +283,6 @@ No file is created." (when org-export-show-temporary-export-buffer (switch-to-buffer-other-window "*Org DocBook Export*"))) -;;;###autoload (defun org-replace-region-by-docbook (beg end) "Replace the region from BEG to END with its DocBook export. It assumes the region has `org-mode' syntax, and then convert it to @@ -310,7 +307,6 @@ then use this command to convert it." (delete-region beg end) (insert docbook))) -;;;###autoload (defun org-export-region-as-docbook (beg end &optional body-only buffer) "Convert region from BEG to END in `org-mode' buffer to DocBook. If prefix arg BODY-ONLY is set, omit file header and footer and @@ -340,7 +336,6 @@ in a window. A non-interactive call will only return the buffer." (switch-to-buffer-other-window rtn) rtn))) -;;;###autoload (defun org-export-as-docbook-pdf (&optional ext-plist to-buffer body-only pub-dir) "Export as DocBook XML file, and generate PDF file." (interactive "P") @@ -382,7 +377,6 @@ in a window. A non-interactive call will only return the buffer." (message "Exporting to PDF...done") pdffile))) -;;;###autoload (defun org-export-as-docbook-pdf-and-open () "Export as DocBook XML file, generate PDF file, and open it." (interactive) @@ -393,7 +387,6 @@ in a window. A non-interactive call will only return the buffer." (defvar org-heading-keyword-regexp-format) ; defined in org.el -;;;###autoload (defun org-export-as-docbook (&optional ext-plist to-buffer body-only pub-dir) "Export the current buffer as a DocBook file. If there is an active region, export only the region. When diff --git a/lisp/org-exp-blocks.el b/contrib/lisp/org-exp-blocks.el similarity index 100% rename from lisp/org-exp-blocks.el rename to contrib/lisp/org-exp-blocks.el diff --git a/lisp/org-exp.el b/contrib/lisp/org-exp.el similarity index 99% rename from lisp/org-exp.el rename to contrib/lisp/org-exp.el index 4296c2c9c..613d6f866 100644 --- a/lisp/org-exp.el +++ b/contrib/lisp/org-exp.el @@ -49,12 +49,7 @@ (&optional buffer-or-name norecord label)) (declare-function org-unescape-code-in-region "org-src" (beg end)) -(autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t) -(autoload 'org-export-as-odt "org-odt" - "Export the outline to a OpenDocument Text file." t) -(autoload 'org-export-as-odt-and-open "org-odt" - "Export the outline to a OpenDocument Text file and open it." t) (defgroup org-export nil "Options for exporting org-listings." @@ -962,7 +957,6 @@ security risks." (setq plist (funcall f plist)))) plist) -;;;###autoload (defun org-export (&optional arg) "Export dispatcher for Org-mode. When `org-export-run-in-background' is non-nil, try to run the command @@ -2954,7 +2948,6 @@ block numbering. When non-nil do the following: (if (<= lv level) (throw 'exit nil)) (if todo (throw 'exit t)))))))) -;;;###autoload (defun org-export-visible (type arg) "Create a copy of the visible part of the current buffer, and export it. The copy is created in a temporary buffer and removed after use. @@ -3057,7 +3050,6 @@ to the value of `temporary-file-directory'." nil nil ''string t dir)))) (delete-file tmp-file)))) -;;;###autoload (defun org-export-as-org (arg &optional ext-plist to-buffer body-only pub-dir) "Make a copy with not-exporting stuff removed. The purpose of this function is to provide a way to export the source diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el index 104019887..38de0874f 100644 --- a/contrib/lisp/org-export-generic.el +++ b/contrib/lisp/org-export-generic.el @@ -514,7 +514,6 @@ in this way, it will be wrapped." (defvar org-export-generic-section-type "") (defvar org-export-generic-section-suffix "") -;;;###autoload (defun org-set-generic-type (type definition) "Adds a TYPE and DEFINITION to the existing list of defined generic export definitions." @@ -570,7 +569,6 @@ suffix a later change time." (if prefix (insert prefix)))) -;;;###autoload (defun org-export-generic (arg) "Export the outline as generic output. If there is an active region, export only the region. diff --git a/lisp/org-freemind.el b/contrib/lisp/org-freemind.el similarity index 99% rename from lisp/org-freemind.el rename to contrib/lisp/org-freemind.el index c33b70224..fb303cc89 100644 --- a/lisp/org-freemind.el +++ b/contrib/lisp/org-freemind.el @@ -137,7 +137,6 @@ NOT READY YET." (integer :tag "Font size" :value 12))))))) :group 'org-freemind) -;;;###autoload (defun org-export-as-freemind (&optional hidden ext-plist to-buffer body-only pub-dir) "Export the current buffer as a Freemind file. @@ -191,7 +190,6 @@ See `org-freemind-from-org-mode' for more information." filename)) (t (org-freemind-from-org-mode bfname filename))))) -;;;###autoload (defun org-freemind-show (mm-file) "Show file MM-FILE in Freemind." (interactive @@ -888,7 +886,6 @@ Otherwise give an error say the file exists." (insert (format " size=\"%s\"" font-size)) )))) -;;;###autoload (defun org-freemind-from-org-mode-node (node-line mm-file) "Convert node at line NODE-LINE to the FreeMind file MM-FILE. See `org-freemind-from-org-mode' for more information." @@ -915,7 +912,6 @@ See `org-freemind-from-org-mode' for more information." (when (y-or-n-p "Show in FreeMind? ") (org-freemind-show buffer-file-name))))))) -;;;###autoload (defun org-freemind-from-org-mode (org-file mm-file) "Convert the `org-mode' file ORG-FILE to the FreeMind file MM-FILE. All the nodes will be opened or closed in Freemind just as you @@ -948,7 +944,6 @@ can use a CSS stylesheet to style it)." (when (y-or-n-p "Show in FreeMind? ") (org-freemind-show buffer-file-name))))))) -;;;###autoload (defun org-freemind-from-org-sparse-tree (org-buffer mm-file) "Convert visible part of buffer ORG-BUFFER to FreeMind file MM-FILE." (interactive @@ -1187,7 +1182,6 @@ PATH should be a list of steps, where each step has the form ;; Fix-me: put back special things, like drawers that are stored in ;; the notes. Should maybe all notes contents be put in drawers? -;;;###autoload (defun org-freemind-to-org-mode (mm-file org-file) "Convert FreeMind file MM-FILE to `org-mode' file ORG-FILE." (interactive diff --git a/lisp/org-html.el b/contrib/lisp/org-html.el similarity index 99% rename from lisp/org-html.el rename to contrib/lisp/org-html.el index 5d0e49d91..58de1c756 100644 --- a/lisp/org-html.el +++ b/contrib/lisp/org-html.el @@ -211,7 +211,6 @@ your own style information." :group 'org-export-html :type 'boolean) -;;;###autoload (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp) (defcustom org-export-html-style "" @@ -243,7 +242,6 @@ you can \"misuse\" it to add arbitrary text to the header. See also the variable `org-export-html-style-extra'." :group 'org-export-html :type 'string) -;;;###autoload (put 'org-export-html-style 'safe-local-variable 'stringp) (defcustom org-export-html-style-extra "" @@ -254,7 +252,6 @@ settings of style information, and do not forget to surround the style settings with tags." :group 'org-export-html :type 'string) -;;;###autoload (put 'org-export-html-style-extra 'safe-local-variable 'stringp) (defcustom org-export-html-mathjax-options @@ -792,7 +789,6 @@ The default is an extended format of the ISO 8601 specification." (setq l1 label))) (replace-match (format "[[#%s][%s]]" label l1) t t))))) -;;;###autoload (defun org-export-as-html-and-open (arg) "Export the outline as HTML and immediately open it with a browser. If there is an active region, export only the region. @@ -804,7 +800,6 @@ headlines. The default is 3. Lower levels will become bulleted lists." (when org-export-kill-product-buffer-when-displayed (kill-buffer (current-buffer)))) -;;;###autoload (defun org-export-as-html-batch () "Call the function `org-export-as-html'. This function can be used in batch processing as: @@ -814,7 +809,6 @@ emacs --batch --visit=MyFile --funcall org-export-as-html-batch" (org-export-as-html org-export-headline-levels)) -;;;###autoload (defun org-export-as-html-to-buffer (arg) "Call `org-export-as-html` with output to a temporary buffer. No file is created. The prefix ARG is passed through to `org-export-as-html'." @@ -823,7 +817,6 @@ No file is created. The prefix ARG is passed through to `org-export-as-html'." (when org-export-show-temporary-export-buffer (switch-to-buffer-other-window "*Org HTML Export*"))) -;;;###autoload (defun org-replace-region-by-html (beg end) "Assume the current region has org-mode syntax, and convert it to HTML. This can be used in any buffer. For example, you could write an @@ -847,7 +840,6 @@ command to convert it." (delete-region beg end) (insert html))) -;;;###autoload (defun org-export-region-as-html (beg end &optional body-only buffer) "Convert region from BEG to END in org-mode buffer to HTML. If prefix arg BODY-ONLY is set, omit file header, footer, and table of @@ -1177,7 +1169,6 @@ OPT-PLIST is the export options list." (defvar org-heading-keyword-regexp-format) ; defined in org.el -;;;###autoload (defun org-export-as-html (arg &optional ext-plist to-buffer body-only pub-dir) "Export the outline as a pretty HTML file. If there is an active region, export only the region. The prefix diff --git a/lisp/org-icalendar.el b/contrib/lisp/org-icalendar.el similarity index 99% rename from lisp/org-icalendar.el rename to contrib/lisp/org-icalendar.el index 12cd0584f..76f46d1c2 100644 --- a/lisp/org-icalendar.el +++ b/contrib/lisp/org-icalendar.el @@ -228,7 +228,6 @@ Interesting value are: ;;; iCalendar export -;;;###autoload (defun org-export-icalendar-this-file () "Export current file as an iCalendar file. The iCalendar file will be located in the same directory as the Org-mode @@ -236,7 +235,6 @@ file, but with extension `.ics'." (interactive) (org-export-icalendar nil buffer-file-name)) -;;;###autoload (defun org-export-icalendar-all-agenda-files () "Export all files in the variable `org-agenda-files' to iCalendar .ics files. Each iCalendar file will be located in the same directory as the Org-mode @@ -244,7 +242,6 @@ file, but with extension `.ics'." (interactive) (apply 'org-export-icalendar nil (org-agenda-files t))) -;;;###autoload (defun org-export-icalendar-combine-agenda-files () "Export all files in `org-agenda-files' to a single combined iCalendar file. The file is stored under the name `org-combined-agenda-icalendar-file'." diff --git a/lisp/org-jsinfo.el b/contrib/lisp/org-jsinfo.el similarity index 100% rename from lisp/org-jsinfo.el rename to contrib/lisp/org-jsinfo.el diff --git a/lisp/org-latex.el b/contrib/lisp/org-latex.el similarity index 99% rename from lisp/org-latex.el rename to contrib/lisp/org-latex.el index 464a3646d..cc0278a68 100644 --- a/lisp/org-latex.el +++ b/contrib/lisp/org-latex.el @@ -789,7 +789,6 @@ have been determined from the environment.") ;;; Autoload functions: -;;;###autoload (defun org-export-as-latex-batch () "Call `org-export-as-latex', may be used in batch processing. For example: @@ -800,7 +799,6 @@ emacs --batch --visit=MyFile --funcall org-export-as-latex-batch" (org-export-as-latex org-export-headline-levels)) -;;;###autoload (defun org-export-as-latex-to-buffer (arg) "Call `org-export-as-latex` with output to a temporary buffer. No file is created. The prefix ARG is passed through to `org-export-as-latex'." @@ -809,7 +807,6 @@ No file is created. The prefix ARG is passed through to `org-export-as-latex'." (when org-export-show-temporary-export-buffer (switch-to-buffer-other-window "*Org LaTeX Export*"))) -;;;###autoload (defun org-replace-region-by-latex (beg end) "Replace the region from BEG to END with its LaTeX export. It assumes the region has `org-mode' syntax, and then convert it to @@ -834,7 +831,6 @@ then use this command to convert it." (delete-region beg end) (insert latex))) -;;;###autoload (defun org-export-region-as-latex (beg end &optional body-only buffer) "Convert region from BEG to END in `org-mode' buffer to LaTeX. If prefix arg BODY-ONLY is set, omit file header, footer, and table of @@ -866,7 +862,6 @@ in a window. A non-interactive call will only return the buffer." (switch-to-buffer-other-window rtn) rtn))) -;;;###autoload (defun org-export-as-latex (arg &optional ext-plist to-buffer body-only pub-dir) "Export current buffer to a LaTeX file. If there is an active region, export only the region. The prefix @@ -1121,7 +1116,6 @@ When PUB-DIR is set, use this as the publishing directory." (current-buffer)) (set-window-configuration wcf)))) -;;;###autoload (defun org-export-as-pdf (arg &optional hidden ext-plist to-buffer body-only pub-dir) "Export as LaTeX, then process through to PDF." @@ -1207,7 +1201,6 @@ When PUB-DIR is set, use this as the publishing directory." (setq errors (concat errors " [undefined control sequence]"))) (and (org-string-nw-p errors) errors)))))) -;;;###autoload (defun org-export-as-pdf-and-open (arg) "Export as LaTeX, then process through to PDF, and open." (interactive "P") diff --git a/lisp/org-lparse.el b/contrib/lisp/org-lparse.el similarity index 100% rename from lisp/org-lparse.el rename to contrib/lisp/org-lparse.el diff --git a/lisp/org-odt.el b/contrib/lisp/org-odt.el similarity index 99% rename from lisp/org-odt.el rename to contrib/lisp/org-odt.el index eba8139ad..7caa9f896 100644 --- a/lisp/org-odt.el +++ b/contrib/lisp/org-odt.el @@ -426,7 +426,6 @@ values. See Info node `(emacs) File Variables'." ,@(mapcar (lambda (c) `(const :tag ,c ,c)) (org-lparse-reachable-formats "odt"))))) -;;;###autoload (put 'org-export-odt-preferred-output-format 'safe-local-variable 'stringp) (defmacro org-odt-cleanup-xml-buffers (&rest body) @@ -456,7 +455,6 @@ values. See Info node `(emacs) File Variables'." (message "OpenDocument export failed: %s" (error-message-string err)))))) -;;;###autoload (defun org-export-as-odt-and-open (arg) "Export the outline as ODT and immediately open it with a browser. If there is an active region, export only the region. @@ -467,7 +465,6 @@ headlines. The default is 3. Lower levels will become bulleted lists." (org-lparse-and-open (or org-export-odt-preferred-output-format "odt") "odt" arg))) -;;;###autoload (defun org-export-as-odt-batch () "Call the function `org-lparse-batch'. This function can be used in batch processing as: @@ -478,7 +475,6 @@ emacs --batch (org-odt-cleanup-xml-buffers (org-lparse-batch "odt"))) ;;; org-export-as-odt -;;;###autoload (defun org-export-as-odt (arg &optional hidden ext-plist to-buffer body-only pub-dir) "Export the outline as a OpenDocumentText file. @@ -2603,7 +2599,6 @@ configuration." (declare-function org-create-math-formula "org" (latex-frag &optional mathml-file)) -;;;###autoload (defun org-export-odt-convert (&optional in-file out-fmt prefix-arg) "Convert IN-FILE to format OUT-FMT using a command line converter. IN-FILE is the file to be converted. If unspecified, it defaults @@ -2793,7 +2788,6 @@ To disable outline numbering pass a LEVEL of 0." (replace-match replacement t nil)))) (save-buffer 0)) -;;;###autoload (defun org-export-as-odf (latex-frag &optional odf-file) "Export LATEX-FRAG as OpenDocument formula file ODF-FILE. Use `org-create-math-formula' to convert LATEX-FRAG first to @@ -2842,7 +2836,6 @@ non-nil." (message "Exporting... done"))) (org-odt-save-as-outfile filename nil)))) -;;;###autoload (defun org-export-as-odf-and-open () "Export LaTeX fragment as OpenDocument formula and immediately open it. Use `org-export-as-odf' to read LaTeX fragment and OpenDocument diff --git a/lisp/org-publish.el b/contrib/lisp/org-publish.el similarity index 99% rename from lisp/org-publish.el rename to contrib/lisp/org-publish.el index 908f3e3da..eaa1b0c9a 100644 --- a/lisp/org-publish.el +++ b/contrib/lisp/org-publish.el @@ -888,10 +888,8 @@ It returns time in `current-time' format." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Interactive publishing functions -;;;###autoload (defalias 'org-publish-project 'org-publish) -;;;###autoload (defun org-publish (project &optional force) "Publish PROJECT." (interactive @@ -912,7 +910,6 @@ It returns time in `current-time' format." (list (assoc project org-publish-project-alist)) (list project)))))) -;;;###autoload (defun org-publish-all (&optional force) "Publish all projects. With prefix argument, remove all files in the timestamp @@ -925,7 +922,6 @@ directory and force publishing all files." (if force nil org-publish-use-timestamps-flag))) (org-publish-projects org-publish-project-alist)))) -;;;###autoload (defun org-publish-current-file (&optional force) "Publish the current file. With prefix argument, force publish the file." @@ -935,7 +931,6 @@ With prefix argument, force publish the file." (if force nil org-publish-use-timestamps-flag))) (org-publish-file (buffer-file-name))))) -;;;###autoload (defun org-publish-current-project (&optional force) "Publish the project associated with the current file. With a prefix argument, force publishing of all files in diff --git a/lisp/org-special-blocks.el b/contrib/lisp/org-special-blocks.el similarity index 100% rename from lisp/org-special-blocks.el rename to contrib/lisp/org-special-blocks.el diff --git a/lisp/org-taskjuggler.el b/contrib/lisp/org-taskjuggler.el similarity index 99% rename from lisp/org-taskjuggler.el rename to contrib/lisp/org-taskjuggler.el index 0bacf285a..aebdd3d18 100644 --- a/lisp/org-taskjuggler.el +++ b/contrib/lisp/org-taskjuggler.el @@ -297,7 +297,6 @@ but before any resource and task declarations." ;; avoid compiler warning about free variable (defvar org-export-taskjuggler-old-level) -;;;###autoload (defun org-export-as-taskjuggler (&optional arg hidden ext-plist to-buffer body-only pub-dir) "Export parts of the current buffer as a TaskJuggler file. @@ -417,7 +416,6 @@ defined in `org-export-taskjuggler-default-reports'." (kill-buffer (current-buffer))) (current-buffer))))) -;;;###autoload (defun org-export-as-taskjuggler-and-open () "Export the current buffer as a TaskJuggler file and open it with the TaskJuggler GUI." diff --git a/lisp/org-xoxo.el b/contrib/lisp/org-xoxo.el similarity index 99% rename from lisp/org-xoxo.el rename to contrib/lisp/org-xoxo.el index 1083fe16c..a9cfc6b6c 100644 --- a/lisp/org-xoxo.el +++ b/contrib/lisp/org-xoxo.el @@ -37,7 +37,6 @@ (apply 'insert output))) (put 'org-export-as-xoxo-insert-into 'lisp-indent-function 1) -;;;###autoload (defun org-export-as-xoxo (&optional buffer) "Export the org buffer as XOXO. The XOXO buffer is named *xoxo-*" diff --git a/testing/lisp/test-org-exp.el b/testing/lisp/test-org-exp.el deleted file mode 100644 index e207a52f3..000000000 --- a/testing/lisp/test-org-exp.el +++ /dev/null @@ -1,31 +0,0 @@ -;;; test-org-exp.el --- tests for org-exp.el - -;; Copyright (c) 2010-2013 Eric Schulte -;; Authors: Eric Schulte - -;; This file is not part of GNU Emacs. - -;; 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 3 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, see . - -;;; Code: -(ert-deftest test-org-exp/stripping-commas () - "Test the stripping of commas from within blocks during export." - (org-test-at-id "76d3a083-67fa-4506-a41d-837cc48158b5" - ;; don't strip internal commas - (org-narrow-to-subtree) - (should (string-match - ", 2" - (org-export-as-ascii nil nil 'string))))) - -(provide 'test-org-exp) diff --git a/testing/lisp/test-org-html.el b/testing/lisp/test-org-html.el deleted file mode 100644 index 492c388e6..000000000 --- a/testing/lisp/test-org-html.el +++ /dev/null @@ -1,44 +0,0 @@ -;;; test-org-html.el --- tests for org-html.el - -;; Copyright (c) David Maus -;; Authors: David Maus - -;; This file is not part of GNU Emacs. - -;; 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 3 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, see . - -;;; Comments: - -;; Template test file for Org-mode tests - -;;; Code: -(unless (featurep 'org-html) - (signal 'missing-test-dependency "Support for Org-html")) - -(defmacro org-test-html/export-link (name link expected &optional desc opt-plist) - `(ert-deftest ,(intern (concat "test-org-html/export-link/" name)) () - ,(or desc name) - (should - (string= - (org-test-strip-text-props - (org-html-handle-links ,link ,opt-plist)) - ,expected)))) - -(org-test-html/export-link "mailto" "[[mailto:john@example.tld]]" - "mailto:john@example.tld" - "mailto: link without description") - -(provide 'test-org-html) - -;;; test-org-html.el ends here