Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

HTML Writer: consistently use dashed class-names

Browse source 
see #3556
This commit is contained in:
mb21 2017-10-31 10:32:17 +01:00
parent 3eaa6ff329
commit 8d7ce0fdf0
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/epub.css
View file

@ -12,7 +12,7 @@ h2.author { }
h3.date { } h3.date { }
ol.toc { padding: 0; margin-left: 1em; } ol.toc { padding: 0; margin-left: 1em; }
ol.toc li { list-style-type: none; margin: 0; padding: 0; } 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 em em em { font-style: italic;}
em em, em em em em { font-style: normal; } em em, em em em em { font-style: normal; }

2
data/templates/default.s5
View file

@ -64,7 +64,7 @@ $endfor$
</div> </div>
<div class="presentation"> <div class="presentation">
$if(title)$ $if(title)$
<div class="titleslide slide"> <div class="title-slide slide">
<h1 class="title">$title$</h1> <h1 class="title">$title$</h1>
$if(subtitle)$ $if(subtitle)$
<h2 class="subtitle">$subtitle$</h2> <h2 class="subtitle">$subtitle$</h2>

6
src/Text/Pandoc/Writers/HTML.hs
View file

@ -438,7 +438,7 @@ elementToHtml slideLevel opts (Sec level num (id',classes,keyvals) title' elemen
[] -> [] [] -> []
(x:xs) -> x ++ concatMap inDiv xs (x:xs) -> x ++ concatMap inDiv xs
let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts] 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) && ["section" | (slide || writerSectionDivs opts) &&
not html5 ] ++ not html5 ] ++
["level" ++ show level | slide || writerSectionDivs opts ] ["level" ++ show level | slide || writerSectionDivs opts ]
@ -1100,7 +1100,7 @@ inlineToHtml opts inline = do
let link = H.a ! A.href (toValue $ "#" ++ let link = H.a ! A.href (toValue $ "#" ++
revealSlash ++ revealSlash ++
writerIdentifierPrefix opts ++ "fn" ++ ref) writerIdentifierPrefix opts ++ "fn" ++ ref)
! A.class_ "footnoteRef" ! A.class_ "footnote-ref"
! prefixedId opts ("fnref" ++ ref) ! prefixedId opts ("fnref" ++ ref)
$ (if isJust epubVersion $ (if isJust epubVersion
then id then id
@ -1120,7 +1120,7 @@ blockListToNote :: PandocMonad m => WriterOptions -> String -> [Block] -> StateT
blockListToNote opts ref blocks = blockListToNote opts ref blocks =
-- If last block is Para or Plain, include the backlink at the end of -- 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. -- 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 blocks' = if null blocks
then [] then []
else let lastBlock = last blocks else let lastBlock = last blocks

2
test/s5-basic.html
View file

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div class="presentation"> <div class="presentation">
<div class="titleslide slide"> <div class="title-slide slide">
<h1 class="title">My S5 Document</h1> <h1 class="title">My S5 Document</h1>
<h3 class="author">Sam Smith<br/>Jen Jones</h3> <h3 class="author">Sam Smith<br/>Jen Jones</h3>
<h4 class="date">July 15, 2006</h4> <h4 class="date">July 15, 2006</h4>

2
test/s5-fancy.html
View file

@ -239,7 +239,7 @@
</div> </div>
</div> </div>
<div class="presentation"> <div class="presentation">
<div class="titleslide slide"> <div class="title-slide slide">
<h1 class="title">My S5 Document</h1> <h1 class="title">My S5 Document</h1>
<h3 class="author">Sam Smith<br/>Jen Jones</h3> <h3 class="author">Sam Smith<br/>Jen Jones</h3>
<h4 class="date">July 15, 2006</h4> <h4 class="date">July 15, 2006</h4>

16
test/writer.html4
View file

@ -524,25 +524,25 @@ Blah
<p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p> <p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p>
<hr /> <hr />
<h1 id="footnotes">Footnotes</h1> <h1 id="footnotes">Footnotes</h1>
<p>Here is a footnote reference,<a href="#fn1" class="footnoteRef" id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnoteRef" id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnoteRef" id="fnref3"><sup>3</sup></a></p> <p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnote-ref" id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnote-ref" id="fnref3"><sup>3</sup></a></p>
<blockquote> <blockquote>
<p>Notes can go in quotes.<a href="#fn4" class="footnoteRef" id="fnref4"><sup>4</sup></a></p> <p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" id="fnref4"><sup>4</sup></a></p>
</blockquote> </blockquote>
<ol style="list-style-type: decimal"> <ol style="list-style-type: decimal">
<li>And in list items.<a href="#fn5" class="footnoteRef" id="fnref5"><sup>5</sup></a></li> <li>And in list items.<a href="#fn5" class="footnote-ref" id="fnref5"><sup>5</sup></a></li>
</ol> </ol>
<p>This paragraph should not be part of the note, as it is not indented.</p> <p>This paragraph should not be part of the note, as it is not indented.</p>
<div class="footnotes"> <div class="footnotes">
<hr /> <hr />
<ol> <ol>
<li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnoteBack">↩</a></p></li> <li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnote-back">↩</a></p></li>
<li id="fn2"><p>Here’s the long note. This one contains multiple blocks.</p> <li id="fn2"><p>Here’s the long note. This one contains multiple blocks.</p>
<p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p> <p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p>
<pre><code> { &lt;code&gt; }</code></pre> <pre><code> { &lt;code&gt; }</code></pre>
<p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnoteBack">↩</a></p></li> <p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnote-back">↩</a></p></li>
<li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnoteBack">↩</a></p></li> <li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnote-back">↩</a></p></li>
<li id="fn4"><p>In quote.<a href="#fnref4" class="footnoteBack">↩</a></p></li> <li id="fn4"><p>In quote.<a href="#fnref4" class="footnote-back">↩</a></p></li>
<li id="fn5"><p>In list.<a href="#fnref5" class="footnoteBack">↩</a></p></li> <li id="fn5"><p>In list.<a href="#fnref5" class="footnote-back">↩</a></p></li>
</ol> </ol>
</div> </div>
</body> </body>

16
test/writer.html5
View file

@ -526,25 +526,25 @@ Blah
<p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p> <p>Here is a movie <img src="movie.jpg" alt="movie" /> icon.</p>
<hr /> <hr />
<h1 id="footnotes">Footnotes</h1> <h1 id="footnotes">Footnotes</h1>
<p>Here is a footnote reference,<a href="#fn1" class="footnoteRef" id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnoteRef" id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnoteRef" id="fnref3"><sup>3</sup></a></p> <p>Here is a footnote reference,<a href="#fn1" class="footnote-ref" id="fnref1"><sup>1</sup></a> and another.<a href="#fn2" class="footnote-ref" id="fnref2"><sup>2</sup></a> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<a href="#fn3" class="footnote-ref" id="fnref3"><sup>3</sup></a></p>
<blockquote> <blockquote>
<p>Notes can go in quotes.<a href="#fn4" class="footnoteRef" id="fnref4"><sup>4</sup></a></p> <p>Notes can go in quotes.<a href="#fn4" class="footnote-ref" id="fnref4"><sup>4</sup></a></p>
</blockquote> </blockquote>
<ol type="1"> <ol type="1">
<li>And in list items.<a href="#fn5" class="footnoteRef" id="fnref5"><sup>5</sup></a></li> <li>And in list items.<a href="#fn5" class="footnote-ref" id="fnref5"><sup>5</sup></a></li>
</ol> </ol>
<p>This paragraph should not be part of the note, as it is not indented.</p> <p>This paragraph should not be part of the note, as it is not indented.</p>
<section class="footnotes"> <section class="footnotes">
<hr /> <hr />
<ol> <ol>
<li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnoteBack">↩</a></p></li> <li id="fn1"><p>Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.<a href="#fnref1" class="footnote-back">↩</a></p></li>
<li id="fn2"><p>Here’s the long note. This one contains multiple blocks.</p> <li id="fn2"><p>Here’s the long note. This one contains multiple blocks.</p>
<p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p> <p>Subsequent blocks are indented to show that they belong to the footnote (as with list items).</p>
<pre><code> { &lt;code&gt; }</code></pre> <pre><code> { &lt;code&gt; }</code></pre>
<p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnoteBack">↩</a></p></li> <p>If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.<a href="#fnref2" class="footnote-back">↩</a></p></li>
<li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnoteBack">↩</a></p></li> <li id="fn3"><p>This is <em>easier</em> to type. Inline notes may contain <a href="http://google.com">links</a> and <code>]</code> verbatim characters, as well as [bracketed text].<a href="#fnref3" class="footnote-back">↩</a></p></li>
<li id="fn4"><p>In quote.<a href="#fnref4" class="footnoteBack">↩</a></p></li> <li id="fn4"><p>In quote.<a href="#fnref4" class="footnote-back">↩</a></p></li>
<li id="fn5"><p>In list.<a href="#fnref5" class="footnoteBack">↩</a></p></li> <li id="fn5"><p>In list.<a href="#fnref5" class="footnote-back">↩</a></p></li>
</ol> </ol>
</section> </section>
</body> </body>