diff --git a/data/epub.css b/data/epub.css index 594a1e01e..34835ced4 100644 --- a/data/epub.css +++ b/data/epub.css @@ -12,7 +12,7 @@ h2.author { } h3.date { } ol.toc { padding: 0; margin-left: 1em; } ol.toc li { list-style-type: none; margin: 0; padding: 0; } -a.footnoteRef { vertical-align: super; } +a.footnote-ref { vertical-align: super; } em, em em em, em em em em em { font-style: italic;} em em, em em em em { font-style: normal; } diff --git a/data/templates/default.s5 b/data/templates/default.s5 index a94459bb1..23be415bc 100644 --- a/data/templates/default.s5 +++ b/data/templates/default.s5 @@ -64,7 +64,7 @@ $endfor$
$if(title)$ -
+

$title$

$if(subtitle)$

$subtitle$

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index ffcde3ce7..9c5dfccf8 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -438,7 +438,7 @@ elementToHtml slideLevel opts (Sec level num (id',classes,keyvals) title' elemen [] -> [] (x:xs) -> x ++ concatMap inDiv xs let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts] - let classes' = ["titleslide" | titleSlide] ++ ["slide" | slide] ++ + let classes' = ["title-slide" | titleSlide] ++ ["slide" | slide] ++ ["section" | (slide || writerSectionDivs opts) && not html5 ] ++ ["level" ++ show level | slide || writerSectionDivs opts ] @@ -1100,7 +1100,7 @@ inlineToHtml opts inline = do let link = H.a ! A.href (toValue $ "#" ++ revealSlash ++ writerIdentifierPrefix opts ++ "fn" ++ ref) - ! A.class_ "footnoteRef" + ! A.class_ "footnote-ref" ! prefixedId opts ("fnref" ++ ref) $ (if isJust epubVersion then id @@ -1120,7 +1120,7 @@ blockListToNote :: PandocMonad m => WriterOptions -> String -> [Block] -> StateT blockListToNote opts ref blocks = -- If last block is Para or Plain, include the backlink at the end of -- that block. Otherwise, insert a new Plain block with the backlink. - let backlink = [Link ("",["footnoteBack"],[]) [Str "↩"] ("#" ++ writerIdentifierPrefix opts ++ "fnref" ++ ref,[])] + let backlink = [Link ("",["footnote-back"],[]) [Str "↩"] ("#" ++ writerIdentifierPrefix opts ++ "fnref" ++ ref,[])] blocks' = if null blocks then [] else let lastBlock = last blocks diff --git a/test/s5-basic.html b/test/s5-basic.html index f3ca9bbf8..bace22ebd 100644 --- a/test/s5-basic.html +++ b/test/s5-basic.html @@ -38,7 +38,7 @@
-
+

My S5 Document

Sam Smith
Jen Jones

July 15, 2006

diff --git a/test/s5-fancy.html b/test/s5-fancy.html index 3031cf071..386ae6dbd 100644 --- a/test/s5-fancy.html +++ b/test/s5-fancy.html @@ -239,7 +239,7 @@
-
+

My S5 Document

Sam Smith
Jen Jones

July 15, 2006

diff --git a/test/writer.html4 b/test/writer.html4 index 2040b4a1a..51751170a 100644 --- a/test/writer.html4 +++ b/test/writer.html4 @@ -524,25 +524,25 @@ Blah

Here is a movie movie icon.

Footnotes

-

Here is a footnote reference,1 and another.2 This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3

+

Here is a footnote reference,1 and another.2 This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3

-

Notes can go in quotes.4

+

Notes can go in quotes.4

    -
  1. And in list items.5
    2. +
  2. And in list items.5

This paragraph should not be part of the note, as it is not indented.

    -

  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. +

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

  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. -

  4. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].↩

    5. -

  5. In quote.↩

    6. -

  6. In list.↩

    7. +

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

    +

  7. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].↩

    8. +

  8. In quote.↩

    9. +

  9. In list.↩

diff --git a/test/writer.html5 b/test/writer.html5 index e3b3a07ca..db2317be1 100644 --- a/test/writer.html5 +++ b/test/writer.html5 @@ -526,25 +526,25 @@ Blah

Here is a movie movie icon.

Footnotes

-

Here is a footnote reference,1 and another.2 This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3

+

Here is a footnote reference,1 and another.2 This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3

-

Notes can go in quotes.4

+

Notes can go in quotes.4

    -
  1. And in list items.5
    2. +
  2. And in list items.5

This paragraph should not be part of the note, as it is not indented.

    -

  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. +

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

  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. -

  4. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].↩

    5. -

  5. In quote.↩

    6. -

  6. In list.↩

    7. +

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

    +

  7. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].↩

    8. +

  8. In quote.↩

    9. +

  9. In list.↩