9c2b659 · typeable/pandoc

git.iko.soy/typeable/pandoc

Support new Underline element in readers and writers (#6277)

Deprecate `underlineSpan` in Shared in favor of `Text.Pandoc.Builder.underline`.

commit9c2b659eeb196145f62d8eae0072c279a7c2d751 authorVaibhav Sagar <vaibhavsagar@gmail.com> dateTue 28 Apr 2020, 22:53 (7 years ago) parent8d09a92

53 files changed+169−45

compare with master

unifiedsplit

data/pandoc.lua+11−1

@@ -829,13 +829,23 @@ M.Subscript = M.Inline:create_constructor(

829829--- Creates a Superscript inline element

830830-- @function Superscript

831831-- @tparam {Inline,..} content inline content

832−-- @treturn Inline strong element

832+-- @treturn Inline superscript element

833833M.Superscript = M.Inline:create_constructor(

834834 "Superscript",

835835 function(content) return {c = ensureInlineList(content)} end,

836836 "content"

837837)

838838

839+--- Creates an Underline inline element

840+-- @function Underline

841+-- @tparam {Inline,..} content inline content

842+-- @treturn Inline underline element

843+M.Underline = M.Inline:create_constructor(

844+ "Underline",

845+ function(content) return {c = ensureInlineList(content)} end,

846+ "content"

847+)

848+

839849

840850------------------------------------------------------------------------

841851-- Element components

src/Text/Pandoc/Lua/Marshaling/AST.hs+2

@@ -303,6 +303,7 @@ pushInline = \case

303303 Cite citations lst -> pushViaConstructor "Cite" lst citations

304304 Code attr lst -> pushViaConstructor "Code" lst (LuaAttr attr)

305305 Emph inlns -> pushViaConstructor "Emph" inlns

306+ Underline inlns -> pushViaConstructor "Underline" inlns

306307 Image attr alt (src,tit) -> pushViaConstructor "Image" alt src tit (LuaAttr attr)

307308 LineBreak -> pushViaConstructor "LineBreak"

308309 Link attr lst (src,tit) -> pushViaConstructor "Link" lst src tit (LuaAttr attr)

@@ -328,6 +329,7 @@ peekInline idx = defineHowTo "get Inline value" $ do

328329 "Cite" -> uncurry Cite <$> elementContent

329330 "Code" -> withAttr Code <$> elementContent

330331 "Emph" -> Emph <$> elementContent

332+ "Underline" -> Underline <$> elementContent

331333 "Image" -> (\(LuaAttr attr, lst, tgt) -> Image attr lst tgt)

332334 <$> elementContent

333335 "Link" -> (\(LuaAttr attr, lst, tgt) -> Link attr lst tgt)

src/Text/Pandoc/Readers/Docx.hs+1−1

@@ -299,7 +299,7 @@ runStyleToTransform rPr

299299 return $ subscript . transform

300300 | Just "single" <- rUnderline rPr = do

301301 transform <- runStyleToTransform rPr{rUnderline = Nothing}

302− return $ underlineSpan . transform

302+ return $ Pandoc.underline . transform

303303 | otherwise = return id

304304

305305runToInlines :: PandocMonad m => Run -> DocxContext m Inlines

src/Text/Pandoc/Readers/DokuWiki.hs+2−2

@@ -29,7 +29,7 @@ import Text.Pandoc.Definition

2929import Text.Pandoc.Error (PandocError (PandocParsecError))

3030import Text.Pandoc.Options

3131import Text.Pandoc.Parsing hiding (enclosed, nested)

32−import Text.Pandoc.Shared (crFilter, trim, underlineSpan, stringify, tshow)

32+import Text.Pandoc.Shared (crFilter, trim, stringify, tshow)

3333

3434-- | Read DokuWiki from an input string and return a Pandoc document.

3535readDokuWiki :: PandocMonad m

@@ -162,7 +162,7 @@ italic :: PandocMonad m => DWParser m B.Inlines

162162italic = try $ B.emph <$> enclosed (string "//") nestedInlines

163163

164164underlined :: PandocMonad m => DWParser m B.Inlines

165−underlined = try $ underlineSpan <$> enclosed (string "__") nestedInlines

165+underlined = try $ B.underline <$> enclosed (string "__") nestedInlines

166166

167167nowiki :: PandocMonad m => DWParser m B.Inlines

168168nowiki = try $ B.text <$ string "<nowiki>" <*> manyTillChar anyChar (try $ string "</nowiki>")

src/Text/Pandoc/Readers/HTML.hs+2−2

@@ -61,7 +61,7 @@ import Text.Pandoc.Options (

6161import Text.Pandoc.Parsing hiding ((<|>))

6262import Text.Pandoc.Shared (addMetaField, blocksToInlines', crFilter, escapeURI,

6363 extractSpaces, htmlSpanLikeElements, elemText, splitTextBy,

64− onlySimpleTableCells, safeRead, underlineSpan, tshow)

64+ onlySimpleTableCells, safeRead, tshow)

6565import Text.Pandoc.Walk

6666import Text.Parsec.Error

6767import Text.TeXMath (readMathML, writeTeX)

@@ -749,7 +749,7 @@ pStrikeout =

749749 return $ B.strikeout contents)

750750

751751pUnderline :: PandocMonad m => TagParser m Inlines

752−pUnderline = pInlinesInTags "u" underlineSpan <|> pInlinesInTags "ins" underlineSpan

752+pUnderline = pInlinesInTags "u" B.underline <|> pInlinesInTags "ins" B.underline

753753

754754pLineBreak :: PandocMonad m => TagParser m Inlines

755755pLineBreak = do

src/Text/Pandoc/Readers/JATS.hs+2−2

@@ -26,7 +26,7 @@ import Text.HTML.TagSoup.Entity (lookupEntity)

2626import Text.Pandoc.Builder

2727import Text.Pandoc.Class.PandocMonad (PandocMonad)

2828import Text.Pandoc.Options

29−import Text.Pandoc.Shared (underlineSpan, crFilter, safeRead)

29+import Text.Pandoc.Shared (crFilter, safeRead)

3030import Text.TeXMath (readMathML, writeTeX)

3131import Text.XML.Light

3232import qualified Data.Set as S (fromList, member)

@@ -456,7 +456,7 @@ parseInline (Elem e) =

456456 "strike" -> strikeout <$> innerInlines

457457 "sub" -> subscript <$> innerInlines

458458 "sup" -> superscript <$> innerInlines

459− "underline" -> underlineSpan <$> innerInlines

459+ "underline" -> underline <$> innerInlines

460460 "break" -> return linebreak

461461 "sc" -> smallcaps <$> innerInlines

462462

src/Text/Pandoc/Readers/LaTeX.hs+3−3

@@ -909,7 +909,7 @@ inlineCommands = M.union inlineLanguageCommands $ M.fromList

909909 , ("slash", lit "/")

910910 , ("textbf", extractSpaces strong <$> tok)

911911 , ("textnormal", extractSpaces (spanWith ("",["nodecor"],[])) <$> tok)

912− , ("underline", underlineSpan <$> tok)

912+ , ("underline", underline <$> tok)

913913 , ("ldots", lit "…")

914914 , ("vdots", lit "\8942")

915915 , ("dots", lit "…")

@@ -1171,9 +1171,9 @@ inlineCommands = M.union inlineLanguageCommands $ M.fromList

11711171 -- include

11721172 , ("input", rawInlineOr "input" $ include "input")

11731173 -- soul package

1174− , ("ul", underlineSpan <$> tok)

1174+ , ("ul", underline <$> tok)

11751175 -- ulem package

1176− , ("uline", underlineSpan <$> tok)

1176+ , ("uline", underline <$> tok)

11771177 -- plain tex stuff that should just be passed through as raw tex

11781178 , ("ifdim", ifdim)

11791179 ]

