eea3592 · typeable/pandoc

git.iko.soy/typeable/pandoc

Reversed changes from r246:

+ Removed invisible anchors in front of header tags in HTML output. Reason: no way to prevent duplicate ID attributes (which is invalid HTML), since there might be duplicate header titles. See http://six.pairlist.net/pipermail/markdown-discuss/2005-January/000975.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@306 788f1e2b-df1e-0410-8736-df70ead52e1b

commiteea359203ac7f861ac9536b39e639f6c65579501 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 29 Dec 2006, 08:04 (20 years ago) parent17837b3

8 files changed+1−104

compare with master

unifiedsplit

README−21 src/Text/Pandoc/Writers/HTML.hs+1−3 tests/s5.basic.html−8 tests/s5.fancy.html−8 tests/s5.fragment.html−3 tests/s5.inserts.html−3 tests/writer.html−29 tests/writer.smart.html−29

README−21

@@ -298,27 +298,6 @@ markdown test suite, type `make test-markdown`.)

298298[standard markdown]: http://daringfireball.net/projects/markdown/syntax

299299 "Markdown syntax description"

300300

301−Section Headings

302−----------------

303−

304−Pandoc creates an invisible anchor in front of every HTML section

305−heading. The ID of this anchor is derived from the section heading

306−itself: spaces are converted to underscores, and formatting, links,

307−and other markup are removed. Thus, for example, the source

308−

309− ## Aristotle's *De Anima*

310−

311−gets converted to HTML as follows:

312−

313− <a id="Aristotle's_De_Anima"></a>

314− <h2>Aristotle's <em>De Anima</em></h2>

315−

316−This makes it easy to provide internal links that jump to a particular

317−place in a document. To provide a link to the heading above, for

318−example, just insert:

319−

