git.iko.soy/typeable/pandoc
on master help sign in
Updated pandoc to use css for highlighting-kate 0.2.7.

Note: Update any custom CSS or templates accordingly.

commit3adacdb04e515618d46e677fa7510e240b1b506f authorJohn MacFarlane <jgm@berkeley.edu> dateThu 15 Jul 2010, 23:00 (16 years ago) parent9be9bcc
6 files changed+184−216
compare with master
unifiedsplit
pandoc.cabal+1−1 templates/html.template+18−18 templates/slidy.template+18−18 tests/lhs-test.fragment.html+lhs+37−49 tests/lhs-test.html+55−62 tests/lhs-test.html+lhs+55−68
pandoc.cabal+1−1
@@ -155,7 +155,7 @@ Library
155155 else
156156 Build-depends: base >= 3 && < 4
157157 if flag(highlighting)
158− Build-depends: highlighting-kate >= 0.2.3
158+ Build-depends: highlighting-kate >= 0.2.7
159159 cpp-options: -D_HIGHLIGHTING
160160 if flag(citeproc)
161161 Build-depends: citeproc-hs
templates/html.template+18−18
@@ -12,24 +12,24 @@ $if(date)$
1212$endif$
1313$if(highlighting)$
1414 <style type="text/css">
15− table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
16− td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }
17− td.sourceCode { padding-left: 5px; }
18− pre.sourceCode { }
19− pre.sourceCode span.Normal { }
20− pre.sourceCode span.Keyword { color: #007020; font-weight: bold; }
21− pre.sourceCode span.DataType { color: #902000; }
22− pre.sourceCode span.DecVal { color: #40a070; }
23− pre.sourceCode span.BaseN { color: #40a070; }
24− pre.sourceCode span.Float { color: #40a070; }
25− pre.sourceCode span.Char { color: #4070a0; }
26− pre.sourceCode span.String { color: #4070a0; }
27− pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; }
28− pre.sourceCode span.Others { color: #007020; }
29− pre.sourceCode span.Alert { color: red; font-weight: bold; }
30− pre.sourceCode span.Function { color: #06287e; }
31− pre.sourceCode span.RegionMarker { }
32− pre.sourceCode span.Error { color: red; font-weight: bold; }
15+table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre
16+ { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
17+td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }
18+td.sourceCode { padding-left: 5px; }
19+pre.sourceCode { }
20+pre.sourceCode span.kw { font-weight: bold; }
21+pre.sourceCode span.dt { color: #800000; }
22+pre.sourceCode span.dv { color: #0000FF; }
23+pre.sourceCode span.bn { color: #0000FF; }
24+pre.sourceCode span.fl { color: #800080; }
25+pre.sourceCode span.ch { color: #FF00FF; }
26+pre.sourceCode span.st { color: #DD0000; }
27+pre.sourceCode span.co { color: #808080; font-style: italic; }
28+pre.sourceCode span.ot { }
29+pre.sourceCode span.al { color: green; font-weight: bold; }
30+pre.sourceCode span.fu { color: #000080; }
31+pre.sourceCode span.re { }
32+pre.sourceCode span.er { color: red; font-weight: bold; }
3333 </style>
3434$endif$
3535$for(css)$
templates/slidy.template+18−18
@@ -14,24 +14,24 @@ $if(date)$
1414$endif$
1515$if(highlighting)$
1616 <style type="text/css">
17− table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
18− td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }
19− td.sourceCode { padding-left: 5px; }
20− pre.sourceCode { }
21− pre.sourceCode span.Normal { }
22− pre.sourceCode span.Keyword { color: #007020; font-weight: bold; }
23− pre.sourceCode span.DataType { color: #902000; }
24− pre.sourceCode span.DecVal { color: #40a070; }
25− pre.sourceCode span.BaseN { color: #40a070; }
26− pre.sourceCode span.Float { color: #40a070; }
27− pre.sourceCode span.Char { color: #4070a0; }
28− pre.sourceCode span.String { color: #4070a0; }
29− pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; }
30− pre.sourceCode span.Others { color: #007020; }
31− pre.sourceCode span.Alert { color: red; font-weight: bold; }
32− pre.sourceCode span.Function { color: #06287e; }
33− pre.sourceCode span.RegionMarker { }
34− pre.sourceCode span.Error { color: red; font-weight: bold; }
17+table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre
18+ { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
19+td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }
20+td.sourceCode { padding-left: 5px; }
21+pre.sourceCode { }
22+pre.sourceCode span.kw { font-weight: bold; }
23+pre.sourceCode span.dt { color: #800000; }
24+pre.sourceCode span.dv { color: #0000FF; }
25+pre.sourceCode span.bn { color: #0000FF; }
26+pre.sourceCode span.fl { color: #800080; }
27+pre.sourceCode span.ch { color: #FF00FF; }
28+pre.sourceCode span.st { color: #DD0000; }
29+pre.sourceCode span.co { color: #808080; font-style: italic; }
30+pre.sourceCode span.ot { }
31+pre.sourceCode span.al { color: green; font-weight: bold; }
32+pre.sourceCode span.fu { color: #000080; }
33+pre.sourceCode span.re { }
34+pre.sourceCode span.er { color: red; font-weight: bold; }
3535 </style>
3636$endif$
3737$for(css)$
tests/lhs-test.fragment.html+lhs+37−49
@@ -1,51 +1,39 @@
1−<div id="lhs-test"
2−><h1
3− >lhs test</h1
4− ><p
5− ><code
6− >unsplit</code
7− > is an arrow that takes a pair of values and combines them to return a single value:</p
8− ><pre class="sourceCode haskell"
9− ><code
10− ><span class="Special"
11− >&gt; </span
12− ><span class="Function FunctionDefinition"
13− >unsplit ::</span
14− ><span class="Normal NormalText"
15− > (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d</span
16− ><br
17− /><span class="Special"
18− >&gt; </span
19− ><span class="Normal NormalText"
20− >unsplit = arr . </span
21− ><span class="Function"
22− >uncurry</span
23− ><span class="Normal NormalText"
24− > </span
25− ><br
26− /><span class="Special"
27− >&gt; </span
28− ><span class="Normal NormalText"
29− > </span
30− ><span class="Comment"
31− >-- arr (\op (x,y) -&gt; x `op` y) </span
32− ><br
33− /></code
34− ></pre
35− ><p
36− ><code
37− >(***)</code
38− > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
39− ><pre
40− ><code
41− >f *** g = first f &gt;&gt;&gt; second g
1+<h1 id="lhs-test"
2+>lhs test</h1
3+><p
4+><code
5+ >unsplit</code
6+ > is an arrow that takes a pair of values and combines them to return a single value:</p
7+><pre class="sourceCode haskell"
8+><code
9+ >&gt; unsplit :: (<span class="dt"
10+ >Arrow</span
11+ > a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d<br
12+ />&gt; unsplit <span class="fu"
13+ >=</span
14+ > arr <span class="fu"
15+ >.</span
16+ > <span class="fu"
17+ >uncurry</span
18+ > <br
19+ />&gt; <span class="co"
20+ >-- arr (\op (x,y) -&gt; x `op` y) </span
21+ ><br
22+ /></code
23+ ></pre
24+><p
25+><code
26+ >(***)</code
27+ > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
28+><pre
29+><code
30+ >f *** g = first f &gt;&gt;&gt; second g
4231</code
43− ></pre
44− ><p
45− >Block quote:</p
46− ><blockquote
47− ><p
48− >foo bar</p
49− ></blockquote
50− ></div
32+ ></pre
33+><p
34+>Block quote:</p
35+><blockquote
36+><p
37+ >foo bar</p
38+ ></blockquote
5139>
tests/lhs-test.html+55−62
@@ -4,73 +4,66 @@
44 <title></title>
55 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66 <meta name="generator" content="pandoc" />
7− <meta name="date" content="" />
87 <style type="text/css">
9− table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
10− td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }
11− td.sourceCode { padding-left: 5px; }
12− pre.sourceCode { }
13− pre.sourceCode span.Normal { }
14− pre.sourceCode span.Keyword { color: #007020; font-weight: bold; }
15− pre.sourceCode span.DataType { color: #902000; }
16− pre.sourceCode span.DecVal { color: #40a070; }
17− pre.sourceCode span.BaseN { color: #40a070; }
18− pre.sourceCode span.Float { color: #40a070; }
19− pre.sourceCode span.Char { color: #4070a0; }
20− pre.sourceCode span.String { color: #4070a0; }
21− pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; }
22− pre.sourceCode span.Others { color: #007020; }
23− pre.sourceCode span.Alert { color: red; font-weight: bold; }
24− pre.sourceCode span.Function { color: #06287e; }
25− pre.sourceCode span.RegionMarker { }
26− pre.sourceCode span.Error { color: red; font-weight: bold; }
8+table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre
9+ { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
10+td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }
11+td.sourceCode { padding-left: 5px; }
12+pre.sourceCode { }
13+pre.sourceCode span.kw { font-weight: bold; }
14+pre.sourceCode span.dt { color: #800000; }
15+pre.sourceCode span.dv { color: #0000FF; }
16+pre.sourceCode span.bn { color: #0000FF; }
17+pre.sourceCode span.fl { color: #800080; }
18+pre.sourceCode span.ch { color: #FF00FF; }
19+pre.sourceCode span.st { color: #DD0000; }
20+pre.sourceCode span.co { color: #808080; font-style: italic; }
21+pre.sourceCode span.ot { }
22+pre.sourceCode span.al { color: green; font-weight: bold; }
23+pre.sourceCode span.fu { color: #000080; }
24+pre.sourceCode span.re { }
25+pre.sourceCode span.er { color: red; font-weight: bold; }
2726 </style>
2827</head>
2928<body>
30−<div id="lhs-test"
31−><h1
32− >lhs test</h1
33− ><p
34− ><code
35− >unsplit</code
36− > is an arrow that takes a pair of values and combines them to return a single value:</p
37− ><pre class="sourceCode haskell"
38− ><code
39− ><span class="Function FunctionDefinition"
40− >unsplit ::</span
41− ><span class="Normal NormalText"
42− > (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d</span
43− ><br
44− /><span class="Normal NormalText"
45− >unsplit = arr . </span
46− ><span class="Function"
47− >uncurry</span
48− ><span class="Normal NormalText"
49− > </span
50− ><br
51− /><span class="Normal NormalText"
52− > </span
53− ><span class="Comment"
54− >-- arr (\op (x,y) -&gt; x `op` y) </span
55− ><br
56− /></code
57− ></pre
58− ><p
59− ><code
60− >(***)</code
61− > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
62− ><pre
63− ><code
64− >f *** g = first f &gt;&gt;&gt; second g
29+<h1 id="lhs-test"
30+>lhs test</h1
31+><p
32+><code
33+ >unsplit</code
34+ > is an arrow that takes a pair of values and combines them to return a single value:</p
35+><pre class="sourceCode haskell"
36+><code
37+ >unsplit :: (<span class="dt"
38+ >Arrow</span
39+ > a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d<br
40+ />unsplit <span class="fu"
41+ >=</span
42+ > arr <span class="fu"
43+ >.</span
44+ > <span class="fu"
45+ >uncurry</span
46+ > <br
47+ /> <span class="co"
48+ >-- arr (\op (x,y) -&gt; x `op` y) </span
49+ ><br
50+ /></code
51+ ></pre
52+><p
53+><code
54+ >(***)</code
55+ > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
56+><pre
57+><code
58+ >f *** g = first f &gt;&gt;&gt; second g
6559</code
66− ></pre
67− ><p
68− >Block quote:</p
69− ><blockquote
70− ><p
71− >foo bar</p
72− ></blockquote
73− ></div
60+ ></pre
61+><p
62+>Block quote:</p
63+><blockquote
64+><p
65+ >foo bar</p
66+ ></blockquote
7467>
7568</body>
7669</html>
tests/lhs-test.html+lhs+55−68
@@ -4,79 +4,66 @@
44 <title></title>
55 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66 <meta name="generator" content="pandoc" />
7− <meta name="date" content="" />
87 <style type="text/css">
9− table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
10− td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }
11− td.sourceCode { padding-left: 5px; }
12− pre.sourceCode { }
13− pre.sourceCode span.Normal { }
14− pre.sourceCode span.Keyword { color: #007020; font-weight: bold; }
15− pre.sourceCode span.DataType { color: #902000; }
16− pre.sourceCode span.DecVal { color: #40a070; }
17− pre.sourceCode span.BaseN { color: #40a070; }
18− pre.sourceCode span.Float { color: #40a070; }
19− pre.sourceCode span.Char { color: #4070a0; }
20− pre.sourceCode span.String { color: #4070a0; }
21− pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; }
22− pre.sourceCode span.Others { color: #007020; }
23− pre.sourceCode span.Alert { color: red; font-weight: bold; }
24− pre.sourceCode span.Function { color: #06287e; }
25− pre.sourceCode span.RegionMarker { }
26− pre.sourceCode span.Error { color: red; font-weight: bold; }
8+table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre
9+ { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
10+td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }
11+td.sourceCode { padding-left: 5px; }
12+pre.sourceCode { }
13+pre.sourceCode span.kw { font-weight: bold; }
14+pre.sourceCode span.dt { color: #800000; }
15+pre.sourceCode span.dv { color: #0000FF; }
16+pre.sourceCode span.bn { color: #0000FF; }
17+pre.sourceCode span.fl { color: #800080; }
18+pre.sourceCode span.ch { color: #FF00FF; }
19+pre.sourceCode span.st { color: #DD0000; }
20+pre.sourceCode span.co { color: #808080; font-style: italic; }
21+pre.sourceCode span.ot { }
22+pre.sourceCode span.al { color: green; font-weight: bold; }
23+pre.sourceCode span.fu { color: #000080; }
24+pre.sourceCode span.re { }
25+pre.sourceCode span.er { color: red; font-weight: bold; }
2726 </style>
2827</head>
2928<body>
30−<div id="lhs-test"
31−><h1
32− >lhs test</h1
33− ><p
34− ><code
35− >unsplit</code
36− > is an arrow that takes a pair of values and combines them to return a single value:</p
37− ><pre class="sourceCode haskell"
38− ><code
39− ><span class="Special"
40− >&gt; </span
41− ><span class="Function FunctionDefinition"
42− >unsplit ::</span
43− ><span class="Normal NormalText"
44− > (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d</span
45− ><br
46− /><span class="Special"
47− >&gt; </span
48− ><span class="Normal NormalText"
49− >unsplit = arr . </span
50− ><span class="Function"
51− >uncurry</span
52− ><span class="Normal NormalText"
53− > </span
54− ><br
55− /><span class="Special"
56− >&gt; </span
57− ><span class="Normal NormalText"
58− > </span
59− ><span class="Comment"
60− >-- arr (\op (x,y) -&gt; x `op` y) </span
61− ><br
62− /></code
63− ></pre
64− ><p
65− ><code
66− >(***)</code
67− > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
68− ><pre
69− ><code
70− >f *** g = first f &gt;&gt;&gt; second g
29+<h1 id="lhs-test"
30+>lhs test</h1
31+><p
32+><code
33+ >unsplit</code
34+ > is an arrow that takes a pair of values and combines them to return a single value:</p
35+><pre class="sourceCode haskell"
36+><code
37+ >&gt; unsplit :: (<span class="dt"
38+ >Arrow</span
39+ > a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d<br
40+ />&gt; unsplit <span class="fu"
41+ >=</span
42+ > arr <span class="fu"
43+ >.</span
44+ > <span class="fu"
45+ >uncurry</span
46+ > <br
47+ />&gt; <span class="co"
48+ >-- arr (\op (x,y) -&gt; x `op` y) </span
49+ ><br
50+ /></code
51+ ></pre
52+><p
53+><code
54+ >(***)</code
55+ > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
56+><pre
57+><code
58+ >f *** g = first f &gt;&gt;&gt; second g
7159</code
72− ></pre
73− ><p
74− >Block quote:</p
75− ><blockquote
76− ><p
77− >foo bar</p
78− ></blockquote
79− ></div
60+ ></pre
61+><p
62+>Block quote:</p
63+><blockquote
64+><p
65+ >foo bar</p
66+ ></blockquote
8067>
8168</body>
8269</html>