src/Text/Pandoc/Readers/Markdown.hs+13−2

@@ -1751,7 +1751,9 @@ bracketedSpan = try $ do

17511751 attr <- attributes

17521752 return $ if isSmallCaps attr

17531753 then B.smallcaps <$> lab

1754− else B.spanWith attr <$> lab

1754+ else if isUnderline attr

1755+ then B.underline <$> lab

1756+ else B.spanWith attr <$> lab

17551757

17561758-- | We treat a span as SmallCaps if class is "smallcaps" (and

17571759-- no other attributes are set or if style is "font-variant:small-caps"

@@ -1765,6 +1767,13 @@ isSmallCaps ("",[],kvs) =

17651767 Nothing -> False

17661768isSmallCaps _ = False

17671769

1770+-- | We treat a span as Underline if class is "ul" or

1771+-- "underline" (and no other attributes are set).

1772+isUnderline :: Attr -> Bool

1773+isUnderline ("",["ul"],[]) = True

1774+isUnderline ("",["underline"],[]) = True

1775+isUnderline _ = False

1776+

17681777regLink :: PandocMonad m

17691778 => (Attr -> Text -> Text -> Inlines -> Inlines)

17701779 -> F Inlines

@@ -1913,7 +1922,9 @@ spanHtml = try $ do

19131922 let keyvals = [(k,v) | (k,v) <- attrs, k /= "id" && k /= "class"]

19141923 return $ if isSmallCaps (ident, classes, keyvals)

19151924 then B.smallcaps <$> contents

1916− else B.spanWith (ident, classes, keyvals) <$> contents

1925+ else if isUnderline (ident, classes, keyvals)

1926+ then B.underline <$> contents

1927+ else B.spanWith (ident, classes, keyvals) <$> contents

19171928

19181929divHtml :: PandocMonad m => MarkdownParser m (F Blocks)

19191930divHtml = try $ do

src/Text/Pandoc/Readers/Muse.hs+3−3

@@ -29,7 +29,7 @@ import qualified Data.Set as Set

2929import Data.Maybe (fromMaybe, isNothing, maybeToList)

3030import Data.Text (Text)

3131import qualified Data.Text as T

32−import Text.Pandoc.Builder (Blocks, Inlines)

32+import Text.Pandoc.Builder (Blocks, Inlines, underline)

3333import qualified Text.Pandoc.Builder as B

3434import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

3535import Text.Pandoc.Definition

@@ -37,7 +37,7 @@ import Text.Pandoc.Error (PandocError (PandocParsecError))

3737import Text.Pandoc.Logging

3838import Text.Pandoc.Options

3939import Text.Pandoc.Parsing hiding (F)

40−import Text.Pandoc.Shared (crFilter, trimr, underlineSpan, tshow)

40+import Text.Pandoc.Shared (crFilter, trimr, tshow)

4141

4242-- | Read Muse from an input string and return a Pandoc document.

4343readMuse :: PandocMonad m

@@ -849,7 +849,7 @@ emph = fmap B.emph <$> emphasisBetween (char '*' <* notFollowedBy (char '*'))

849849-- | Parse underline inline markup, indicated by @_@.

850850-- Supported only in Emacs Muse mode, not Text::Amuse.

851851underlined :: PandocMonad m => MuseParser m (F Inlines)

852−underlined = fmap underlineSpan

852+underlined = fmap underline

853853 <$ guardDisabled Ext_amuse -- Supported only by Emacs Muse

854854 <*> emphasisBetween (char '_')

855855

src/Text/Pandoc/Readers/Odt/ContentReader.hs+1−1

@@ -37,7 +37,7 @@ import Data.Semigroup (First(..), Option(..))

3737import Text.TeXMath (readMathML, writeTeX)

3838import qualified Text.XML.Light as XML

3939

40−import Text.Pandoc.Builder

40+import Text.Pandoc.Builder hiding (underline)

4141import Text.Pandoc.MediaBag (MediaBag, insertMedia)

4242import Text.Pandoc.Shared

4343import Text.Pandoc.Extensions (extensionsFromList, Extension(..))

src/Text/Pandoc/Readers/Org/Inlines.hs+1−2

@@ -27,7 +27,6 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad)

2727import Text.Pandoc.Definition

2828import Text.Pandoc.Options

2929import Text.Pandoc.Readers.LaTeX (inlineCommand, rawLaTeXInline)

30−import Text.Pandoc.Shared (underlineSpan)

3130import Text.TeXMath (DisplayType (..), readTeX, writePandoc)

3231import qualified Text.TeXMath.Readers.MathML.EntityMap as MathMLEntityMap

3332

@@ -567,7 +566,7 @@ strikeout :: PandocMonad m => OrgParser m (F Inlines)

567566strikeout = fmap B.strikeout <$> emphasisBetween '+'

568567

569568underline :: PandocMonad m => OrgParser m (F Inlines)

570−underline = fmap underlineSpan <$> emphasisBetween '_'

569+underline = fmap B.underline <$> emphasisBetween '_'

571570

572571verbatim :: PandocMonad m => OrgParser m (F Inlines)

573572verbatim = return . B.code <$> verbatimBetween '='

src/Text/Pandoc/Readers/Textile.hs+2−2

@@ -52,7 +52,7 @@ import Text.Pandoc.Options

5252import Text.Pandoc.Parsing

5353import Text.Pandoc.Readers.HTML (htmlTag, isBlockTag, isInlineTag)

5454import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock, rawLaTeXInline)

55−import Text.Pandoc.Shared (crFilter, trim, underlineSpan, tshow)

55+import Text.Pandoc.Shared (crFilter, trim, tshow)

5656

5757-- | Parse a Textile text and return a Pandoc document.

5858readTextile :: PandocMonad m

