From 5e84279ff5dbbcb3e9c8f89c88afc15441286aec Mon Sep 17 00:00:00 2001 From: chasberry Date: Tue, 11 Nov 2014 13:01:22 -0800 Subject: [PATCH 2/5] Inline src blocks are export-snippets * lisp/ox-latex.el (org-latex-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-beamer.el (org-beamer-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-html.el (org-html-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-ascii.el (org-ascii-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-texinfo.el (org-texinfo-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-odt.el (org-odt-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. * lisp/ox-man.el (org-man-export-snippet): Treat the babel `:back-end' export-snippet value as verbatim. --- lisp/ox-ascii.el | 8 ++++++-- lisp/ox-beamer.el | 2 ++ lisp/ox-html.el | 7 +++++-- lisp/ox-latex.el | 8 +++++--- lisp/ox-man.el | 8 ++++++-- lisp/ox-odt.el | 8 +++++--- lisp/ox-texinfo.el | 7 +++++-- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index daad00f..695277c 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -1213,8 +1213,12 @@ CONTENTS is nil. INFO is a plist holding contextual information." (defun org-ascii-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to ASCII. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'ascii) - (org-element-property :value export-snippet))) + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'ascii) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-ascii-verbatim export-snippet contents info))))) + ;;;; Export Block diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 15bbce2..9f71cbb 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -291,6 +291,8 @@ channel." (value (org-element-property :value export-snippet))) ;; Only "latex" and "beamer" snippets are retained. (cond ((eq backend 'latex) value) + ((eq backend 'babel) + (org-latex-verbatim export-snippet contents info)) ;; Ignore "beamer" snippets specifying overlays. ((and (eq backend 'beamer) (or (org-export-get-previous-element export-snippet info) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 20d09eb..e377687 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2268,8 +2268,11 @@ information." "Transcode a EXPORT-SNIPPET object from Org to HTML. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'html) - (org-element-property :value export-snippet))) + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'html) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-html-verbatim export-snippet contents info))))) ;;;; Export Block diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 8b38f96..232de73 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1392,9 +1392,11 @@ CONTENTS is nil. INFO is a plist holding contextual information." (defun org-latex-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to LaTeX. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'latex) - (org-element-property :value export-snippet))) - + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'latex) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-latex-verbatim export-snippet contents info))))) ;;;; Fixed Width diff --git a/lisp/ox-man.el b/lisp/ox-man.el index 9bbc52d..76fa99d 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -446,8 +446,12 @@ CONTENTS is nil. INFO is a plist holding contextual information." (defun org-man-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to Man. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'man) - (org-element-property :value export-snippet))) + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'man) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-man-verbatim export-snippet contents info))))) + ;;; Fixed Width diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 3b2596f..19db439 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -1673,9 +1673,11 @@ CONTENTS is nil. INFO is a plist holding contextual information." (defun org-odt-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to ODT. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'odt) - (org-element-property :value export-snippet))) - + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'odt) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-odt-verbatim export-snippet contents info))))) ;;;; Export Block diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 20508a1..6004c65 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -708,8 +708,11 @@ CONTENTS is nil. INFO is a plist holding contextual information." (defun org-texinfo-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to Texinfo. CONTENTS is nil. INFO is a plist holding contextual information." - (when (eq (org-export-snippet-backend export-snippet) 'texinfo) - (org-element-property :value export-snippet))) + (let ((backend (org-export-snippet-backend export-snippet))) + (cond ((eq backend 'texinfo) + (org-element-property :value export-snippet)) + ((eq backend 'babel) + (org-texinfo-verbatim export-snippet contents info))))) ;;;; Fixed Width -- 1.9.3 (Apple Git-50)