Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

AsciiDoc writer: avoid unnecessary use of "unconstrained" emphasis.

Browse source 
In AsciiDoc, you must use a special form of emphasis (double `__`)
for intraword emphasis.  Pandoc was previously using this more
than necessary.

Closes #3068.
This commit is contained in:
John MacFarlane 2016-10-02 21:51:34 +02:00
parent a99d81dce3
commit 46d8b42da5
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Text/Pandoc/Writers/AsciiDoc.hs
View file

@ -51,6 +51,7 @@ import Control.Monad.State
import qualified Data.Map as M
import Data.Aeson (Value(String), fromJSON, toJSON, Result(..))
import qualified Data.Text as T
import Data.Char (isSpace, isPunctuation)
data WriterState = WriterState { defListMarker :: String
, orderedListLevel :: Int
@ -321,6 +322,8 @@ blockListToAsciiDoc :: WriterOptions -- ^ Options
-> State WriterState Doc
blockListToAsciiDoc opts blocks = cat `fmap` mapM (blockToAsciiDoc opts) blocks
data SpacyLocation = End | Start
-- | Convert list of Pandoc inline elements to asciidoc.
inlineListToAsciiDoc :: WriterOptions -> [Inline] -> State WriterState Doc
inlineListToAsciiDoc opts lst = do
@ -331,14 +334,14 @@ inlineListToAsciiDoc opts lst = do
return result
where go [] = return empty
go (y:x:xs)
| not (isSpacy y) = do
y' <- if isSpacy x
| not (isSpacy End y) = do
y' <- if isSpacy Start x
then inlineToAsciiDoc opts y
else withIntraword $ inlineToAsciiDoc opts y
x' <- withIntraword $ inlineToAsciiDoc opts x
xs' <- go xs
return (y' <> x' <> xs')
| not (isSpacy x) = do
| not (isSpacy Start x) = do
y' <- withIntraword $ inlineToAsciiDoc opts y
xs' <- go (x:xs)
return (y' <> xs')
@ -346,10 +349,17 @@ inlineListToAsciiDoc opts lst = do
x' <- inlineToAsciiDoc opts x
xs' <- go xs
return (x' <> xs')
isSpacy Space = True
isSpacy LineBreak = True
isSpacy SoftBreak = True
isSpacy _ = False
isSpacy :: SpacyLocation -> Inline -> Bool
isSpacy _ Space = True
isSpacy _ LineBreak = True
isSpacy _ SoftBreak = True
-- Note that \W characters count as spacy in AsciiDoc
-- for purposes of determining interword:
isSpacy End (Str xs) = case reverse xs of
c:_ -> isPunctuation c || isSpace c
_ -> False
isSpacy Start (Str (c:_)) = isPunctuation c || isSpace c
isSpacy _ _ = False
setIntraword :: Bool -> State WriterState ()
setIntraword b = modify $ \st -> st{ intraword = b }

8
tests/writer.asciidoc
View file

@ -435,11 +435,11 @@ Hr’s:
Inline Markup
-------------
This is __emphasized__, and so __is this__.
This is _emphasized_, and so _is this_.
This is **strong**, and so **is this**.
This is *strong*, and so *is this*.
An __link:/url[emphasized link]__.
An _link:/url[emphasized link]_.
*_This is strong and em._*
@ -451,7 +451,7 @@ So is *_this_* word.
This is code: `>`, `$`, `\`, `\$`, `<html>`.
[line-through]*This is __strikeout__.*
[line-through]*This is _strikeout_.*
Superscripts: a^bc^d a^_hello_^ a^hello there^.