@@ -451,7 +451,7 @@ inlineMarkup = choice [ simpleInline (string "??") (B.cite [])

451451 , simpleInline (string "__") B.emph

452452 , simpleInline (char '*') B.strong

453453 , simpleInline (char '_') B.emph

454− , simpleInline (char '+') underlineSpan

454+ , simpleInline (char '+') B.underline

455455 , simpleInline (char '-' <* notFollowedBy (char '-')) B.strikeout

456456 , simpleInline (char '^') B.superscript

457457 , simpleInline (char '~') B.subscript

src/Text/Pandoc/Readers/Txt2Tags.hs+2−3

@@ -31,8 +31,7 @@ import Data.Time (defaultTimeLocale)

3131import Text.Pandoc.Definition

3232import Text.Pandoc.Options

3333import Text.Pandoc.Parsing hiding (space, spaces, uri)

34−import Text.Pandoc.Shared (compactify, compactifyDL, crFilter, escapeURI,

35− underlineSpan)

34+import Text.Pandoc.Shared (compactify, compactifyDL, crFilter, escapeURI)

3635

3736type T2T = ParserT Text ParserState (Reader T2TMeta)

3837

@@ -378,7 +377,7 @@ bold :: T2T Inlines

378377bold = inlineMarkup inline B.strong '*' B.str

379378

380379underline :: T2T Inlines

381−underline = inlineMarkup inline underlineSpan '_' B.str

380+underline = inlineMarkup inline B.underline '_' B.str

382381

383382strike :: T2T Inlines

384383strike = inlineMarkup inline B.strikeout '-' B.str

src/Text/Pandoc/Shared.hs+3−2

@@ -750,11 +750,12 @@ eastAsianLineBreakFilter = bottomUp go

750750 go xs

751751 = xs

752752

753−-- | Builder for underline.

753+{-# DEPRECATED underlineSpan "Use Text.Pandoc.Builder.underline instead" #-}

754+-- | Builder for underline (deprecated).

754755-- This probably belongs in Builder.hs in pandoc-types.

755756-- Will be replaced once Underline is an element.

756757underlineSpan :: Inlines -> Inlines

757−underlineSpan = B.spanWith ("", ["underline"], [])

758+underlineSpan = B.underline

758759

759760-- | Set of HTML elements that are represented as Span with a class equal as

760761-- the element tag itself.

src/Text/Pandoc/Writers/AsciiDoc.hs+3

@@ -433,6 +433,9 @@ inlineToAsciiDoc opts (Emph lst) = do

433433 isIntraword <- gets intraword

434434 let marker = if isIntraword then "__" else "_"

435435 return $ marker <> contents <> marker

436+inlineToAsciiDoc opts (Underline lst) = do

437+ contents <- inlineListToAsciiDoc opts lst

438+ return $ "+++" <> contents <> "+++"

436439inlineToAsciiDoc opts (Strong lst) = do

437440 contents <- inlineListToAsciiDoc opts lst

438441 isIntraword <- gets intraword

src/Text/Pandoc/Writers/CommonMark.hs+5

@@ -237,6 +237,11 @@ inlineToNodes opts SoftBreak

237237 | writerWrapText opts == WrapNone = (node (TEXT " ") [] :)

238238 | otherwise = (node SOFTBREAK [] :)

239239inlineToNodes opts (Emph xs) = (node EMPH (inlinesToNodes opts xs) :)

240+inlineToNodes opts (Underline xs)

241+ | isEnabled Ext_raw_html opts =

242+ ((node (HTML_INLINE (T.pack "")) [] : inlinesToNodes opts xs ++

243+ [node (HTML_INLINE (T.pack "")) []]) ++ )

244+ | otherwise = (node EMPH (inlinesToNodes opts xs) :)

240245inlineToNodes opts (Strong xs) = (node STRONG (inlinesToNodes opts xs) :)

241246inlineToNodes opts (Strikeout xs)

242247 | isEnabled Ext_strikeout opts = (node (CUSTOM_INLINE "~~" "~~") (inlinesToNodes opts xs) :)

src/Text/Pandoc/Writers/ConTeXt.hs+3

@@ -368,6 +368,9 @@ inlineToConTeXt :: PandocMonad m

368368inlineToConTeXt (Emph lst) = do

369369 contents <- inlineListToConTeXt lst

370370 return $ braces $ "\\em " <> contents

371+inlineToConTeXt (Underline lst) = do

372+ contents <- inlineListToConTeXt lst

373+ return $ "\\underbar" <> braces contents

371374inlineToConTeXt (Strong lst) = do

372375 contents <- inlineListToConTeXt lst

373376 return $ braces $ "\\bf " <> contents

src/Text/Pandoc/Writers/Custom.hs+2

@@ -186,6 +186,8 @@ inlineToCustom SoftBreak = Lua.callFunc "SoftBreak"

186186

187187inlineToCustom (Emph lst) = Lua.callFunc "Emph" (Stringify lst)

188188

189+inlineToCustom (Underline lst) = Lua.callFunc "Underline" (Stringify lst)

190+

189191inlineToCustom (Strong lst) = Lua.callFunc "Strong" (Stringify lst)

190192

191193inlineToCustom (Strikeout lst) = Lua.callFunc "Strikeout" (Stringify lst)

src/Text/Pandoc/Writers/Docbook.hs+2

@@ -323,6 +323,8 @@ inlineToDocbook :: PandocMonad m => WriterOptions -> Inline -> DB m (Doc Text)

323323inlineToDocbook _ (Str str) = return $ literal $ escapeStringForXML str

324324inlineToDocbook opts (Emph lst) =

325325 inTagsSimple "emphasis" <$> inlinesToDocbook opts lst

326+inlineToDocbook opts (Underline lst) =

327+ inTags False "emphasis" [("role", "underline")] <$> inlinesToDocbook opts lst

326328inlineToDocbook opts (Strong lst) =

327329 inTags False "emphasis" [("role", "strong")] <$> inlinesToDocbook opts lst

328330inlineToDocbook opts (Strikeout lst) =

src/Text/Pandoc/Writers/Docx.hs+3−3

@@ -1158,9 +1158,6 @@ inlineToOpenXML' _ (Str str) =

11581158 formattedString str

11591159inlineToOpenXML' opts Space = inlineToOpenXML opts (Str " ")

11601160inlineToOpenXML' opts SoftBreak = inlineToOpenXML opts (Str " ")

1161−inlineToOpenXML' opts (Span (_,["underline"],_) ils) =

1162− withTextProp (mknode "w:u" [("w:val","single")] ()) $

1163− inlinesToOpenXML opts ils

11641161inlineToOpenXML' _ (Span (ident,["comment-start"],kvs) ils) = do

11651162 -- prefer the "id" in kvs, since that is the one produced by the docx

11661163 -- reader.

@@ -1234,6 +1231,9 @@ inlineToOpenXML' opts (Strong lst) =

12341231 withTextProp (mknode "w:b" [] ()) $ inlinesToOpenXML opts lst

12351232inlineToOpenXML' opts (Emph lst) =

12361233 withTextProp (mknode "w:i" [] ()) $ inlinesToOpenXML opts lst

1234+inlineToOpenXML' opts (Underline lst) =

1235+ withTextProp (mknode "w:u" [("w:val","single")] ()) $

1236+ inlinesToOpenXML opts lst

12371237inlineToOpenXML' opts (Subscript lst) =

12381238 withTextProp (mknode "w:vertAlign" [("w:val","subscript")] ())

12391239 $ inlinesToOpenXML opts lst

src/Text/Pandoc/Writers/DokuWiki.hs+4

@@ -402,6 +402,10 @@ inlineToDokuWiki opts (Emph lst) = do

402402 contents <- inlineListToDokuWiki opts lst

403403 return $ "//" <> contents <> "//"

404404

405+inlineToDokuWiki opts (Underline lst) = do

406+ contents <- inlineListToDokuWiki opts lst

407+ return $ "__" <> contents <> "__"

408+

405409inlineToDokuWiki opts (Strong lst) = do

406410 contents <- inlineListToDokuWiki opts lst

407411 return $ "**" <> contents <> "**"

src/Text/Pandoc/Writers/FB2.hs+2

@@ -406,6 +406,7 @@ toXml :: PandocMonad m => Inline -> FBM m [Content]

406406toXml (Str s) = return [txt s]

407407toXml (Span _ ils) = cMapM toXml ils

408408toXml (Emph ss) = list `liftM` wrap "emphasis" ss

409+toXml (Underline ss) = list `liftM` wrap "underline" ss

409410toXml (Strong ss) = list `liftM` wrap "strong" ss

410411toXml (Strikeout ss) = list `liftM` wrap "strikethrough" ss

411412toXml (Superscript ss) = list `liftM` wrap "sup" ss

@@ -529,6 +530,7 @@ list = (:[])

529530plain :: Inline -> String

530531plain (Str s) = T.unpack s

531532plain (Emph ss) = cMap plain ss

533+plain (Underline ss) = cMap plain ss

532534plain (Span _ ss) = cMap plain ss

533535plain (Strong ss) = cMap plain ss

534536plain (Strikeout ss) = cMap plain ss

src/Text/Pandoc/Writers/HTML.hs+1

@@ -1049,6 +1049,7 @@ inlineToHtml opts inline = do

10491049 ]

10501050

10511051 (Emph lst) -> H.em <$> inlineListToHtml opts lst

1052+ (Underline lst) -> H.u <$> inlineListToHtml opts lst

10521053 (Strong lst) -> H.strong <$> inlineListToHtml opts lst

10531054 (Code attr@(ids,cs,kvs) str)

10541055 -> case hlCode of

src/Text/Pandoc/Writers/Haddock.hs+3

@@ -209,6 +209,9 @@ inlineToHaddock opts (Span (ident,_,_) ils) = do

209209inlineToHaddock opts (Emph lst) = do

210210 contents <- inlineListToHaddock opts lst

211211 return $ "/" <> contents <> "/"

212+-- Underline is not supported, treat the same as Emph

213+inlineToHaddock opts (Underline lst) =

214+ inlineToHaddock opts (Emph lst)

212215inlineToHaddock opts (Strong lst) = do

213216 contents <- inlineListToHaddock opts lst

214217 return $ "__" <> contents <> "__"

src/Text/Pandoc/Writers/ICML.hs+3

@@ -60,6 +60,7 @@ defaultWriterState = WriterState{

6060

6161-- inline names (appear in InDesign's character styles pane)

6262emphName :: Text

63+underlineName :: Text

6364strongName :: Text

6465strikeoutName :: Text

6566superscriptName :: Text

@@ -68,6 +69,7 @@ smallCapsName :: Text

6869codeName :: Text

6970linkName :: Text

7071emphName = "Italic"

72+underlineName = "Underline"

7173strongName = "Bold"

7274strikeoutName = "Strikeout"

7375superscriptName = "Superscript"

@@ -427,6 +429,7 @@ inlinesToICML opts style lst = vcat `fmap` mapM (inlineToICML opts style) (merge

427429inlineToICML :: PandocMonad m => WriterOptions -> Style -> Inline -> WS m (Doc Text)

428430inlineToICML _ style (Str str) = charStyle style $ literal $ escapeStringForXML str

429431inlineToICML opts style (Emph lst) = inlinesToICML opts (emphName:style) lst

432+inlineToICML opts style (Underline lst) = inlinesToICML opts (underlineName:style) lst

430433inlineToICML opts style (Strong lst) = inlinesToICML opts (strongName:style) lst

431434inlineToICML opts style (Strikeout lst) = inlinesToICML opts (strikeoutName:style) lst

432435inlineToICML opts style (Superscript lst) = inlinesToICML opts (superscriptName:style) lst

src/Text/Pandoc/Writers/JATS.hs+2

@@ -424,6 +424,8 @@ inlineToJATS :: PandocMonad m => WriterOptions -> Inline -> JATS m (Doc Text)

424424inlineToJATS _ (Str str) = return $ text $ T.unpack $ escapeStringForXML str

425425inlineToJATS opts (Emph lst) =

426426 inTagsSimple "italic" <$> inlinesToJATS opts lst

427+inlineToJATS opts (Underline lst) =

428+ inTagsSimple "underline" <$> inlinesToJATS opts lst

427429inlineToJATS opts (Strong lst) =

428430 inTagsSimple "bold" <$> inlinesToJATS opts lst

429431inlineToJATS opts (Strikeout lst) =

src/Text/Pandoc/Writers/Jira.hs+1

@@ -193,6 +193,7 @@ toJiraInlines inlines = do

193193 Code _ cs -> return . singleton $

194194 Jira.Monospaced (escapeSpecialChars cs)

195195 Emph xs -> styled Jira.Emphasis xs

196+ Underline xs -> styled Jira.Insert xs

196197 Image attr _ tgt -> imageToJira attr (fst tgt) (snd tgt)

197198 LineBreak -> pure . singleton $ Jira.Linebreak

198199 Link attr xs tgt -> toJiraLink attr tgt xs

src/Text/Pandoc/Writers/LaTeX.hs+1

@@ -1140,6 +1140,7 @@ inlineToLaTeX (Span (id',classes,kvs) ils) = do

11401140 then braces contents

11411141 else foldr inCmd contents cmds)

11421142inlineToLaTeX (Emph lst) = inCmd "emph" <$> inlineListToLaTeX lst

1143+inlineToLaTeX (Underline lst) = inCmd "underline" <$> inlineListToLaTeX lst

11431144inlineToLaTeX (Strong lst) = inCmd "textbf" <$> inlineListToLaTeX lst

11441145inlineToLaTeX (Strikeout lst) = do

11451146 -- we need to protect VERB in an mbox or we get an error

src/Text/Pandoc/Writers/Man.hs+3

@@ -270,6 +270,9 @@ inlineToMan :: PandocMonad m => WriterOptions -> Inline -> StateT WriterState m

270270inlineToMan opts (Span _ ils) = inlineListToMan opts ils

271271inlineToMan opts (Emph lst) =

272272 withFontFeature 'I' (inlineListToMan opts lst)

273+-- Underline is not supported, so treat the same as Emph

274+inlineToMan opts (Underline lst) =

275+ withFontFeature 'I' (inlineListToMan opts lst)

273276inlineToMan opts (Strong lst) =

274277 withFontFeature 'B' (inlineListToMan opts lst)

275278inlineToMan opts (Strikeout lst) = do

src/Text/Pandoc/Writers/Markdown.hs+15

@@ -1045,6 +1045,21 @@ inlineToMarkdown opts (Emph lst) = do

10451045 then "_" <> contents <> "_"

10461046 else contents

10471047 else "*" <> contents <> "*"

1048+inlineToMarkdown _ (Underline []) = return empty

1049+inlineToMarkdown opts (Underline lst) = do

1050+ plain <- asks envPlain

1051+ contents <- inlineListToMarkdown opts lst

1052+ case plain of

1053+ True -> return contents

1054+ False | isEnabled Ext_bracketed_spans opts ->

1055+ return $ "[" <> contents <> "]" <> "{.ul}"

1056+ | isEnabled Ext_native_spans opts ->

1057+ return $ tagWithAttrs "span" ("", ["underline"], [])

1058+ <> contents

1059+ <> literal ""

1060+ | isEnabled Ext_raw_html opts ->

1061+ return $ "" <> contents <> ""

1062+ | otherwise -> inlineToMarkdown opts (Emph lst)

10481063inlineToMarkdown _ (Strong []) = return empty

10491064inlineToMarkdown opts (Strong lst) = do

10501065 plain <- asks envPlain

src/Text/Pandoc/Writers/MediaWiki.hs+4

@@ -372,6 +372,10 @@ inlineToMediaWiki (Emph lst) = do

372372 contents <- inlineListToMediaWiki lst

373373 return $ "''" <> contents <> "''"

374374

375+inlineToMediaWiki (Underline lst) = do

376+ contents <- inlineListToMediaWiki lst

377+ return $ "" <> contents <> ""

378+

375379inlineToMediaWiki (Strong lst) = do

376380 contents <- inlineListToMediaWiki lst

377381 return $ "'''" <> contents <> "'''"

src/Text/Pandoc/Writers/Ms.hs+2

@@ -351,6 +351,8 @@ inlineToMs :: PandocMonad m => WriterOptions -> Inline -> MS m (Doc Text)

351351inlineToMs opts (Span _ ils) = inlineListToMs opts ils

352352inlineToMs opts (Emph lst) =

353353 withFontFeature 'I' (inlineListToMs opts lst)

354+inlineToMs opts (Underline lst) =

355+ inlineToMs opts (Emph lst)

354356inlineToMs opts (Strong lst) =

355357 withFontFeature 'B' (inlineListToMs opts lst)

356358inlineToMs opts (Strikeout lst) = do

src/Text/Pandoc/Writers/Muse.hs+7

@@ -594,6 +594,13 @@ inlineToMuse (Strong [Emph lst]) = do

594594 else if null lst' || startsWithSpace lst' || endsWithSpace lst'

595595 then emphasis "**" "**" lst'

596596 else emphasis "***" "***" lst'

597+-- | Underline is only supported in Emacs Muse mode.

598+inlineToMuse (Underline lst) = do

599+ opts <- asks envOptions

600+ contents <- inlineListToMuse lst

601+ if isEnabled Ext_amuse opts

602+ then return $ "_" <> contents <> "_"

603+ else inlineToMuse (Emph lst)

597604inlineToMuse (Strong lst) = do

598605 useTags <- gets stUseTags

599606 let lst' = normalizeInlineList lst

src/Text/Pandoc/Writers/OpenDocument.hs+5

@@ -512,6 +512,7 @@ inlineToOpenDocument o ils

512512 LineBreak -> return $ selfClosingTag "text:line-break" []

513513 Str s -> return $ handleSpaces $ escapeStringForXML s

514514 Emph l -> withTextStyle Italic $ inlinesToOpenDocument o l

515+ Underline l -> withTextStyle Under $ inlinesToOpenDocument o l

515516 Strong l -> withTextStyle Bold $ inlinesToOpenDocument o l

516517 Strikeout l -> withTextStyle Strike $ inlinesToOpenDocument o l

517518 Superscript l -> withTextStyle Sup $ inlinesToOpenDocument o l

@@ -692,6 +693,7 @@ paraTableStyles t s (a:xs)

692693

693694data TextStyle = Italic

694695 | Bold

696+ | Under

695697 | Strike

696698 | Sub

697699 | Sup

@@ -710,6 +712,9 @@ textStyleAttr m s

710712 | Bold <- s = Map.insert "fo:font-weight" "bold" .

711713 Map.insert "style:font-weight-asian" "bold" .

712714 Map.insert "style:font-weight-complex" "bold" $ m

715+ | Under <- s = Map.insert "style:text-underline-style" "solid" .

716+ Map.insert "style:text-underline-width" "auto" .

717+ Map.insert "style:text-underline-color" "font-color" $ m

713718 | Strike <- s = Map.insert "style:text-line-through-style" "solid" m

714719 | Sub <- s = Map.insert "style:text-position" "sub 58%" m

715720 | Sup <- s = Map.insert "style:text-position" "super 58%" m

src/Text/Pandoc/Writers/Org.hs+3

@@ -329,6 +329,9 @@ inlineToOrg (Span _ lst) =

329329inlineToOrg (Emph lst) = do

330330 contents <- inlineListToOrg lst

331331 return $ "/" <> contents <> "/"

332+inlineToOrg (Underline lst) = do

333+ contents <- inlineListToOrg lst

334+ return $ "_" <> contents <> "_"

332335inlineToOrg (Strong lst) = do

333336 contents <- inlineListToOrg lst

334337 return $ "*" <> contents <> "*"

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+3

@@ -323,6 +323,9 @@ inlineToParElems (Str s) = do

323323inlineToParElems (Emph ils) =

324324 local (\r -> r{envRunProps = (envRunProps r){rPropItalics=True}}) $

325325 inlinesToParElems ils

326+inlineToParElems (Underline ils) =

327+ local (\r -> r{envRunProps = (envRunProps r){rPropUnderline=True}}) $

328+ inlinesToParElems ils

326329inlineToParElems (Strong ils) =

327330 local (\r -> r{envRunProps = (envRunProps r){rPropBold=True}}) $

328331 inlinesToParElems ils

src/Text/Pandoc/Writers/RST.hs+7

@@ -415,6 +415,7 @@ transformInlines = insertBS .

415415 hasContents :: Inline -> Bool

416416 hasContents (Str "") = False

417417 hasContents (Emph []) = False

418+ hasContents (Underline []) = False

418419 hasContents (Strong []) = False

419420 hasContents (Strikeout []) = False

420421 hasContents (Superscript []) = False

@@ -474,6 +475,7 @@ transformInlines = insertBS .

474475 okBeforeComplex _ = False

475476 isComplex :: Inline -> Bool

476477 isComplex (Emph _) = True

478+ isComplex (Underline _) = True

477479 isComplex (Strong _) = True

478480 isComplex (SmallCaps _) = True

479481 isComplex (Strikeout _) = True

@@ -538,6 +540,7 @@ mapNested f i = setInlineChildren i (f (dropInlineParent i))

538540dropInlineParent :: Inline -> [Inline]

539541dropInlineParent (Link _ i _) = i

540542dropInlineParent (Emph i) = i

543+dropInlineParent (Underline i) = i

541544dropInlineParent (Strong i) = i

542545dropInlineParent (Strikeout i) = i

543546dropInlineParent (Superscript i) = i

@@ -552,6 +555,7 @@ dropInlineParent i = [i] -- not a parent, like Str or Space

552555setInlineChildren :: Inline -> [Inline] -> Inline

553556setInlineChildren (Link a _ t) i = Link a i t

554557setInlineChildren (Emph _) i = Emph i

558+setInlineChildren (Underline _) i = Underline i

555559setInlineChildren (Strong _) i = Strong i

556560setInlineChildren (Strikeout _) i = Strikeout i

557561setInlineChildren (Superscript _) i = Superscript i

@@ -582,6 +586,9 @@ inlineToRST (Span (_,_,kvs) ils) = do

582586inlineToRST (Emph lst) = do

583587 contents <- writeInlines lst

584588 return $ "*" <> contents <> "*"

589+-- Underline is not supported, fall back to Emph

590+inlineToRST (Underline lst) =

591+ inlineToRST (Emph lst)

585592inlineToRST (Strong lst) = do

586593 contents <- writeInlines lst

587594 return $ "**" <> contents <> "**"

src/Text/Pandoc/Writers/RTF.hs+3

@@ -351,6 +351,9 @@ inlineToRTF (Span _ lst) = inlinesToRTF lst

351351inlineToRTF (Emph lst) = do

352352 contents <- inlinesToRTF lst

353353 return $ "{\\i " <> contents <> "}"

354+inlineToRTF (Underline lst) = do

355+ contents <- inlinesToRTF lst

356+ return $ "{\\pnul " <> contents <> "}"

354357inlineToRTF (Strong lst) = do

355358 contents <- inlinesToRTF lst

356359 return $ "{\\b " <> contents <> "}"

src/Text/Pandoc/Writers/TEI.hs+2

@@ -231,6 +231,8 @@ inlineToTEI :: PandocMonad m => WriterOptions -> Inline -> m (Doc Text)

231231inlineToTEI _ (Str str) = return $ literal $ escapeStringForXML str

232232inlineToTEI opts (Emph lst) =

233233 inTags False "hi" [("rendition","simple:italic")] <$> inlinesToTEI opts lst

234+inlineToTEI opts (Underline lst) =

235+ inTags False "hi" [("rendition","simple:underline")] <$> inlinesToTEI opts lst

234236inlineToTEI opts (Strong lst) =

235237 inTags False "hi" [("rendition", "simple:bold")] <$> inlinesToTEI opts lst

236238inlineToTEI opts (Strikeout lst) =

src/Text/Pandoc/Writers/Texinfo.hs+4

@@ -392,6 +392,10 @@ inlineToTexinfo (Span _ lst) =

392392inlineToTexinfo (Emph lst) =

393393 inCmd "emph" <$> inlineListToTexinfo lst

394394

395+-- Underline isn't supported, fall back to Emph

396+inlineToTexinfo (Underline lst) =

397+ inlineToTexinfo (Emph lst)

398+

395399inlineToTexinfo (Strong lst) =

396400 inCmd "strong" <$> inlineListToTexinfo lst

397401

src/Text/Pandoc/Writers/Textile.hs+6

@@ -386,6 +386,12 @@ inlineToTextile opts (Emph lst) = do

386386 then "" <> contents <> ""

387387 else "_" <> contents <> "_"

388388

389+inlineToTextile opts (Underline lst) = do

390+ contents <- inlineListToTextile opts lst

391+ return $ if '+' `elemText` contents

392+ then "" <> contents <> ""

393+ else "+" <> contents <> "+"

394+

389395inlineToTextile opts (Strong lst) = do

390396 contents <- inlineListToTextile opts lst

391397 return $ if '*' `elemText` contents

src/Text/Pandoc/Writers/XWiki.hs+4

@@ -163,6 +163,10 @@ inlineToXWiki (Emph lst) = do

163163 contents <- inlineListToXWiki lst

164164 return $ "//" <> contents <> "//"

165165

166+inlineToXWiki (Underline lst) = do

167+ contents <- inlineListToXWiki lst

168+ return $ "__" <> contents <> "__"

169+

166170inlineToXWiki (Strong lst) = do

167171 contents <- inlineListToXWiki lst

168172 return $ "**" <> contents <> "**"

src/Text/Pandoc/Writers/ZimWiki.hs+4

@@ -273,6 +273,10 @@ inlineToZimWiki opts (Emph lst) = do

273273 contents <- inlineListToZimWiki opts lst

274274 return $ "//" <> contents <> "//"

275275

276+inlineToZimWiki opts (Underline lst) = do

277+ contents <- inlineListToZimWiki opts lst

278+ return $ "__" <> contents <> "__"

279+

276280inlineToZimWiki opts (Strong lst) = do

277281 contents <- inlineListToZimWiki opts lst

278282 return $ "**" <> contents <> "**"

test/Tests/Readers/DokuWiki.hs+2−3

@@ -22,7 +22,6 @@ import Tests.Helpers

2222import Text.Pandoc

2323import Text.Pandoc.Arbitrary ()

2424import Text.Pandoc.Builder

25−import Text.Pandoc.Shared (underlineSpan)

2625

2726dokuwiki :: Text -> Pandoc

2827dokuwiki = purely $ readDokuWiki def{ readerStandalone = True }

@@ -42,7 +41,7 @@ tests = [ testGroup "inlines"

4241 para (emph "italic")

4342 , "Underlined" =:

4443 "__underlined__" =?>

45− para (underlineSpan "underlined")

44+ para (underline "underlined")

4645 , "Monospaced" =:

4746 "''monospaced''" =?>

4847 para (code "monospaced")

@@ -51,7 +50,7 @@ tests = [ testGroup "inlines"

5150 para (code "monospaced")

5251 , "Combined" =:

5352 "**__//''combine''//__**" =?>

54− para (strong $ underlineSpan $ emph $ code "combine")

53+ para (strong $ underline $ emph $ code "combine")

5554 , "Nowiki" =:

5655 T.unlines [ "<nowiki>"

5756 , "This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it."

test/Tests/Readers/Muse.hs+1−2

@@ -25,7 +25,6 @@ import Tests.Helpers

2525import Text.Pandoc

2626import Text.Pandoc.Arbitrary ()

2727import Text.Pandoc.Builder

28−import Text.Pandoc.Shared (underlineSpan)

2928import Text.Pandoc.Writers.Shared (toLegacyTable)

3029import Text.Pandoc.Walk

3130

@@ -209,7 +208,7 @@ tests =

209208 para (strong . emph $ "foo******bar")

210209

211210 , test emacsMuse "Underline"

212− ("_Underline_" =?> para (underlineSpan "Underline"))

211+ ("_Underline_" =?> para (underline "Underline"))

213212

214213 , "Superscript tag" =: "Superscript" =?> para (superscript "Superscript")

215214

test/Tests/Readers/Org/Inline.hs+1−2

@@ -19,7 +19,6 @@ import Test.Tasty (TestTree, testGroup)

1919import Tests.Helpers ((=?>))

2020import Tests.Readers.Org.Shared ((=:), spcSep)

2121import Text.Pandoc.Builder

22−import Text.Pandoc.Shared (underlineSpan)

2322import qualified Data.Text as T

2423import qualified Tests.Readers.Org.Inline.Citation as Citation

2524import qualified Tests.Readers.Org.Inline.Note as Note

@@ -49,7 +48,7 @@ tests =

4948

5049 , "Underline" =:

5150 "_underline_" =?>

52− para (underlineSpan "underline")

51+ para (underline "underline")

5352

5453 , "Strikeout" =:

5554 "+Kill Bill+" =?>

test/Tests/Readers/Txt2Tags.hs+2−3

@@ -23,7 +23,6 @@ import Tests.Helpers

2323import Text.Pandoc

2424import Text.Pandoc.Arbitrary ()

2525import Text.Pandoc.Builder

26−import Text.Pandoc.Shared (underlineSpan)

2726

2827t2t :: Text -> Pandoc

2928-- t2t = handleError . readTxt2Tags (T2TMeta "date" "mtime" "in" "out") def

@@ -94,12 +93,12 @@ tests =

9493

9594 , "Inline markup is greedy" =:

9695 "***** ///// _____ ----- ````` \"\"\"\"\" '''''" =?>

97− para (spcSep [strong "*", emph "/", underlineSpan "_"

96+ para (spcSep [strong "*", emph "/", underline "_"

9897 , strikeout "-", code "`", text "\""

9998 , rawInline "html" "'"])

10099 , "Markup must be greedy" =:

101100 "********** ////////// __________ ---------- `````````` \"\"\"\"\"\"\"\"\"\" ''''''''''" =?>

102− para (spcSep [strong "******", emph "//////", underlineSpan "______"

101+ para (spcSep [strong "******", emph "//////", underline "______"

103102 , strikeout "------", code "``````", text "\"\"\"\"\"\""

104103 , rawInline "html" "''''''"])

105104 , "Inlines must be glued" =:

test/docx/alternate_document_path.native+2−1

@@ -1,2 +1,3 @@

1+Pandoc (Meta {unMeta = fromList []})

12[Header 1 ("test",[],[]) [Str "Test"]

2−,Para [Str "This",Space,Str "is",Space,Emph [Str "italic"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Span ("",["underline"],[]) [Str "underlined"],Str ",",Space,Emph [Span ("",["underline"],[]) [Str "italic",Space,Str "underlined"]],Str ",",Space,Strong [Span ("",["underline"],[]) [Str "bold",Space,Str "underlined"]],Str ",",Space,Emph [Strong [Span ("",["underline"],[]) [Str "bold",Space,Str "italic",Space,Str "underlined"]]],Str "."]]

3+,Para [Str "This",Space,Str "is",Space,Emph [Str "italic"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Underline [Str "underlined"],Str ",",Space,Emph [Underline [Str "italic",Space,Str "underlined"]],Str ",",Space,Strong [Underline [Str "bold",Space,Str "underlined"]],Str ",",Space,Emph [Strong [Underline [Str "bold",Space,Str "italic",Space,Str "underlined"]]],Str "."]]

test/docx/golden/inline_formatting.docx

Binary file not shown.

test/docx/inline_formatting.native+2−1

@@ -1,5 +1,6 @@

1+Pandoc (Meta {unMeta = fromList []})

12[Para [Str "Regular",Space,Str "text",Space,Emph [Str "italics"],Space,Strong [Str "bold",Space,Emph [Str "bold",Space,Str "italics"]],Str "."]

23,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."]

3−,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",["underline"],[]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."]

4+,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Underline [Str "single",Space,Str "underlines",Space,Str "for",Space],Emph [Underline [Str "emphasis"]],Str "."]

45,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."]

56,Para [Str "A",Space,Str "line",LineBreak,Str "break."]]

test/html-reader.native+1−1

@@ -211,7 +211,7 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl

211211,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]

212212,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "<html>",Str "."]

213213,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."]

214−,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "underlined:",Space,Span ("",["underline"],[]) [Str "foo"],Space,Str "and",Space,Span ("",["underline"],[]) [Str "bar"],Str "."]

214+,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "underlined:",Space,Underline [Str "foo"],Space,Str "and",Space,Underline [Str "bar"],Str "."]

215215,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "strikethrough:",Space,Strikeout [Str "foo"],Str ",",Space,Strikeout [Str "bar"],Str ",",Space,Str "and",Space,Strikeout [Str "baz"],Str "."]

216216,HorizontalRule

217217,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]

test/textile-reader.native+1−1

@@ -86,7 +86,7 @@ Pandoc (Meta {unMeta = fromList []})

8686 ,([Str "beer"],

8787 [[Plain [Str "fresh",Space,Str "and",Space,Str "bitter"]]])]

8888,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]

89−,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Span ("",["underline"],[]) [Str "inserted"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "deleted"],Str ".",LineBreak,Str "Hyphenated-words-are-ok,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "strange_underscore_notation.",LineBreak,Str "A",Space,Link ("",[],[]) [Strong [Str "strong",Space,Str "link"]] ("http://www.foobar.com",""),Str "."]

89+,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Underline [Str "inserted"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "deleted"],Str ".",LineBreak,Str "Hyphenated-words-are-ok,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "strange_underscore_notation.",LineBreak,Str "A",Space,Link ("",[],[]) [Strong [Str "strong",Space,Str "link"]] ("http://www.foobar.com",""),Str "."]

9090,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]]

9191,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."]

9292,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."]

test/txt2tags.native+2−2

@@ -29,8 +29,8 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]

