From 3adacdb04e515618d46e677fa7510e240b1b506f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 15 Jul 2010 23:00:58 -0700 Subject: [PATCH] Updated pandoc to use css for highlighting-kate 0.2.7. Note: Update any custom CSS or templates accordingly. --- pandoc.cabal | 2 +- templates/html.template | 36 ++++----- templates/slidy.template | 36 ++++----- tests/lhs-test.fragment.html+lhs | 86 ++++++++++----------- tests/lhs-test.html | 117 ++++++++++++++--------------- tests/lhs-test.html+lhs | 123 ++++++++++++++----------------- 6 files changed, 184 insertions(+), 216 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index 582f95351..c64fc1e50 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -155,7 +155,7 @@ Library else Build-depends: base >= 3 && < 4 if flag(highlighting) - Build-depends: highlighting-kate >= 0.2.3 + Build-depends: highlighting-kate >= 0.2.7 cpp-options: -D_HIGHLIGHTING if flag(citeproc) Build-depends: citeproc-hs diff --git a/templates/html.template b/templates/html.template index c53bbf6d7..da4a1b23e 100644 --- a/templates/html.template +++ b/templates/html.template @@ -12,24 +12,24 @@ $if(date)$ $endif$ $if(highlighting)$ $endif$ $for(css)$ diff --git a/templates/slidy.template b/templates/slidy.template index 9278282dc..a7b2327bb 100644 --- a/templates/slidy.template +++ b/templates/slidy.template @@ -14,24 +14,24 @@ $if(date)$ $endif$ $if(highlighting)$ $endif$ $for(css)$ diff --git a/tests/lhs-test.fragment.html+lhs b/tests/lhs-test.fragment.html+lhs index fec6bb750..5ebfcacbf 100644 --- a/tests/lhs-test.fragment.html+lhs +++ b/tests/lhs-test.fragment.html+lhs @@ -1,51 +1,39 @@ -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry       
>           -- arr (\op (x,y) -> x `op` y)

(***) 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).

f *** g = first f >>> second g
+
lhs test
unsplit is an arrow that takes a pair of values and combines them to return a single value:
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry       
>           -- arr (\op (x,y) -> x `op` y) 
(***) 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).
f *** g = first f >>> second g
 
Block quote:
foo bar

Block quote:

foo bar

diff --git a/tests/lhs-test.html b/tests/lhs-test.html index 5f015db0f..8370c0594 100644 --- a/tests/lhs-test.html +++ b/tests/lhs-test.html @@ -4,73 +4,66 @@ - -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
unsplit = arr . uncurry       
          -- arr (\op (x,y) -> x `op` y)

(***) 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).

f *** g = first f >>> second g
+
lhs test
unsplit is an arrow that takes a pair of values and combines them to return a single value:
unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
unsplit = arr . uncurry       
          -- arr (\op (x,y) -> x `op` y) 
(***) 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).
f *** g = first f >>> second g
 
Block quote:
foo bar

Block quote:

foo bar

diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs index 210054bf6..3df53e1aa 100644 --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -4,79 +4,66 @@ - -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry       
>           -- arr (\op (x,y) -> x `op` y)

(***) 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).

f *** g = first f >>> second g
+
lhs test
unsplit is an arrow that takes a pair of values and combines them to return a single value:
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry       
>           -- arr (\op (x,y) -> x `op` y) 
(***) 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).
f *** g = first f >>> second g
 
Block quote:
foo bar

Block quote:

foo bar