git.iko.soy/typeable/pandoc
on master help sign in
JATS writer: remove 'role' attribute on 'bold' and 'sc' elements.

The JATS spec does not allow these. Closes #4937.

commit53657798cdd3b64165a2c2885bb4eefbf3ddafdf authorJohn MacFarlane <jgm@berkeley.edu> dateThu 27 Sep 2018, 13:18 (8 years ago) parent99aae5d
2 files changed+8−10
compare with master
unifiedsplit
src/Text/Pandoc/Writers/JATS.hs+2−3 test/writer.jats+6−7
src/Text/Pandoc/Writers/JATS.hs+2−3
@@ -344,7 +344,7 @@ inlineToJATS _ (Str str) = return $ text $ escapeStringForXML str
344344inlineToJATS opts (Emph lst) =
345345 inTagsSimple "italic" <$> inlinesToJATS opts lst
346346inlineToJATS opts (Strong lst) =
347− inTags False "bold" [("role", "strong")] <$> inlinesToJATS opts lst
347+ inTagsSimple "bold" <$> inlinesToJATS opts lst
348348inlineToJATS opts (Strikeout lst) =
349349 inTagsSimple "strike" <$> inlinesToJATS opts lst
350350inlineToJATS opts (Superscript lst) =
@@ -352,8 +352,7 @@ inlineToJATS opts (Superscript lst) =
352352inlineToJATS opts (Subscript lst) =
353353 inTagsSimple "sub" <$> inlinesToJATS opts lst
354354inlineToJATS opts (SmallCaps lst) =
355− inTags False "sc" [("role", "smallcaps")] <$>
356− inlinesToJATS opts lst
355+ inTagsSimple "sc" <$> inlinesToJATS opts lst
357356inlineToJATS opts (Quoted SingleQuote lst) = do
358357 contents <- inlinesToJATS opts lst
359358 return $ char '‘' <> contents <> char '’'
test/writer.jats+6−7
@@ -583,7 +583,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
583583 </boxed-text>
584584 <p>Interpreted markdown in a table:</p>
585585 <p>This is <italic>emphasized</italic></p>
586− <p>And this is <bold role="strong">strong</bold></p>
586+ <p>And this is <bold>strong</bold></p>
587587 <p>Here’s a simple block:</p>
588588 <boxed-text>
589589 <p>foo</p>
@@ -614,14 +614,13 @@ These should not be escaped: \$ \\ \&gt; \[ \{</preformat>
614614<sec id="inline-markup">
615615 <title>Inline Markup</title>
616616 <p>This is <italic>emphasized</italic>, and so <italic>is this</italic>.</p>
617− <p>This is <bold role="strong">strong</bold>, and so <bold role="strong">is
618− this</bold>.</p>
617+ <p>This is <bold>strong</bold>, and so <bold>is this</bold>.</p>
619618 <p>An <italic><ext-link ext-link-type="uri" xlink:href="/url">emphasized
620619 link</ext-link></italic>.</p>
621− <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
622− <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
623− <p><bold role="strong"><italic>This is strong and em.</italic></bold></p>
624− <p>So is <bold role="strong"><italic>this</italic></bold> word.</p>
620+ <p><bold><italic>This is strong and em.</italic></bold></p>
621+ <p>So is <bold><italic>this</italic></bold> word.</p>
622+ <p><bold><italic>This is strong and em.</italic></bold></p>
623+ <p>So is <bold><italic>this</italic></bold> word.</p>
625624 <p>This is code: <monospace>&gt;</monospace>, <monospace>$</monospace>,
626625 <monospace>\</monospace>, <monospace>\$</monospace>,
627626 <monospace>&lt;html&gt;</monospace>.</p>