2929,Para [Strikeout [Str "-------+--------"]]

3030,Para [Str "(",Space,Strikeout [Str "----------------"],Space,Str ")"]

3131,Header 1 ("inline",[],[]) [Str "Inline"]

32−,Para [Str "i)",Space,Strong [Str "b"],Space,Emph [Str "i"],Space,Span ("",["underline"],[]) [Str "u"],Space,Strikeout [Str "s"],Space,Code ("",[],[]) "m",Space,Str "r",Space,RawInline (Format "html") "t",SoftBreak,Str "i)",Space,Strong [Str "bo"],Space,Emph [Str "it"],Space,Span ("",["underline"],[]) [Str "un"],Space,Strikeout [Str "st"],Space,Code ("",[],[]) "mo",Space,Str "ra",Space,RawInline (Format "html") "tg",SoftBreak,Str "i)",Space,Strong [Str "bold"],Space,Emph [Str "ital"],Space,Span ("",["underline"],[]) [Str "undr"],Space,Strikeout [Str "strk"],Space,Code ("",[],[]) "mono",Space,Str "raw",Space,RawInline (Format "html") "tggd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "ld"],Space,Emph [Str "it",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "rk"],Space,Code ("",[],[]) "mo no",Space,Str "r",Space,Str "aw",Space,RawInline (Format "html") "tg gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "*",Space,Str "ld"],Space,Emph [Str "it",Space,Str "/",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "_",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "-",Space,Str "rk"],Space,Code ("",[],[]) "mo ` no",Space,Str "r",Space,Str "\"",Space,Str "aw",Space,RawInline (Format "html") "tg ' gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**ld"],Space,Emph [Str "it",Space,Str "//al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "__dr"],Space,Strikeout [Str "st",Space,Str "--rk"],Space,Code ("",[],[]) "mo ``no",Space,Str "r",Space,Str "\"\"aw",Space,RawInline (Format "html") "tg ''gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**",Space,Str "ld"],Space,Emph [Str "it",Space,Str "//",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "__",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "--",Space,Str "rk"],Space,Code ("",[],[]) "mo `` no",Space,Str "r",Space,Str "\"\"",Space,Str "aw",Space,RawInline (Format "html") "tg '' gd",SoftBreak,Str "i)",Space,Strong [Str "**bold**"],Space,Emph [Str "//ital//"],Space,Span ("",["underline"],[]) [Str "__undr__"],Space,Strikeout [Str "--strk--"],Space,Code ("",[],[]) "``mono``",Space,Str "\"\"raw\"\"",Space,RawInline (Format "html") "''tggd''",SoftBreak,Str "i)",Space,Strong [Str "*bold*"],Space,Emph [Str "/ital/"],Space,Span ("",["underline"],[]) [Str "_undr_"],Space,Strikeout [Str "-strk-"],Space,Code ("",[],[]) "`mono`",Space,Str "\"raw\"",Space,RawInline (Format "html") "'tggd'"]

