From 49fea9f3b74a0b5b312722d3a504310ee04feb5d Mon Sep 17 00:00:00 2001 From: Uwe Kleinmann Date: Mon, 21 Nov 2016 08:53:58 +0100 Subject: [PATCH 1/2] Extract org export method to customize variable. --- op-template.el | 4 ++-- op-vars.el | 4 ++++ org-page.el | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/op-template.el b/op-template.el index 988f2bf..ec7b1b8 100644 --- a/op-template.el +++ b/op-template.el @@ -147,9 +147,9 @@ similar to `op/render-header'. `op/highlight-render' is `js' or `htmlize'." #'(lambda (code lang) (when code (org-html-encode-plain-text code))))) - (org-export-as'html nil nil t nil)))) + (org-export-as op/export-method nil nil t nil)))) ((eq op/highlight-render 'htmlize) - (org-export-as'html nil nil t nil)))))))) + (org-export-as op/export-method nil nil t nil)))))))) (defun op/render-footer (&optional param-table) "Render the footer on each page. PARAM-TABLE is similar to diff --git a/op-vars.el b/op-vars.el index 9da2368..99d9693 100644 --- a/op-vars.el +++ b/op-vars.el @@ -52,6 +52,10 @@ `op/repository-html-branch'." :group 'org-page :type 'string) +(defcustom op/export-method 'html + "The org-export method used for page generation" + :group 'org-page :type 'symbol) + (defcustom op/site-domain nil "The domain name of entire site, it is recommended to assign with prefix http:// or https://, http will be considered if not assigned." diff --git a/org-page.el b/org-page.el index 4413917..e7a4259 100644 --- a/org-page.el +++ b/org-page.el @@ -151,6 +151,7 @@ perfectly manipulated by org-page." `op/site-domain': `op/personal-disqus-shortname': `op/personal-duoshuo-shortname': +`op/export-method': [optional](default 'html) `op/repository-org-branch': [optional] (but customization recommended) `op/repository-html-branch': [optional] (but customization recommended) `op/site-main-title': [optional] (but customization recommanded) From 0bc43b80dedda5d348cf540ae1484b11f6e68612 Mon Sep 17 00:00:00 2001 From: Uwe Kleinmann Date: Mon, 21 Nov 2016 09:13:03 +0100 Subject: [PATCH 2/2] Change export-method to export-backend to reflect org naming. --- op-template.el | 4 ++-- op-vars.el | 4 ++-- org-page.el | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/op-template.el b/op-template.el index ec7b1b8..32f8ae0 100644 --- a/op-template.el +++ b/op-template.el @@ -147,9 +147,9 @@ similar to `op/render-header'. `op/highlight-render' is `js' or `htmlize'." #'(lambda (code lang) (when code (org-html-encode-plain-text code))))) - (org-export-as op/export-method nil nil t nil)))) + (org-export-as op/export-backend nil nil t nil)))) ((eq op/highlight-render 'htmlize) - (org-export-as op/export-method nil nil t nil)))))))) + (org-export-as op/export-backend nil nil t nil)))))))) (defun op/render-footer (&optional param-table) "Render the footer on each page. PARAM-TABLE is similar to diff --git a/op-vars.el b/op-vars.el index 99d9693..8976171 100644 --- a/op-vars.el +++ b/op-vars.el @@ -52,8 +52,8 @@ `op/repository-html-branch'." :group 'org-page :type 'string) -(defcustom op/export-method 'html - "The org-export method used for page generation" +(defcustom op/export-backend 'html + "The org-export backend used for page generation" :group 'org-page :type 'symbol) (defcustom op/site-domain nil diff --git a/org-page.el b/org-page.el index e7a4259..29cf188 100644 --- a/org-page.el +++ b/org-page.el @@ -151,7 +151,7 @@ perfectly manipulated by org-page." `op/site-domain': `op/personal-disqus-shortname': `op/personal-duoshuo-shortname': -`op/export-method': [optional](default 'html) +`op/export-backend': [optional](default 'html) `op/repository-org-branch': [optional] (but customization recommended) `op/repository-html-branch': [optional] (but customization recommended) `op/site-main-title': [optional] (but customization recommanded)