diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-23 09:12:50 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-01-23 09:12:50 -0800 |
| commit | 38013de8572ee9b6c9b5873d6f9e0bf6876215ed (patch) | |
| tree | e73a227802e52c85bb030c75cdcaf628d59882a5 | |
| parent | 628a1ef81548ccf0307276b4f9164191cacc9193 (diff) | |
| download | pandoc-38013de8572ee9b6c9b5873d6f9e0bf6876215ed.tar.gz | |
Textile writer: Don't HTML-escape between @'s.
| -rw-r--r-- | src/Text/Pandoc/Readers/Textile.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/Textile.hs | 2 | ||||
| -rw-r--r-- | tests/writer.textile | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs index 4221754cc..7749a946c 100644 --- a/src/Text/Pandoc/Readers/Textile.hs +++ b/src/Text/Pandoc/Readers/Textile.hs @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA {- | Module : Text.Pandoc.Readers.Textile - Copyright : Copyright (C) 2010 Paul Rivier + Copyright : Copyright (C) 2010-2011 Paul Rivier and John MacFarlane License : GNU GPL, version 2 or above Maintainer : Paul Rivier <paul*rivier#demotera*com> diff --git a/src/Text/Pandoc/Writers/Textile.hs b/src/Text/Pandoc/Writers/Textile.hs index 4aaee0a32..f58d49483 100644 --- a/src/Text/Pandoc/Writers/Textile.hs +++ b/src/Text/Pandoc/Writers/Textile.hs @@ -378,7 +378,7 @@ inlineToTextile _ Ellipses = return "..." inlineToTextile _ (Code str) = return $ if '@' `elem` str then "<tt>" ++ escapeStringForXML str ++ "</tt>" - else "@" ++ escapeStringForXML str ++ "@" + else "@" ++ str ++ "@" inlineToTextile _ (Str str) = return $ escapeStringForTextile str diff --git a/tests/writer.textile b/tests/writer.textile index ee67a7f33..2d4bff717 100644 --- a/tests/writer.textile +++ b/tests/writer.textile @@ -450,7 +450,7 @@ So is *_this_* word. So is *_this_* word. -This is code: @>@, @$@, @\@, @\$@, @<html>@. +This is code: @>@, @$@, @\@, @\$@, @<html>@. -This is _strikeout_.- @@ -630,7 +630,7 @@ An e-mail address: "nobody@nowhere.net":mailto:nobody@nowhere.net bq. Blockquoted: "http://example.com/":http://example.com/ -Auto-links should not occur here: @<http://example.com/>@ +Auto-links should not occur here: @<http://example.com/>@ bc. or here: <http://example.com/> |