33−,Para [Str "i)",Space,Strong [Str "*"],Space,Emph [Str "/"],Space,Span ("",["underline"],[]) [Str "_"],Space,Strikeout [Str "-"],Space,Code ("",[],[]) "`",Space,Str "\"",Space,RawInline (Format "html") "'",SoftBreak,Str "i)",Space,Strong [Str "**"],Space,Emph [Str "//"],Space,Span ("",["underline"],[]) [Str "__"],Space,Strikeout [Str "--"],Space,Code ("",[],[]) "``",Space,Str "\"\"",Space,RawInline (Format "html") "''",SoftBreak,Str "i)",Space,Strong [Str "***"],Space,Emph [Str "///"],Space,Span ("",["underline"],[]) [Str "___"],Space,Strikeout [Str "---"],Space,Code ("",[],[]) "```",Space,Str "\"\"\"",Space,RawInline (Format "html") "'''",SoftBreak,Str "i)",Space,Strong [Str "****"],Space,Emph [Str "////"],Space,Span ("",["underline"],[]) [Str "____"],Space,Strikeout [Str "----"],Space,Code ("",[],[]) "````",Space,Str "\"\"\"\"",Space,RawInline (Format "html") "''''",SoftBreak,Str "i)",Space,Strong [Str "*****"],Space,Emph [Str "/////"],Space,Span ("",["underline"],[]) [Str "_____"],Space,Strikeout [Str "-----"],Space,Code ("",[],[]) "`````",Space,Str "\"\"\"\"\"",Space,RawInline (Format "html") "'''''",SoftBreak,Str "i)",Space,Strong [Str "******"],Space,Emph [Str "//////"],Space,Span ("",["underline"],[]) [Str "______"],Space,Strikeout [Str "------"],Space,Code ("",[],[]) "``````",Space,Str "\"\"\"\"\"\"",Space,RawInline (Format "html") "''''''"]

