From e814a3f6d23f640b1aed5b7cb949459d514a3e33 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Wed, 8 Aug 2007 02:43:15 +0000 Subject: Major change in the way ordered lists are handled: + The changes are documented in README, under Lists. + The OrderedList block element now stores information about list number style, list number delimiter, and starting number. + The readers parse this information, when possible. + The writers use this information to style ordered lists. + Test suites have been changed accordingly. Motivation: It's often useful to start lists with numbers other than 1, and to have control over the style of the list. Added to Text.Pandoc.Shared: + camelCaseToHyphenated + toRomanNumeral + anyOrderedListMarker + orderedListMarker + orderedListMarkers Added to Text.Pandoc.ParserCombinators: + charsInBalanced' + withHorizDisplacement + romanNumeral RST writer: + Force blank line before lists, so that sublists will be handled correctly. LaTeX reader: + Fixed bug in parsing of footnotes containing multiple paragraphs, introduced by use of charsInBalanced. Fix: use charsInBalanced' instead. LaTeX header: + use mathletters option in ucs package, so that basic unicode Greek letters will work properly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@834 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/html-reader.native | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) (limited to 'tests/html-reader.native') diff --git a/tests/html-reader.native b/tests/html-reader.native index 242055f3d..59bf02e47 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -28,7 +28,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") [ Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"] , CodeBlock "sub status {\n print \"working\";\n}" , Para [Str "A",Space,Str "list:"] - , OrderedList + , OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "item",Space,Str "one"] ] , [ Plain [Str "item",Space,Str "two"] ] ] , Para [Str "Nested",Space,Str "block",Space,Str "quotes:"] @@ -44,7 +44,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") [ Para [Str "Example:"] , CodeBlock "sub status {\n print \"working\";\n}" ] , BlockQuote - [ OrderedList + [ OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "do",Space,Str "laundry"] ] , [ Plain [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"] ] ] ] , Para [Str "Here's",Space,Str "a",Space,Str "nested",Space,Str "one:"] @@ -95,27 +95,27 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") , [ Para [Str "Minus",Space,Str "3"] ] ] , Header 2 [Str "Ordered"] , Para [Str "Tight:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "First"] ] , [ Plain [Str "Second"] ] , [ Plain [Str "Third"] ] ] , Para [Str "and:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "One"] ] , [ Plain [Str "Two"] ] , [ Plain [Str "Three"] ] ] , Para [Str "Loose",Space,Str "using",Space,Str "tabs:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Para [Str "First"] ] , [ Para [Str "Second"] ] , [ Para [Str "Third"] ] ] , Para [Str "and",Space,Str "using",Space,Str "spaces:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Para [Str "One"] ] , [ Para [Str "Two"] ] , [ Para [Str "Three"] ] ] , Para [Str "Multiple",Space,Str "paragraphs:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."] , Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",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's",Space,Str "back."] ], [ Para [Str "Item",Space,Str "2."] ] , [ Para [Str "Item",Space,Str "3."] ] ] @@ -128,7 +128,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") [ [ Plain [Str "Tab"] ] ] ] ] ] ] , Para [Str "Here's",Space,Str "another:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Plain [Str "First"] ] , [ Plain [Str "Second:"] , BulletList @@ -136,7 +136,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") , [ Plain [Str "Fie"] ] , [ Plain [Str "Foe"] ] ] ], [ Plain [Str "Third"] ] ] , Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"] -, OrderedList +, OrderedList (1,DefaultStyle,DefaultDelim) [ [ Para [Str "First"] ] , [ Para [Str "Second:"] , BulletList @@ -150,6 +150,35 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] "") , BulletList [ [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"] ] , [ Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"] ] ] ] ] +, Header 2 [Str "Fancy",Space,Str "list",Space,Str "markers"] +, OrderedList (2,Decimal,DefaultDelim) + [ [ Plain [Str "begins",Space,Str "with",Space,Str "2"] ] + , [ Para [Str "and",Space,Str "now",Space,Str "3"] + , Para [Str "with",Space,Str "a",Space,Str "continuation"] + , OrderedList (4,LowerRoman,DefaultDelim) + [ [ Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"] ] + , [ Plain [Str "more",Space,Str "items"] + , OrderedList (1,UpperAlpha,DefaultDelim) + [ [ Plain [Str "a",Space,Str "subsublist"] ] + , [ Plain [Str "a",Space,Str "subsublist"] ] ] ] ] ] ] +, Para [Str "Nesting:"] +, OrderedList (1,UpperAlpha,DefaultDelim) + [ [ Plain [Str "Upper",Space,Str "Alpha"] + , OrderedList (1,UpperRoman,DefaultDelim) + [ [ Plain [Str "Upper",Space,Str "Roman."] + , OrderedList (6,Decimal,DefaultDelim) + [ [ Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"] + , OrderedList (3,LowerAlpha,DefaultDelim) + [ [ Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"] ] + ] ] ] ] ] ] ] +, Para [Str "Autonumbering:"] +, OrderedList (1,DefaultStyle,DefaultDelim) + [ [ Plain [Str "Autonumber."] ] + , [ Plain [Str "More."] + , OrderedList (1,DefaultStyle,DefaultDelim) + [ [ Plain [Str "Nested."] ] + ] ] ] +, HorizontalRule , Header 2 [Str "Definition"] , DefinitionList [ ([Str "Violin"], -- cgit v1.2.3