From: Robert Klein <roklein@roklein.de>
To: "Charles C. Berry" <ccberry@ucsd.edu>
Cc: emacs-orgmode@gnu.org
Subject: PATCH for Re: Bug: src block asterisk escaping doesn't work anymore
Date: Sat, 16 Jul 2016 21:12:29 +0200 [thread overview]
Message-ID: <20160716211229.0607309b@x121e.fritz.box> (raw)
In-Reply-To: <alpine.OSX.2.20.1607131833420.1277@charles-berrys-macbook.local>
[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]
Hi,
On Wed, 13 Jul 2016 18:47:58 -0700
"Charles C. Berry" <ccberry@ucsd.edu> wrote:
> On Wed, 13 Jul 2016, Robert Klein wrote:
>
> > Hi,
> >
> > When exporting a source block, e.g.
> >
> > --- snip (example org file) ---
> > #+begin_src conf
> > Test
> >
> > ,* asterisk in src block
> > #+end_src
> > --- snip ---
> >
> >
> > the escaping of the asterisk does not work. Instead a headline
> > “asterisk in src block” is created.
>
> I don't have `ob-conf', but this:
>
> --8<---------------cut here---------------start------------->8---
>
> #+begin_src emacs-lisp :exports both
> "Test
>
> ,* asterisk in src block"
> #+end_src
>
> --8<---------------cut here---------------end--------------->8---
>
> shows the issue. Also, the #+[BEGIN|END]_SRC parts of the src block
> are showing up in the export.
>
> Putting `org-escape-code-in-string' back in `org-babel-exp-code' here
>
> : ("body" . ,(org-escape-code-in-string (nth 1 info)))
>
> seems to fix this as long as there is a newline after the last
> #+END_SRC in the buffer.
Thanks for the confirmation. I also have issues exporting
http://orgmode.org/worg/dev/org-element-api.org -- while the error
message is "Unable to resolve code reference: end" bisecting leads to
the same commit; reverting the commit solves the issue. I reckon the
line(s) beginning with #+ in the src block above confuse the exporter
in the same way.
I attached a tentative patch.
Best regards
Robert
[-- Attachment #2: 0001-Revert-ob-exp-Remove-spurious-comma-un-escaping.patch --]
[-- Type: text/x-patch, Size: 1364 bytes --]
From ceecd352546453eb0215628c093faf13bca16b97 Mon Sep 17 00:00:00 2001
From: Robert Klein <roklein@roklein.de>
Date: Sat, 16 Jul 2016 20:50:01 +0200
Subject: [PATCH] Revert "ob-exp: Remove spurious comma un-escaping"
This reverts commit 0279d84cd7f857535342b4ec3c2e70ac76c1ee27.
The original commit breaks exports containing lines beginning
with "* " or "#+" in src blocks.
---
lisp/ob-exp.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index e824992..a1a945f 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -48,6 +48,7 @@
(declare-function org-element-property "org-element" (property element))
(declare-function org-element-type "org-element" (element))
(declare-function org-id-get "org-id" (&optional pom create prefix))
+(declare-function org-escape-code-in-string "org-src" (s))
(defcustom org-export-babel-evaluate t
"Switch controlling code evaluation during export.
@@ -385,7 +386,7 @@ replaced with its value."
org-babel-exp-inline-code-template
org-babel-exp-code-template)
`(("lang" . ,(nth 0 info))
- ("body" . ,(nth 1 info))
+ ("body" . ,(org-escape-code-in-string (nth 1 info)))
("switches" . ,(let ((f (nth 3 info)))
(and (org-string-nw-p f) (concat " " f))))
("flags" . ,(let ((f (assq :flags (nth 2 info))))
--
2.9.0
next prev parent reply other threads:[~2016-07-16 19:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 13:48 Bug: src block asterisk escaping doesn't work anymore Robert Klein
2016-07-14 1:47 ` Charles C. Berry
2016-07-16 19:12 ` Robert Klein [this message]
2016-07-17 10:22 ` PATCH for " Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160716211229.0607309b@x121e.fritz.box \
--to=roklein@roklein.de \
--cc=ccberry@ucsd.edu \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).