320− [Back to Aristotle](#Aristotle's_De_Anima)

321−

322301Lists

323302-----

324303

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

@@ -228,10 +228,8 @@ blockToHtml options (OrderedList lst) =

228228blockToHtml options HorizontalRule = "<hr />\n"

229229blockToHtml options (Header level lst) =

230230 let contents = inlineListToHtml options lst in

231− let simplify = gsub "<[^>]*>" "" . gsub " " "_" in

232231 if ((level > 0) && (level <= 6))

233− then "<a id=\"" ++ simplify contents ++ "\"></a>\n" ++

234− "<h" ++ (show level) ++ ">" ++ contents ++

232+ then "<h" ++ (show level) ++ ">" ++ contents ++

235233 "</h" ++ (show level) ++ ">\n"

236234 else "<p>" ++ contents ++ "</p>\n"

237235listItemToHtml options list =

tests/s5.basic.html−8

@@ -747,24 +747,18 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>

747747<div id="currentSlide"></div>

748748<div id="header"></div>

749749<div id="footer">

750−<a id="July_15,_2006"></a>

751750<h1>July 15, 2006</h1>

752−<a id="My_S5_Document"></a>

753751<h2>My S5 Document</h2>

754752</div>

755753</div>

756754<div class="presentation">

757755

758756<div class="slide">

759−<a id="My_S5_Document"></a>

760757<h1>My S5 Document</h1>

761−<a id="Sam_Smith,_Jen_Jones"></a>

762758<h3>Sam Smith, Jen Jones</h3>

763−<a id="July_15,_2006"></a>

764759<h4>July 15, 2006</h4>

765760</div>

766761<div class="slide">

767−<a id="First_slide"></a>

768762<h1>First slide</h1>

769763<ul>

770764<li>first bullet</li>

@@ -772,7 +766,6 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>

772766</ul>

773767</div>

774768<div class="slide">

775−<a id="Smarty"></a>

776769<h1>Smarty</h1>

777770<ul class="incremental">

778771<li>"Hello there"</li>

@@ -781,7 +774,6 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script>

781774</ul>

782775</div>

783776<div class="slide">

784−<a id="Math"></a>

785777<h1>Math</h1>

786778<ul>

787779<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>

tests/s5.fancy.html−8

@@ -1659,24 +1659,18 @@ else

16591659<div id="currentSlide"></div>

16601660<div id="header"></div>

16611661<div id="footer">

1662−<a id="July_15,_2006"></a>

16631662<h1>July 15, 2006</h1>

1664−<a id="My_S5_Document"></a>

16651663<h2>My S5 Document</h2>

16661664</div>

16671665</div>

16681666<div class="presentation">

16691667

16701668<div class="slide">

1671−<a id="My_S5_Document"></a>

16721669<h1>My S5 Document</h1>

1673−<a id="Sam_Smith,_Jen_Jones"></a>

16741670<h3>Sam Smith, Jen Jones</h3>

1675−<a id="July_15,_2006"></a>

16761671<h4>July 15, 2006</h4>

16771672</div>

16781673<div class="slide">

1679−<a id="First_slide"></a>

16801674<h1>First slide</h1>

16811675<ul class="incremental">

16821676<li>first bullet</li>

@@ -1684,7 +1678,6 @@ else

16841678</ul>

16851679</div>

16861680<div class="slide">

1687−<a id="Smarty"></a>

16881681<h1>Smarty</h1>

16891682<ul>

16901683<li>“Hello there”</li>

@@ -1693,7 +1686,6 @@ else

16931686</ul>

16941687</div>

16951688<div class="slide">

1696−<a id="Math"></a>

16971689<h1>Math</h1>

16981690<ul class="incremental">

16991691<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>

tests/s5.fragment.html−3

@@ -1,10 +1,8 @@

1−<a id="First_slide"></a>

21<h1>First slide</h1>

32<ul>

43<li>first bullet</li>

54<li>second bullet</li>

65</ul>

7−<a id="Smarty"></a>

86<h1>Smarty</h1>

97<blockquote>

108<ul>

@@ -13,7 +11,6 @@

1311<li>And 'ellipses'...</li>

1412</ul>

1513</blockquote>

16−<a id="Math"></a>

1714<h1>Math</h1>

1815<ul>

1916<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>

tests/s5.inserts.html−3

@@ -13,13 +13,11 @@ STUFF INSERTED

1313<body>

1414STUFF INSERTED

1515<h1 class="title">My S5 Document</h1>

16−<a id="First_slide"></a>

1716<h1>First slide</h1>

1817<ul>

1918<li>first bullet</li>

2019<li>second bullet</li>

2120</ul>

22−<a id="Smarty"></a>

2321<h1>Smarty</h1>

2422<blockquote>

2523<ul>

@@ -28,7 +26,6 @@ STUFF INSERTED

2826<li>And 'ellipses'...</li>

2927</ul>

3028</blockquote>

31−<a id="Math"></a>

3229<h1>Math</h1>

3330<ul>

3431<li>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</li>

tests/writer.html−29

@@ -12,28 +12,18 @@

1212<h1 class="title">Pandoc Test Suite</h1>

1313<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite.</p>

1414<hr />

15−<a id="Headers"></a>

1615<h1>Headers</h1>

17−<a id="Level_2_with_an_embedded_link"></a>

1816<h2>Level 2 with an <a href="/url">embedded link</a></h2>

19−<a id="Level_3_with_emphasis"></a>

2017<h3>Level 3 with <em>emphasis</em></h3>

21−<a id="Level_4"></a>

2218<h4>Level 4</h4>

23−<a id="Level_5"></a>

2419<h5>Level 5</h5>

25−<a id="Level_1"></a>

2620<h1>Level 1</h1>

27−<a id="Level_2_with_emphasis"></a>

2821<h2>Level 2 with <em>emphasis</em></h2>

29−<a id="Level_3"></a>

3022<h3>Level 3</h3>

3123<p>with no blank line</p>

32−<a id="Level_2"></a>

3324<h2>Level 2</h2>

3425<p>with no blank line</p>

3526<hr />

36−<a id="Paragraphs"></a>

3727<h1>Paragraphs</h1>

3828<p>Here's a regular paragraph.</p>

3929<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p>

@@ -41,7 +31,6 @@

4131<p>There should be a hard line break<br />

4232here.</p>

4333<hr />

44−<a id="Block_Quotes"></a>

4534<h1>Block Quotes</h1>

4635<p>E-mail style:</p>

4736<blockquote>

@@ -90,7 +79,6 @@ here.</p>

9079</blockquote>

9180<p>And a following paragraph.</p>

9281<hr />

93−<a id="Code_Blocks"></a>

9482<h1>Code Blocks</h1>

9583<p>Code:</p>

9684<pre><code>---- (should be four hyphens)

@@ -107,9 +95,7 @@ this code block is indented by one tab

10795These should not be escaped: \$ \\ \> \[ \{

10896</code></pre>

10997<hr />

110−<a id="Lists"></a>

11198<h1>Lists</h1>

112−<a id="Unordered"></a>

11399<h2>Unordered</h2>

114100<p>Asterisks tight:</p>

115101<ul>

@@ -156,7 +142,6 @@ These should not be escaped: \$ \\ \> \[ \{

156142<li><p>Minus 3</p>

157143</li>

158144</ul>

159−<a id="Ordered"></a>

160145<h2>Ordered</h2>

161146<p>Tight:</p>

162147<ol>

@@ -198,7 +183,6 @@ These should not be escaped: \$ \\ \> \[ \{

198183<li><p>Item 3.</p>

199184</li>

200185</ol>

201−<a id="Nested"></a>

202186<h2>Nested</h2>

203187<ul>

204188<li>Tab<ul>

@@ -234,7 +218,6 @@ These should not be escaped: \$ \\ \> \[ \{

234218<li><p>Third</p>

235219</li>

236220</ol>

237−<a id="Tabs_and_spaces"></a>

238221<h2>Tabs and spaces</h2>

239222<ul>

240223<li><p>this is a list item indented with tabs</p>

@@ -249,7 +232,6 @@ These should not be escaped: \$ \\ \> \[ \{

249232</li>

250233</ul>

251234<hr />

252−<a id="HTML_Blocks"></a>

253235<h1>HTML Blocks</h1>

254236<p>Simple block on one line:</p>

255237<div>foo</div>

@@ -325,7 +307,6 @@ Blah

325307

326308<hr class="foo" id="bar">

327309<hr />

328−<a id="Inline_Markup"></a>

329310<h1>Inline Markup</h1>

330311<p>This is <em>emphasized</em>, and so <em>is this</em>.</p>

331312<p>This is <strong>strong</strong>, and so <strong>is this</strong>.</p>

@@ -336,7 +317,6 @@ Blah

336317<p>So is <strong><em>this</em></strong> word.</p>

337318<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code><html></code>.</p>

338319<hr />

339−<a id="Smart_quotes,_ellipses,_dashes"></a>

340320<h1>Smart quotes, ellipses, dashes</h1>

341321<p>"Hello," said the spider. "'Shelob' is my name."</p>

342322<p>'A', 'B', and 'C' are letters.</p>

@@ -347,7 +327,6 @@ Blah

347327<p>Dashes between numbers: 5-7, 255-66, 1987-1999.</p>

348328<p>Ellipses...and. . .and . . . .</p>

349329<hr />

350−<a id="LaTeX"></a>

351330<h1>LaTeX</h1>

352331<ul>

353332<li>\cite[22-23]{smith.1899}</li>

@@ -373,7 +352,6 @@ Dog & 2 \\

373352Cat & 1 \\ \hline

374353\end{tabular}</p>

375354<hr />

376−<a id="Special_Characters"></a>

377355<h1>Special Characters</h1>

378356<p>Here is some unicode:</p>

379357<ul>

@@ -405,9 +383,7 @@ Cat & 1 \\ \hline

405383<p>Plus: +</p>

406384<p>Minus: -</p>

407385<hr />

408−<a id="Links"></a>

409386<h1>Links</h1>

410−<a id="Explicit"></a>

411387<h2>Explicit</h2>

412388<p>Just a <a href="/url/">URL</a>.</p>

413389<p><a href="/url/" title="title">URL and title</a>.</p>

@@ -422,7 +398,6 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

422398// -->

423399</script><noscript>Email link (nobody at nowhere dot net)</noscript></p>

424400<p><a href="">Empty</a>.</p>

425−<a id="Reference"></a>

426401<h2>Reference</h2>

427402<p>Foo <a href="/url/">bar</a>.</p>

428403<p>Foo <a href="/url/">bar</a>.</p>

@@ -437,13 +412,11 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

437412</code></pre>

438413<p>Foo <a href="/url/" title="Title with "quotes" inside">bar</a>.</p>

439414<p>Foo <a href="/url/" title="Title with "quote" inside">biz</a>.</p>

440−<a id="With_ampersands"></a>

441415<h2>With ampersands</h2>

442416<p>Here's a <a href="http://example.com/?foo=1&bar=2">link with an ampersand in the URL</a>.</p>

443417<p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&T">AT&T</a>.</p>

444418<p>Here's an <a href="/script?foo=1&bar=2">inline link</a>.</p>

445419<p>Here's an <a href="/script?foo=1&bar=2">inline link in pointy braces</a>.</p>

446−<a id="Autolinks"></a>

447420<h2>Autolinks</h2>

448421<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2">http://example.com/?foo=1&bar=2</a></p>

449422<ul>

@@ -464,13 +437,11 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');

464437<pre><code>or here: <http://example.com/>

465438</code></pre>

466439<hr />

467−<a id="Images"></a>

468440<h1>Images</h1>

469441<p>From "Voyage dans la Lune" by Georges Melies (1902):</p>

470442<p><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune"></p>

471443<p>Here is a movie <img src="movie.jpg" alt="movie"> icon.</p>

472444<hr />

473−<a id="Footnotes"></a>

474445<h1>Footnotes</h1>

475446<p>Here is a footnote reference,<sup class="footnoteRef" id="fnref1"><a href="#fn1">1</a></sup> and another.<sup class="footnoteRef" id="fnref2"><a href="#fn2">2</a></sup> This should <em>not</em> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<sup class="footnoteRef" id="fnref3"><a href="#fn3">3</a></sup></p>

476447<blockquote>

tests/writer.smart.html−29

@@ -12,28 +12,18 @@

1212<h1 class="title">Pandoc Test Suite</h1>

1313<p>This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</p>

1414<hr />

15−<a id="Headers"></a>

1615<h1>Headers</h1>

17−<a id="Level_2_with_an_embedded_link"></a>

1816<h2>Level 2 with an <a href="/url">embedded link</a></h2>

19−<a id="Level_3_with_emphasis"></a>

2017<h3>Level 3 with <em>emphasis</em></h3>

21−<a id="Level_4"></a>

2218<h4>Level 4</h4>

23−<a id="Level_5"></a>

2419<h5>Level 5</h5>

25−<a id="Level_1"></a>

2620<h1>Level 1</h1>

27−<a id="Level_2_with_emphasis"></a>

2821<h2>Level 2 with <em>emphasis</em></h2>

29−<a id="Level_3"></a>

3022<h3>Level 3</h3>

3123<p>with no blank line</p>

32−<a id="Level_2"></a>

3324<h2>Level 2</h2>

3425<p>with no blank line</p>

3526<hr />

36−<a id="Paragraphs"></a>

3727<h1>Paragraphs</h1>

3828<p>Here’s a regular paragraph.</p>

3929<p>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p>

@@ -41,7 +31,6 @@

4131<p>There should be a hard line break<br />

4232here.</p>

4333<hr />

44−<a id="Block_Quotes"></a>

4534<h1>Block Quotes</h1>

4635<p>E-mail style:</p>

4736<blockquote>

@@ -90,7 +79,6 @@ here.</p>

9079</blockquote>

9180<p>And a following paragraph.</p>

9281<hr />

93−<a id="Code_Blocks"></a>

9482<h1>Code Blocks</h1>

9583<p>Code:</p>

9684<pre><code>---- (should be four hyphens)

@@ -107,9 +95,7 @@ this code block is indented by one tab

10795These should not be escaped: \$ \\ \> \[ \{

10896</code></pre>

10997<hr />

110−<a id="Lists"></a>

11198<h1>Lists</h1>

112−<a id="Unordered"></a>

11399<h2>Unordered</h2>

114100<p>Asterisks tight:</p>

115101<ul>

@@ -156,7 +142,6 @@ These should not be escaped: \$ \\ \> \[ \{

156142<li><p>Minus 3</p>

157143</li>

158144</ul>

159−<a id="Ordered"></a>

160145<h2>Ordered</h2>

161146<p>Tight:</p>

162147<ol>

@@ -198,7 +183,6 @@ These should not be escaped: \$ \\ \> \[ \{

198183<li><p>Item 3.</p>

199184</li>

200185</ol>

201−<a id="Nested"></a>

202186<h2>Nested</h2>

203187<ul>

204188<li>Tab<ul>

@@ -234,7 +218,6 @@ These should not be escaped: \$ \\ \> \[ \{

234218<li><p>Third</p>

235219</li>

236220</ol>

237−<a id="Tabs_and_spaces"></a>

238221<h2>Tabs and spaces</h2>

239222<ul>

240223<li><p>this is a list item indented with tabs</p>

@@ -249,7 +232,6 @@ These should not be escaped: \$ \\ \> \[ \{

249232</li>

250233</ul>

251234<hr />

252−<a id="HTML_Blocks"></a>

253235<h1>HTML Blocks</h1>

254236<p>Simple block on one line:</p>

255237<div>foo</div>

@@ -325,7 +307,6 @@ Blah

325307

326308<hr class="foo" id="bar">

327309<hr />

328−<a id="Inline_Markup"></a>

329310<h1>Inline Markup</h1>

330311<p>This is <em>emphasized</em>, and so <em>is this</em>.</p>

331312<p>This is <strong>strong</strong>, and so <strong>is this</strong>.</p>

@@ -336,7 +317,6 @@ Blah

336317<p>So is <strong><em>this</em></strong> word.</p>

337318<p>This is code: <code>></code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code><html></code>.</p>

338319<hr />

339−<a id="Smart_quotes,_ellipses,_dashes"></a>

340320<h1>Smart quotes, ellipses, dashes</h1>

341321<p>“Hello,” said the spider. “‘Shelob’ is my name.”</p>

342322<p>‘A’, ‘B’, and ‘C’ are letters.</p>

@@ -347,7 +327,6 @@ Blah

347327<p>Dashes between numbers: 5–7, 255–66, 1987–1999.</p>

348328<p>Ellipses…and…and … .</p>

349329<hr />

350−<a id="LaTeX"></a>

351330<h1>LaTeX</h1>

352331<ul>

353332<li>\cite[22-23]{smith.1899}</li>

@@ -373,7 +352,6 @@ Dog & 2 \\

373352Cat & 1 \\ \hline

374353\end{tabular}</p>

375354<hr />

376−<a id="Special_Characters"></a>

377355<h1>Special Characters</h1>

378356<p>Here is some unicode:</p>

379357<ul>

@@ -405,9 +383,7 @@ Cat & 1 \\ \hline

405383<p>Plus: +</p>

406384<p>Minus: -</p>

407385<hr />

408−<a id="Links"></a>

409386<h1>Links</h1>

410−<a id="Explicit"></a>

411387<h2>Explicit</h2>

412388<p>Just a <a href="/url/">URL</a>.</p>

413389<p><a href="/url/" title="title">URL and title</a>.</p>

@@ -422,7 +398,6 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

422398// -->

423399</script><noscript>Email link (nobody at nowhere dot net)</noscript></p>

424400<p><a href="">Empty</a>.</p>

425−<a id="Reference"></a>

426401<h2>Reference</h2>

427402<p>Foo <a href="/url/">bar</a>.</p>

428403<p>Foo <a href="/url/">bar</a>.</p>

@@ -437,13 +412,11 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>')

437412</code></pre>

438413<p>Foo <a href="/url/" title="Title with "quotes" inside">bar</a>.</p>

439414<p>Foo <a href="/url/" title="Title with "quote" inside">biz</a>.</p>

440−<a id="With_ampersands"></a>

441415<h2>With ampersands</h2>

442416<p>Here’s a <a href="http://example.com/?foo=1&bar=2">link with an ampersand in the URL</a>.</p>

443417<p>Here’s a link with an amersand in the link text: <a href="http://att.com/" title="AT&T">AT&T</a>.</p>

444418<p>Here’s an <a href="/script?foo=1&bar=2">inline link</a>.</p>

445419<p>Here’s an <a href="/script?foo=1&bar=2">inline link in pointy braces</a>.</p>

446−<a id="Autolinks"></a>

447420<h2>Autolinks</h2>

448421<p>With an ampersand: <a href="http://example.com/?foo=1&bar=2">http://example.com/?foo=1&bar=2</a></p>

449422<ul>

@@ -464,13 +437,11 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');

464437<pre><code>or here: <http://example.com/>

465438</code></pre>

466439<hr />

467−<a id="Images"></a>

468440<h1>Images</h1>

469441<p>From “Voyage dans la Lune” by Georges Melies (1902):</p>

470442<p><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune"></p>

471443<p>Here is a movie <img src="movie.jpg" alt="movie"> icon.</p>

472444<hr />

473−<a id="Footnotes"></a>

474445<h1>Footnotes</h1>

476447<blockquote>