From 70b4ec95e4d1a565d32c074637bc3e3d203ce729 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 27 Dec 2011 18:08:06 -0800 Subject: Updated tests. --- tests/lhs-test.html | 44 +++++++++++++++++++++----------------------- tests/lhs-test.html+lhs | 44 +++++++++++++++++++++----------------------- tests/lhs-test.latex | 32 +++++++++++++++++++++++++++----- tests/writer.html | 33 +++++++++++---------------------- 4 files changed, 80 insertions(+), 73 deletions(-) diff --git a/tests/lhs-test.html b/tests/lhs-test.html index 268dd9b27..b8f254fed 100644 --- a/tests/lhs-test.html +++ b/tests/lhs-test.html @@ -5,35 +5,33 @@ - +code > span.kw { color: #007020; font-weight: bold; } +code > span.dt { color: #902000; } +code > span.dv { color: #40a070; } +code > span.bn { color: #40a070; } +code > span.fl { color: #40a070; } +code > span.ch { color: #4070a0; } +code > span.st { color: #4070a0; } +code > span.co { color: #60a0b0; font-style: italic; } +code > span.ot { color: #007020; } +code > span.al { color: #ff0000; font-weight: bold; } +code > span.fu { color: #06287e; } +code > span.er { color: #ff0000; font-weight: bold; } +

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)
+
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
-
+
f *** g = first f >>> second g

Block quote:

foo bar

diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs index b9413f07a..f0b0f3e15 100644 --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -5,35 +5,33 @@ - +code > span.kw { color: #007020; font-weight: bold; } +code > span.dt { color: #902000; } +code > span.dv { color: #40a070; } +code > span.bn { color: #40a070; } +code > span.fl { color: #40a070; } +code > span.ch { color: #4070a0; } +code > span.st { color: #4070a0; } +code > span.co { color: #60a0b0; font-style: italic; } +code > span.ot { color: #007020; } +code > span.al { color: #ff0000; font-weight: bold; } +code > span.fu { color: #06287e; } +code > span.er { color: #ff0000; font-weight: bold; } +

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)
+
> 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
-
+
f *** g = first f >>> second g

Block quote:

foo bar

diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index 307fd948f..34b608c6a 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -12,6 +12,26 @@ \usepackage[utf8]{inputenc} \fi \fi +\usepackage{color} +\usepackage{fancyvrb} +\DefineShortVerb[commandchars=\\\{\}]{\|} +\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}} +% Add ',fontsize=\small' for more characters per line +\newenvironment{Shaded}{}{} +\newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{{#1}}}} +\newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{{#1}}} +\newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}} +\newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}} +\newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}} +\newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}} +\newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}} +\newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{{#1}}}} +\newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{{#1}}} +\newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}} +\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{{#1}}} +\newcommand{\RegionMarkerTok}[1]{{#1}} +\newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}} +\newcommand{\NormalTok}[1]{{#1}} \ifxetex \usepackage[setpagesize=false, % page size defined by xetex unicode=false, % unicode breaks when used with xetex @@ -33,11 +53,13 @@ \texttt{unsplit} is an arrow that takes a pair of values and combines them to return a single value: -\begin{verbatim} -unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d -unsplit = arr . uncurry - -- arr (\op (x,y) -> x `op` y) -\end{verbatim} +\begin{Shaded} +\begin{Highlighting}[] +\OtherTok{unsplit ::} \NormalTok{(}\DataTypeTok{Arrow} \NormalTok{a) }\OtherTok{=>} \NormalTok{(b }\OtherTok{->} \NormalTok{c }\OtherTok{->} \NormalTok{d) }\OtherTok{->} \NormalTok{a (b, c) d} +\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \FunctionTok{uncurry} + \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y) } +\end{Highlighting} +\end{Shaded} \texttt{(***)} 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). diff --git a/tests/writer.html b/tests/writer.html index f38ad5079..0aaa6a1b3 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -45,8 +45,7 @@

Code in a block quote:

sub status {
     print "working";
-}
-
+}

A list:

  1. item one
    2. @@ -71,13 +70,11 @@ sub status { print "working"; } -this code block is indented by one tab - +this code block is indented by one tab

    And:

        this code block is indented by two tabs
 
-These should not be escaped:  \$ \\ \> \[ \{
-
    +These should not be escaped: \$ \\ \> \[ \{

    Lists

    Unordered

    @@ -274,8 +271,7 @@ These should not be escaped: \$ \\ \> \[ \{
    orange

    orange fruit

    -
    { orange code block }
-
    +
    { orange code block }

    orange block quote

    @@ -358,11 +354,9 @@ foo

    This should be a code block, though:

    <div>
     foo
-</div>
-
    +</div>

    As should this:

    -
    <div>foo</div>
-
    +
    <div>foo</div>

    Now, nested:

    @@ -387,14 +381,12 @@ Blah -->

    Code block:

    -
    <!-- Comment -->
-
    +
    <!-- Comment -->

    Just plain comment, with trailing spaces on the line:

    Code:

    -
    <hr />
-
    +
    <hr />

    Hr’s:

    @@ -517,8 +509,7 @@ document.write(''+'Email link'+'<\/'+'a'+'>')

    Indented twice.

    Indented thrice.

    This should [not][] be a link.

    -
    [not]: /url
-
    +
    [not]: /url

    Foo bar.

    Foo biz.

    With ampersands

    @@ -543,8 +534,7 @@ document.write(''+''+e+''+'<\/'+

    Blockquoted: http://example.com/

Auto-links should not occur here: <http://example.com/>

-
or here: <http://example.com/>
-
+
or here: <http://example.com/>

Images

From “Voyage dans la Lune” by Georges Melies (1902):

@@ -568,8 +558,7 @@ document.write(''+''+e+''+'<\/'+

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

  • 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> }
-
    +
      { <code> }

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

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

  • In quote. ↩

    • -- cgit v1.2.3