32+,Para [Str "i)",Space,Strong [Str "b"],Space,Emph [Str "i"],Space,Underline [Str "u"],Space,Strikeout [Str "s"],Space,Code ("",[],[]) "m",Space,Str "r",Space,RawInline (Format "html") "t",SoftBreak,Str "i)",Space,Strong [Str "bo"],Space,Emph [Str "it"],Space,Underline [Str "un"],Space,Strikeout [Str "st"],Space,Code ("",[],[]) "mo",Space,Str "ra",Space,RawInline (Format "html") "tg",SoftBreak,Str "i)",Space,Strong [Str "bold"],Space,Emph [Str "ital"],Space,Underline [Str "undr"],Space,Strikeout [Str "strk"],Space,Code ("",[],[]) "mono",Space,Str "raw",Space,RawInline (Format "html") "tggd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "ld"],Space,Emph [Str "it",Space,Str "al"],Space,Underline [Str "un",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "rk"],Space,Code ("",[],[]) "mo no",Space,Str "r",Space,Str "aw",Space,RawInline (Format "html") "tg gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "*",Space,Str "ld"],Space,Emph [Str "it",Space,Str "/",Space,Str "al"],Space,Underline [Str "un",Space,Str "_",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "-",Space,Str "rk"],Space,Code ("",[],[]) "mo ` no",Space,Str "r",Space,Str "\"",Space,Str "aw",Space,RawInline (Format "html") "tg ' gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**ld"],Space,Emph [Str "it",Space,Str "//al"],Space,Underline [Str "un",Space,Str "__dr"],Space,Strikeout [Str "st",Space,Str "--rk"],Space,Code ("",[],[]) "mo ``no",Space,Str "r",Space,Str "\"\"aw",Space,RawInline (Format "html") "tg ''gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**",Space,Str "ld"],Space,Emph [Str "it",Space,Str "//",Space,Str "al"],Space,Underline [Str "un",Space,Str "__",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "--",Space,Str "rk"],Space,Code ("",[],[]) "mo `` no",Space,Str "r",Space,Str "\"\"",Space,Str "aw",Space,RawInline (Format "html") "tg '' gd",SoftBreak,Str "i)",Space,Strong [Str "**bold**"],Space,Emph [Str "//ital//"],Space,Underline [Str "__undr__"],Space,Strikeout [Str "--strk--"],Space,Code ("",[],[]) "``mono``",Space,Str "\"\"raw\"\"",Space,RawInline (Format "html") "''tggd''",SoftBreak,Str "i)",Space,Strong [Str "*bold*"],Space,Emph [Str "/ital/"],Space,Underline [Str "_undr_"],Space,Strikeout [Str "-strk-"],Space,Code ("",[],[]) "`mono`",Space,Str "\"raw\"",Space,RawInline (Format "html") "'tggd'"]

