From 3e61333af0f5ac1cdb045bdab0293f03e2e1e39e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 1 Jan 2011 22:46:30 -0800 Subject: Fixed regression in markdown reader. '(_hi_)' was being parsed with literal underscores (no emphasis). The fix: the 'str' parser now only parses alphanumerics and embedded underscores. All other symbols are handled by the 'symbol' parser. This has a slight effect on the AST, since you'll get [Str "hi",Str ":"] insntead of [Str "hi:"]. But there should not be a visible effect in any of the writers. Thanks to gwern for pointing out the regression. --- tests/writer.native | 194 ++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 97 deletions(-) (limited to 'tests/writer.native') diff --git a/tests/writer.native b/tests/writer.native index ced38537c..4258bce0a 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -1,4 +1,4 @@ -Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]}) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17",Str ",",Space,Str "2006"]}) [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."] , HorizontalRule , Header 1 [Str "Headers"] @@ -20,89 +20,89 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here",Str "."] , HorizontalRule , Header 1 [Str "Block",Space,Str "Quotes"] -, Para [Str "E",Str "-",Str "mail",Space,Str "style:"] +, Para [Str "E",Str "-",Str "mail",Space,Str "style",Str ":"] , BlockQuote [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote",Str ".",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short",Str "."] ] , BlockQuote - [ Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"] + [ Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote",Str ":"] , CodeBlock ("",[],[]) "sub status {\n print \"working\";\n}" - , Para [Str "A",Space,Str "list:"] + , Para [Str "A",Space,Str "list",Str ":"] , OrderedList (1,Decimal,Period) [ [ Plain [Str "item",Space,Str "one"] ] , [ Plain [Str "item",Space,Str "two"] ] ] - , Para [Str "Nested",Space,Str "block",Space,Str "quotes:"] + , Para [Str "Nested",Space,Str "block",Space,Str "quotes",Str ":"] , BlockQuote [ Para [Str "nested"] ] , BlockQuote [ Para [Str "nested"] ] ] -, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1",Str "."] +, Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote",Str ":",Space,Str "2",Space,Str ">",Space,Str "1",Str "."] , Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph",Str "."] , HorizontalRule , Header 1 [Str "Code",Space,Str "Blocks"] -, Para [Str "Code:"] +, Para [Str "Code",Str ":"] , CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" -, Para [Str "And:"] +, Para [Str "And",Str ":"] , CodeBlock ("",[],[]) " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" , HorizontalRule , Header 1 [Str "Lists"] , Header 2 [Str "Unordered"] -, Para [Str "Asterisks",Space,Str "tight:"] +, Para [Str "Asterisks",Space,Str "tight",Str ":"] , BulletList [ [ Plain [Str "asterisk",Space,Str "1"] ] , [ Plain [Str "asterisk",Space,Str "2"] ] , [ Plain [Str "asterisk",Space,Str "3"] ] ] -, Para [Str "Asterisks",Space,Str "loose:"] +, Para [Str "Asterisks",Space,Str "loose",Str ":"] , BulletList [ [ Para [Str "asterisk",Space,Str "1"] ] , [ Para [Str "asterisk",Space,Str "2"] ] , [ Para [Str "asterisk",Space,Str "3"] ] ] -, Para [Str "Pluses",Space,Str "tight:"] +, Para [Str "Pluses",Space,Str "tight",Str ":"] , BulletList [ [ Plain [Str "Plus",Space,Str "1"] ] , [ Plain [Str "Plus",Space,Str "2"] ] , [ Plain [Str "Plus",Space,Str "3"] ] ] -, Para [Str "Pluses",Space,Str "loose:"] +, Para [Str "Pluses",Space,Str "loose",Str ":"] , BulletList [ [ Para [Str "Plus",Space,Str "1"] ] , [ Para [Str "Plus",Space,Str "2"] ] , [ Para [Str "Plus",Space,Str "3"] ] ] -, Para [Str "Minuses",Space,Str "tight:"] +, Para [Str "Minuses",Space,Str "tight",Str ":"] , BulletList [ [ Plain [Str "Minus",Space,Str "1"] ] , [ Plain [Str "Minus",Space,Str "2"] ] , [ Plain [Str "Minus",Space,Str "3"] ] ] -, Para [Str "Minuses",Space,Str "loose:"] +, Para [Str "Minuses",Space,Str "loose",Str ":"] , BulletList [ [ Para [Str "Minus",Space,Str "1"] ] , [ Para [Str "Minus",Space,Str "2"] ] , [ Para [Str "Minus",Space,Str "3"] ] ] , Header 2 [Str "Ordered"] -, Para [Str "Tight:"] +, Para [Str "Tight",Str ":"] , OrderedList (1,Decimal,Period) [ [ Plain [Str "First"] ] , [ Plain [Str "Second"] ] , [ Plain [Str "Third"] ] ] -, Para [Str "and:"] +, Para [Str "and",Str ":"] , OrderedList (1,Decimal,Period) [ [ Plain [Str "One"] ] , [ Plain [Str "Two"] ] , [ Plain [Str "Three"] ] ] -, Para [Str "Loose",Space,Str "using",Space,Str "tabs:"] +, Para [Str "Loose",Space,Str "using",Space,Str "tabs",Str ":"] , OrderedList (1,Decimal,Period) [ [ Para [Str "First"] ] , [ Para [Str "Second"] ] , [ Para [Str "Third"] ] ] -, Para [Str "and",Space,Str "using",Space,Str "spaces:"] +, Para [Str "and",Space,Str "using",Space,Str "spaces",Str ":"] , OrderedList (1,Decimal,Period) [ [ Para [Str "One"] ] , [ Para [Str "Two"] ] , [ Para [Str "Three"] ] ] -, Para [Str "Multiple",Space,Str "paragraphs:"] +, Para [Str "Multiple",Space,Str "paragraphs",Str ":"] , OrderedList (1,Decimal,Period) - [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one",Str "."] + [ [ Para [Str "Item",Space,Str "1",Str ",",Space,Str "graf",Space,Str "one",Str "."] , Para [Str "Item",Space,Str "1",Str ".",Space,Str "graf",Space,Str "two",Str ".",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog",Apostrophe,Str "s",Space,Str "back",Str "."] ], [ Para [Str "Item",Space,Str "2",Str "."] ] , [ Para [Str "Item",Space,Str "3",Str "."] ] ] , Header 2 [Str "Nested"] @@ -113,18 +113,18 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , BulletList [ [ Plain [Str "Tab"] ] ] ] ] ] ] -, Para [Str "Here",Apostrophe,Str "s",Space,Str "another:"] +, Para [Str "Here",Apostrophe,Str "s",Space,Str "another",Str ":"] , OrderedList (1,Decimal,Period) [ [ Plain [Str "First"] ] - , [ Plain [Str "Second:"] + , [ Plain [Str "Second",Str ":"] , BulletList [ [ Plain [Str "Fee"] ] , [ Plain [Str "Fie"] ] , [ Plain [Str "Foe"] ] ] ], [ Plain [Str "Third"] ] ] -, Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"] +, Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs",Str ":"] , OrderedList (1,Decimal,Period) [ [ Para [Str "First"] ] - , [ Para [Str "Second:"] + , [ Para [Str "Second",Str ":"] , BulletList [ [ Plain [Str "Fee"] ] , [ Plain [Str "Fie"] ] @@ -142,12 +142,12 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , [ Para [Str "and",Space,Str "now",Space,Str "3"] , Para [Str "with",Space,Str "a",Space,Str "continuation"] , OrderedList (4,LowerRoman,Period) - [ [ Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"] ] + [ [ Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals",Str ",",Space,Str "starting",Space,Str "with",Space,Str "4"] ] , [ Plain [Str "more",Space,Str "items"] , OrderedList (1,UpperAlpha,TwoParens) [ [ Plain [Str "a",Space,Str "subsublist"] ] , [ Plain [Str "a",Space,Str "subsublist"] ] ] ] ] ] ] -, Para [Str "Nesting:"] +, Para [Str "Nesting",Str ":"] , OrderedList (1,UpperAlpha,Period) [ [ Plain [Str "Upper",Space,Str "Alpha"] , OrderedList (1,UpperRoman,Period) @@ -157,19 +157,19 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , OrderedList (3,LowerAlpha,OneParen) [ [ Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"] ] ] ] ] ] ] ] ] -, Para [Str "Autonumbering:"] +, Para [Str "Autonumbering",Str ":"] , OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "Autonumber",Str "."] ] , [ Plain [Str "More",Str "."] , OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "Nested",Str "."] ] ] ] ] -, Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"] +, Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item",Str ":"] , Para [Str "M.A.\160",Str "2007"] , Para [Str "B",Str ".",Space,Str "Williams"] , HorizontalRule , Header 1 [Str "Definition",Space,Str "Lists"] -, Para [Str "Tight",Space,Str "using",Space,Str "spaces:"] +, Para [Str "Tight",Space,Str "using",Space,Str "spaces",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Plain [Str "red",Space,Str "fruit"] ] @@ -180,7 +180,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , ([Str "banana"], [ [ Plain [Str "yellow",Space,Str "fruit"] ] ]) ] -, Para [Str "Tight",Space,Str "using",Space,Str "tabs:"] +, Para [Str "Tight",Space,Str "using",Space,Str "tabs",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Plain [Str "red",Space,Str "fruit"] ] @@ -191,7 +191,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , ([Str "banana"], [ [ Plain [Str "yellow",Space,Str "fruit"] ] ]) ] -, Para [Str "Loose:"] +, Para [Str "Loose",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Para [Str "red",Space,Str "fruit"] ] @@ -202,18 +202,18 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , ([Str "banana"], [ [ Para [Str "yellow",Space,Str "fruit"] ] ]) ] -, Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] +, Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics",Str ":"] , DefinitionList [ ([Emph [Str "apple"]], [ [ Para [Str "red",Space,Str "fruit"] - , Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ]]) + , Para [Str "contains",Space,Str "seeds",Str ",",Space,Str "crisp",Str ",",Space,Str "pleasant",Space,Str "to",Space,Str "taste"] ]]) , ([Emph [Str "orange"]], [ [ Para [Str "orange",Space,Str "fruit"] , CodeBlock ("",[],[]) "{ orange code block }" , BlockQuote [ Para [Str "orange",Space,Str "block",Space,Str "quote"] ] ]]) ] -, Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"] +, Para [Str "Multiple",Space,Str "definitions",Str ",",Space,Str "tight",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Plain [Str "red",Space,Str "fruit"] ] @@ -223,7 +223,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Plain [Str "orange",Space,Str "fruit"] ] , [ Plain [Str "bank"] ] ]) ] -, Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"] +, Para [Str "Multiple",Space,Str "definitions",Str ",",Space,Str "loose",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Para [Str "red",Space,Str "fruit"] ] @@ -233,7 +233,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Para [Str "orange",Space,Str "fruit"] ] , [ Para [Str "bank"] ] ]) ] -, Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"] +, Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term",Str ",",Space,Str "indented",Space,Str "marker",Str ",",Space,Str "alternate",Space,Str "markers",Str ":"] , DefinitionList [ ([Str "apple"], [ [ Para [Str "red",Space,Str "fruit"] ] @@ -245,45 +245,45 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Plain [Str "sublist"] ] , [ Plain [Str "sublist"] ] ] ]]) ] , Header 1 [Str "HTML",Space,Str "Blocks"] -, Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] +, Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] , RawHtml "
" , Plain [Str "foo"] , RawHtml "
\n" -, Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] +, Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation",Str ":"] , RawHtml "
\n
\n
" , Plain [Str "foo"] , RawHtml "
\n
\n
" , Plain [Str "bar"] , RawHtml "
\n
\n" -, Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"] +, Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table",Str ":"] , RawHtml "\n\n\n\n\n
" , Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]] , RawHtml "" , Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]] , RawHtml "
\n\n\n" -, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"] +, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "simple",Space,Str "block",Str ":"] , RawHtml "
\n " , Plain [Str "foo"] , RawHtml "
\n" -, Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"] +, Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block",Str ",",Space,Str "though",Str ":"] , CodeBlock ("",[],[]) "
\n foo\n
" -, Para [Str "As",Space,Str "should",Space,Str "this:"] +, Para [Str "As",Space,Str "should",Space,Str "this",Str ":"] , CodeBlock ("",[],[]) "
foo
" -, Para [Str "Now,",Space,Str "nested:"] +, Para [Str "Now",Str ",",Space,Str "nested",Str ":"] , RawHtml "
\n
\n
\n " , Plain [Str "foo"] , RawHtml "
\n
\n
\n" -, Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"] +, Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment",Str ":"] , RawHtml "\n" -, Para [Str "Multiline:"] +, Para [Str "Multiline",Str ":"] , RawHtml "\n\n\n" -, Para [Str "Code",Space,Str "block:"] +, Para [Str "Code",Space,Str "block",Str ":"] , CodeBlock ("",[],[]) "" -, Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"] +, Para [Str "Just",Space,Str "plain",Space,Str "comment",Str ",",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line",Str ":"] , RawHtml " \n" -, Para [Str "Code:"] +, Para [Str "Code",Str ":"] , CodeBlock ("",[],[]) "
" -, Para [Str "Hr",Apostrophe,Str "s:"] +, Para [Str "Hr",Apostrophe,Str "s",Str ":"] , RawHtml "
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n" , HorizontalRule , Header 1 [Str "Inline",Space,Str "Markup"] @@ -294,20 +294,20 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."] , Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em",Str "."]]] , Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Str "."] -, Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ">",Str ",",Space,Code "$",Str ",",Space,Code "\\",Str ",",Space,Code "\\$",Str ",",Space,Code "",Str "."] +, Para [Str "This",Space,Str "is",Space,Str "code",Str ":",Space,Code ">",Str ",",Space,Code "$",Str ",",Space,Code "\\",Str ",",Space,Code "\\$",Str ",",Space,Code "",Str "."] , Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]] -, Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello",Str "\160",Str "there"],Str "."] -, Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",Space,Str "H",Subscript [Str "many",Str "\160",Str "of",Str "\160",Str "them"],Str "O",Str "."] -, Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",Space,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",Space,Str "spaces:",Space,Str "a",Str "^",Str "b",Space,Str "c",Str "^",Str "d,",Space,Str "a",Str "~",Str "b",Space,Str "c",Str "~",Str "d",Str "."] +, Para [Str "Superscripts",Str ":",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello",Str "\160",Str "there"],Str "."] +, Para [Str "Subscripts",Str ":",Space,Str "H",Subscript [Str "2"],Str "O",Str ",",Space,Str "H",Subscript [Str "23"],Str "O",Str ",",Space,Str "H",Subscript [Str "many",Str "\160",Str "of",Str "\160",Str "them"],Str "O",Str "."] +, Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts",Str ",",Space,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",Space,Str "spaces",Str ":",Space,Str "a",Str "^",Str "b",Space,Str "c",Str "^",Str "d",Str ",",Space,Str "a",Str "~",Str "b",Space,Str "c",Str "~",Str "d",Str "."] , HorizontalRule -, Header 1 [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"] -, Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider",Str ".",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name",Str "."]] +, Header 1 [Str "Smart",Space,Str "quotes",Str ",",Space,Str "ellipses",Str ",",Space,Str "dashes"] +, Para [Quoted DoubleQuote [Str "Hello",Str ","],Space,Str "said",Space,Str "the",Space,Str "spider",Str ".",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name",Str "."]] , Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters",Str "."] -, Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees",Str ".",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine",Str "."]] -, Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go",Str "."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70",Apostrophe,Str "s?"] +, Para [Quoted SingleQuote [Str "Oak",Str ","],Space,Quoted SingleQuote [Str "elm",Str ","],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees",Str ".",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine",Str "."]] +, Para [Quoted SingleQuote [Str "He",Space,Str "said",Str ",",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go",Str "."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70",Apostrophe,Str "s",Str "?"] , Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."] -, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",Space,EmDash,Space,Str "three",EmDash,Str "four",Space,EmDash,Space,Str "five",Str "."] -, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",EnDash,Str "7,",Space,Str "255",EnDash,Str "66,",Space,Str "1987",EnDash,Str "1999",Str "."] +, Para [Str "Some",Space,Str "dashes",Str ":",Space,Str "one",EmDash,Str "two",Space,EmDash,Space,Str "three",EmDash,Str "four",Space,EmDash,Space,Str "five",Str "."] +, Para [Str "Dashes",Space,Str "between",Space,Str "numbers",Str ":",Space,Str "5",EnDash,Str "7",Str ",",Space,Str "255",EnDash,Str "66",Str ",",Space,Str "1987",EnDash,Str "1999",Str "."] , Para [Str "Ellipses",Ellipses,Str "and",Ellipses,Str "and",Ellipses,Str "."] , HorizontalRule , Header 1 [Str "LaTeX"] @@ -318,46 +318,46 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , [ Plain [Math InlineMath "\\alpha \\wedge \\omega"] ] , [ Plain [Math InlineMath "223"] ] , [ Plain [Math InlineMath "p",Str "-",Str "Tree"] ] - , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "some",Space,Str "display",Space,Str "math:",Space,Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"] ] - , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."] ] ] -, Para [Str "These",Space,Str "shouldn",Apostrophe,Str "t",Space,Str "be",Space,Str "math:"] + , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "some",Space,Str "display",Space,Str "math",Str ":",Space,Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"] ] + , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it",Str ":",Space,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."] ] ] +, Para [Str "These",Space,Str "shouldn",Apostrophe,Str "t",Space,Str "be",Space,Str "math",Str ":"] , BulletList - [ [ Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code "$e = mc^2$",Str "."] ] - , [ Plain [Str "$",Str "22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money",Str ".",Space,Str "So",Space,Str "is",Space,Str "$",Str "34,000",Str ".",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized",Str ".",Str ")"] ] - , [ Plain [Str "Shoes",Space,Str "(",Str "$",Str "20)",Space,Str "and",Space,Str "socks",Space,Str "(",Str "$",Str "5)",Str "."] ] + [ [ Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation",Str ",",Space,Str "write",Space,Code "$e = mc^2$",Str "."] ] + , [ Plain [Str "$",Str "22",Str ",",Str "000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money",Str ".",Space,Str "So",Space,Str "is",Space,Str "$",Str "34",Str ",",Str "000",Str ".",Space,Str "(",Str "It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized",Str ".",Str ")"] ] + , [ Plain [Str "Shoes",Space,Str "(",Str "$",Str "20",Str ")",Space,Str "and",Space,Str "socks",Space,Str "(",Str "$",Str "5",Str ")",Str "."] ] , [ Plain [Str "Escaped",Space,Code "$",Str ":",Space,Str "$",Str "73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23",Str "$",Str "."] ] ] -, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"] +, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "LaTeX",Space,Str "table",Str ":"] , Para [TeX "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}"] , HorizontalRule , Header 1 [Str "Special",Space,Str "Characters"] -, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"] +, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode",Str ":"] , BulletList - [ [ Plain [Str "I",Space,Str "hat:",Space,Str "\206"] ] - , [ Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"] ] - , [ Plain [Str "section:",Space,Str "\167"] ] - , [ Plain [Str "set",Space,Str "membership:",Space,Str "\8712"] ] - , [ Plain [Str "copyright:",Space,Str "\169"] ] ] + [ [ Plain [Str "I",Space,Str "hat",Str ":",Space,Str "\206"] ] + , [ Plain [Str "o",Space,Str "umlaut",Str ":",Space,Str "\246"] ] + , [ Plain [Str "section",Str ":",Space,Str "\167"] ] + , [ Plain [Str "set",Space,Str "membership",Str ":",Space,Str "\8712"] ] + , [ Plain [Str "copyright",Str ":",Space,Str "\169"] ] ] , Para [Str "AT",Str "&",Str "T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name",Str "."] , Para [Str "AT",Str "&",Str "T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it",Str "."] , Para [Str "This",Space,Str "&",Space,Str "that",Str "."] , Para [Str "4",Space,Str "<",Space,Str "5",Str "."] , Para [Str "6",Space,Str ">",Space,Str "5",Str "."] -, Para [Str "Backslash:",Space,Str "\\"] -, Para [Str "Backtick:",Space,Str "`"] -, Para [Str "Asterisk:",Space,Str "*"] -, Para [Str "Underscore:",Space,Str "_"] -, Para [Str "Left",Space,Str "brace:",Space,Str "{"] -, Para [Str "Right",Space,Str "brace:",Space,Str "}"] -, Para [Str "Left",Space,Str "bracket:",Space,Str "["] -, Para [Str "Right",Space,Str "bracket:",Space,Str "]"] -, Para [Str "Left",Space,Str "paren:",Space,Str "("] -, Para [Str "Right",Space,Str "paren:",Space,Str ")"] -, Para [Str "Greater",Str "-",Str "than:",Space,Str ">"] -, Para [Str "Hash:",Space,Str "#"] -, Para [Str "Period:",Space,Str "."] -, Para [Str "Bang:",Space,Str "!"] -, Para [Str "Plus:",Space,Str "+"] -, Para [Str "Minus:",Space,Str "-"] +, Para [Str "Backslash",Str ":",Space,Str "\\"] +, Para [Str "Backtick",Str ":",Space,Str "`"] +, Para [Str "Asterisk",Str ":",Space,Str "*"] +, Para [Str "Underscore",Str ":",Space,Str "_"] +, Para [Str "Left",Space,Str "brace",Str ":",Space,Str "{"] +, Para [Str "Right",Space,Str "brace",Str ":",Space,Str "}"] +, Para [Str "Left",Space,Str "bracket",Str ":",Space,Str "["] +, Para [Str "Right",Space,Str "bracket",Str ":",Space,Str "]"] +, Para [Str "Left",Space,Str "paren",Str ":",Space,Str "("] +, Para [Str "Right",Space,Str "paren",Str ":",Space,Str ")"] +, Para [Str "Greater",Str "-",Str "than",Str ":",Space,Str ">"] +, Para [Str "Hash",Str ":",Space,Str "#"] +, Para [Str "Period",Str ":",Space,Str "."] +, Para [Str "Bang",Str ":",Space,Str "!"] +, Para [Str "Plus",Str ":",Space,Str "+"] +, Para [Str "Minus",Str ":",Space,Str "-"] , HorizontalRule , Header 1 [Str "Links"] , Header 2 [Str "Explicit"] @@ -385,33 +385,33 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , Para [Str "Foo",Space,Link [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."] , Header 2 [Str "With",Space,Str "ampersands"] , Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Link [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."] -, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link [Str "AT",Str "&",Str "T"] ("http://att.com/","AT&T"),Str "."] +, Para [Str "Here",Apostrophe,Str "s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text",Str ":",Space,Link [Str "AT",Str "&",Str "T"] ("http://att.com/","AT&T"),Str "."] , Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."] , Para [Str "Here",Apostrophe,Str "s",Space,Str "an",Space,Link [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."] , Header 2 [Str "Autolinks"] -, Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link [Code "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] +, Para [Str "With",Space,Str "an",Space,Str "ampersand",Str ":",Space,Link [Code "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] , BulletList - [ [ Plain [Str "In",Space,Str "a",Space,Str "list?"] ] + [ [ Plain [Str "In",Space,Str "a",Space,Str "list",Str "?"] ] , [ Plain [Link [Code "http://example.com/"] ("http://example.com/","")] ] , [ Plain [Str "It",Space,Str "should",Str "."] ] ] -, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Link [Code "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] +, Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address",Str ":",Space,Link [Code "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] , BlockQuote - [ Para [Str "Blockquoted:",Space,Link [Code "http://example.com/"] ("http://example.com/","")] ] + [ Para [Str "Blockquoted",Str ":",Space,Link [Code "http://example.com/"] ("http://example.com/","")] ] -, Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ""] +, Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here",Str ":",Space,Code ""] , CodeBlock ("",[],[]) "or here: " , HorizontalRule , Header 1 [Str "Images"] -, Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"] +, Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(",Str "1902",Str ")",Str ":"] , Para [Image [Str "lalune"] ("lalune.jpg","Voyage dans la Lune")] , Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon",Str "."] , HorizontalRule , Header 1 [Str "Footnotes"] -, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote",Str ".",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference",Str ".",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document",Str "."]],Space,Str "and",Space,Str "another",Str ".",Note [Para [Str "Here",Apostrophe,Str "s",Space,Str "the",Space,Str "long",Space,Str "note",Str ".",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks",Str "."],Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)",Str "."],CodeBlock ("",[],[]) " { }",Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block",Str "."]],Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str ".",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note",Str ".",Note [Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type",Str ".",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "[",Str "bracketed",Space,Str "text",Str "]",Str "."]]] +, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference",Str ",",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote",Str ".",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference",Str ".",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document",Str "."]],Space,Str "and",Space,Str "another",Str ".",Note [Para [Str "Here",Apostrophe,Str "s",Space,Str "the",Space,Str "long",Space,Str "note",Str ".",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks",Str "."],Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(",Str "as",Space,Str "with",Space,Str "list",Space,Str "items",Str ")",Str "."],CodeBlock ("",[],[]) " { }",Para [Str "If",Space,Str "you",Space,Str "want",Str ",",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line",Str ",",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block",Str "."]],Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference",Str ",",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str ".",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note",Str ".",Note [Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type",Str ".",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters",Str ",",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "[",Str "bracketed",Space,Str "text",Str "]",Str "."]]] , BlockQuote [ Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes",Str ".",Note [Para [Str "In",Space,Str "quote",Str "."]]] ] , OrderedList (1,Decimal,Period) [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ] ] -, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ] +, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note",Str ",",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ] -- cgit v1.2.3