c1ebe94 · typeable/pandoc

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

compare with master

unifiedsplit

@@ -4,7 +4,6 @@ module Text.Pandoc.Readers.Markdown (

4 ) where

5

6import Data.List ( findIndex, sortBy )

7−import Data.Ord ( comparing )

8import Text.ParserCombinators.Pandoc

7import Text.ParserCombinators.Pandoc

9import Text.Pandoc.Definition

8import Text.Pandoc.Definition

10import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment )

9import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment )

@@ -123,7 +122,7 @@ parseMarkdown = do

123 state <- getState

122 state <- getState

124 let keys = reverse $ stateKeyBlocks state

123 let keys = reverse $ stateKeyBlocks state

125 let notes = reverse $ stateNoteBlocks state

124 let notes = reverse $ stateNoteBlocks state

126− let sortedNotes = sortBy (comparing numberOfNote) notes

125+ let sortedNotes = sortBy (\x y -> compare (numberOfNote x) (numberOfNote y)) notes

127 return (Pandoc (Meta title author date) (blocks' ++ sortedNotes ++ keys))

126 return (Pandoc (Meta title author date) (blocks' ++ sortedNotes ++ keys))

128

127

129--

128--

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

@@ -142,7 +142,7 @@ blockToHtml options (Note ref lst) =

142 let contents = (concatMap (blockToHtml options) lst) in

143 "<li id=\"fn" ++ ref ++ "\">" ++ contents ++ " <a href=\"#fnref" ++ ref ++

144 "\" class=\"footnoteBacklink\" title=\"Jump back to footnote " ++ ref ++

145− "\">↩</a></li>"

145+ "\">↩</a></li>\n"

146blockToHtml options (Key _ _) = ""

147blockToHtml options (CodeBlock str) = "<pre><code>" ++ (codeStringToHtml str) ++

148 "\n</code></pre>\n"

tests/writer.html+6−3

@@ -439,13 +439,16 @@ Cat & 1 \\ \hline

439<hr />

440<ol>

441<li id="fn1">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

442− <a href="#fnref1" class="footnoteBacklink" title="Jump back to footnote 1">↩</a></li><li id="fn2">Here's the long note. This one contains multiple blocks.

442+ <a href="#fnref1" class="footnoteBacklink" title="Jump back to footnote 1">↩</a></li>

443+<li id="fn2">Here's the long note. This one contains multiple blocks.

443Subsequent blocks are indented to show that they belong to the footnote (as with list items).

444Subsequent blocks are indented to show that they belong to the footnote (as with list items).

444<pre><code> { <code> }

445<pre><code> { <code> }

445</code></pre>

446</code></pre>

446If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

447If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

448+ <a href="#fnref2" class="footnoteBacklink" title="Jump back to footnote 2">↩</a></li>

447− <a href="#fnref2" class="footnoteBacklink" title="Jump back to footnote 2">↩</a></li><li id="fn3">This is easier to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters.

449+<li id="fn3">This is easier to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters.

448− <a href="#fnref3" class="footnoteBacklink" title="Jump back to footnote 3">↩</a></li></ol>

450+ <a href="#fnref3" class="footnoteBacklink" title="Jump back to footnote 3">↩</a></li>

451+</ol>

449</div>

452</div>

450</body>

453</body>

451</html>

454</html>

tests/writer.smart.html+6−3