33+,Para [Str "i)",Space,Strong [Str "*"],Space,Emph [Str "/"],Space,Underline [Str "_"],Space,Strikeout [Str "-"],Space,Code ("",[],[]) "`",Space,Str "\"",Space,RawInline (Format "html") "'",SoftBreak,Str "i)",Space,Strong [Str "**"],Space,Emph [Str "//"],Space,Underline [Str "__"],Space,Strikeout [Str "--"],Space,Code ("",[],[]) "``",Space,Str "\"\"",Space,RawInline (Format "html") "''",SoftBreak,Str "i)",Space,Strong [Str "***"],Space,Emph [Str "///"],Space,Underline [Str "___"],Space,Strikeout [Str "---"],Space,Code ("",[],[]) "```",Space,Str "\"\"\"",Space,RawInline (Format "html") "'''",SoftBreak,Str "i)",Space,Strong [Str "****"],Space,Emph [Str "////"],Space,Underline [Str "____"],Space,Strikeout [Str "----"],Space,Code ("",[],[]) "````",Space,Str "\"\"\"\"",Space,RawInline (Format "html") "''''",SoftBreak,Str "i)",Space,Strong [Str "*****"],Space,Emph [Str "/////"],Space,Underline [Str "_____"],Space,Strikeout [Str "-----"],Space,Code ("",[],[]) "`````",Space,Str "\"\"\"\"\"",Space,RawInline (Format "html") "'''''",SoftBreak,Str "i)",Space,Strong [Str "******"],Space,Emph [Str "//////"],Space,Underline [Str "______"],Space,Strikeout [Str "------"],Space,Code ("",[],[]) "``````",Space,Str "\"\"\"\"\"\"",Space,RawInline (Format "html") "''''''"]

