forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
cf35109ad8
|
@ -174,7 +174,6 @@
|
|||
(:html-klipsify-src nil nil org-html-klipsify-src)
|
||||
(:html-klipse-css nil nil org-html-klipse-css)
|
||||
(:html-klipse-js nil nil org-html-klipse-js)
|
||||
(:html-klipse-keep-old-src nil nil org-html-keep-old-src)
|
||||
(:html-klipse-selection-script nil nil org-html-klipse-selection-script)
|
||||
(:infojs-opt "INFOJS_OPT" nil nil)
|
||||
;; Redefine regular options.
|
||||
|
@ -1572,12 +1571,6 @@ https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag"
|
|||
:package-version '(Org . "9.1")
|
||||
:type 'string)
|
||||
|
||||
(defcustom org-html-keep-old-src nil
|
||||
"When non-nil, use <pre class=\"\"> instead of <pre><code class=\"\">."
|
||||
:group 'org-export-html
|
||||
:package-version '(Org . "9.1")
|
||||
:type 'boolean)
|
||||
|
||||
|
||||
;;;; Todos
|
||||
|
||||
|
@ -3384,12 +3377,16 @@ contextual information."
|
|||
listing-number
|
||||
(org-trim (org-export-data caption info))))))
|
||||
;; Contents.
|
||||
(let ((open (if org-html-keep-old-src "<pre" "<pre><code"))
|
||||
(close (if org-html-keep-old-src "</pre>" "</code></pre>")))
|
||||
(format "%s class=\"src src-%s\"%s%s>%s%s"
|
||||
open lang label (if (and klipsify (string= lang "html"))
|
||||
" data-editor-type=\"html\"" "")
|
||||
code close)))))))
|
||||
(if klipsify
|
||||
(format "<pre><code class=\"src src-%s\"%s%s>%s</code></pre>"
|
||||
lang
|
||||
label
|
||||
(if (string= lang "html")
|
||||
" data-editor-type=\"html\""
|
||||
"")
|
||||
code)
|
||||
(format "<pre class=\"src src-%s\"%s>%s</pre>"
|
||||
lang label code)))))))
|
||||
|
||||
;;;; Statistics Cookie
|
||||
|
||||
|
|
Loading…
Reference in New Issue