From c1ebe94e40a66a092c2cd501eda1edb5ec216938 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Tue, 19 Dec 2006 23:46:07 +0000 Subject: + Replaced 'comparing' combinator in markdown reader with 'compare'. 'comparing' is from Data.Ord, which is not available in GHC 6.4. + Added line break after in HTML footnote output, for easier inspection of the source. git-svn-id: https://pandoc.googlecode.com/svn/trunk@245 788f1e2b-df1e-0410-8736-df70ead52e1b --- src/Text/Pandoc/Readers/Markdown.hs | 3 +-- src/Text/Pandoc/Writers/HTML.hs | 2 +- tests/writer.html | 9 ++++++--- tests/writer.smart.html | 9 ++++++--- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 499c2ecea..034e5d8e4 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -4,7 +4,6 @@ module Text.Pandoc.Readers.Markdown ( ) where import Data.List ( findIndex, sortBy ) -import Data.Ord ( comparing ) import Text.ParserCombinators.Pandoc import Text.Pandoc.Definition import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment ) @@ -123,7 +122,7 @@ parseMarkdown = do state <- getState let keys = reverse $ stateKeyBlocks state let notes = reverse $ stateNoteBlocks state - let sortedNotes = sortBy (comparing numberOfNote) notes + let sortedNotes = sortBy (\x y -> compare (numberOfNote x) (numberOfNote y)) notes return (Pandoc (Meta title author date) (blocks' ++ sortedNotes ++ keys)) -- diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index dadd45e39..f1bd0f8b5 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -142,7 +142,7 @@ blockToHtml options (Note ref lst) = let contents = (concatMap (blockToHtml options) lst) in "
  • " ++ contents ++ " ↩
    • " + "\">↩\n" blockToHtml options (Key _ _) = "" blockToHtml options (CodeBlock str) = "
    " ++ (codeStringToHtml str) ++ 
                                       "\n
    \n" diff --git a/tests/writer.html b/tests/writer.html index e8d7c228f..6fcb949ec 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -439,13 +439,16 @@ Cat & 1 \\ \hline

    1. Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

      - ↩

    2. Here's the long note. This one contains multiple blocks.

      + ↩
      3. +

    3. Here's the long note. This one contains multiple blocks.

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

        { <code> }

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

      - ↩

    4. This is easier to type. Inline notes may contain links and ] verbatim characters.

      - ↩
    + ↩ +

  • This is easier to type. Inline notes may contain links and ] verbatim characters.

    + ↩
    • + diff --git a/tests/writer.smart.html b/tests/writer.smart.html index b63e78968..508b0abf5 100644 --- a/tests/writer.smart.html +++ b/tests/writer.smart.html @@ -439,13 +439,16 @@ Cat & 1 \\ \hline

    1. Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

      - ↩

    2. Here’s the long note. This one contains multiple blocks.

      + ↩
      3. +

    3. Here’s the long note. This one contains multiple blocks.

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

        { <code> }

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

      - ↩

    4. This is easier to type. Inline notes may contain links and ] verbatim characters.

      - ↩
    + ↩ +

  • This is easier to type. Inline notes may contain links and ] verbatim characters.

    + ↩
    • + -- cgit v1.2.3