3434,Para [Str "i)",Space,Str "****",Space,Str "////",Space,Str "____",Space,Str "----",Space,Str "````",Space,Str "\"\"\"\"",Space,Str "''''",SoftBreak,Str "i)",Space,Str "**",Space,Str "**",Space,Str "//",Space,Str "//",Space,Str "__",Space,Str "__",Space,Str "--",Space,Str "--",Space,Str "``",Space,Str "``",Space,Str "\"\"",Space,Str "\"\"",Space,Str "''",Space,Str "''"]

3535,Para [Str "i)",Space,Str "**",Space,Str "bold**",Space,Str "//",Space,Str "ital//",Space,Str "__",Space,Str "undr__",Space,Str "--",Space,Str "strk--",Space,Str "``",Space,Str "mono``",Space,Str "\"\"",Space,Str "raw\"\"",Space,Str "''",Space,Str "tggd''",SoftBreak,Str "i)",Space,Str "**bold",Space,Str "**",Space,Str "//ital",Space,Str "//",Space,Str "__undr",Space,Str "__",Space,Str "--strk",Space,Str "--",Space,Str "``mono",Space,Str "``",Space,Str "\"\"raw",Space,Str "\"\"",Space,Str "''tggd",Space,Str "''",SoftBreak,Str "i)",Space,Str "**",Space,Str "bold",Space,Str "**",Space,Str "//",Space,Str "ital",Space,Str "//",Space,Str "__",Space,Str "undr",Space,Str "__",Space,Str "--",Space,Str "strk",Space,Str "--",Space,Str "``",Space,Str "mono",Space,Str "``",Space,Str "\"\"",Space,Str "raw",Space,Str "\"\"",Space,Str "''",Space,Str "tggd",Space,Str "''"]

3636,Header 1 ("link",[],[]) [Str "Link"]