From df5244fd486c20fa6125d371898c211906eed58b Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 25 Apr 2009 00:29:58 +0000 Subject: HTML writer: wrap sections in divs. Resolves Issue #70. + hierarchicalize has been rationalized; it builds a hierarchical representation of the document from the headers, and simultaneously gives each section a unique identifier based on the heading title. + Identifiers are now attached to the divs rather than to the headers themselves. + Table of content backlinks go to the beginning of the table, rather than to the section reference that was clicked. This seems better. + Code for constructing identifiers has been moved to Text.Pandoc.Shared from the HTML writer, since it is now consumed only by hierarchicalize. + In --strict mode, pandoc just prints bare headings, as before (unless --toc has been specified). + In s5 output, it does not wrap sections in divs, as that seems to confuse the s5 javascript. + Test suite updated accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1562 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/s5.basic.html | 14 +- tests/s5.fancy.html | 14 +- tests/s5.fragment.html | 80 +- tests/s5.inserts.html | 80 +- tests/writer.html | 1906 +++++++++++++++++++++++++----------------------- 5 files changed, 1082 insertions(+), 1012 deletions(-) (limited to 'tests') diff --git a/tests/s5.basic.html b/tests/s5.basic.html index 44dee9d8e..bb2b25ae3 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -276,24 +276,24 @@ window.onload=startup;window.onresize=function(){setTimeout('fontScale()',50);}
-

My S5 Document

Sam Smith, Jen Jones

July 15, 2006

-

First slide

-

Math

-

My S5 Document

Sam Smith, Jen Jones

July 15, 2006

-

First slide

-

Math

  • First slide
    • first bullet

      • First slide

      • second bullet

      Math

      • \frac{d}{dx}f(x)=\limh → 0first bullet
      • second bullet

Math

  • \frac{f(x+h)-f(x)}{h}
d}{dx}f(x)=\limh → 0\frac{f(x+h)-f(x)}{h}
diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index fc27da035..d6f0d6fbd 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -15,46 +15,50 @@ STUFF INSERTED >STUFF INSERTED

My S5 Document

First slide

STUFF INSERTED

This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.

Headers

Level 3 with emphasis

Level 4

Level 5

Level 1

Level 2 with emphasis

Level 3

with no blank line

Level 2

with no blank line

Paragraphs

Here’s a regular paragraph.

In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.

Here’s one with a bullet. * criminey.

There should be a hard line break
here.

Block Quotes

E-mail style:

This is a block quote. It is pretty short.

Code in a block quote:

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

Headers

Level 1

Level 2 with emphasis

Level 3

with no blank line

Level 2

with no blank line

Paragraphs

A list:

  1. item one
  2. item two
Here’s a regular paragraph.

In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.

Here’s one with a bullet. * criminey.

There should be a hard line break
here.

Block Quotes

Nested block quotes:

E-mail style:

nested

This is a block quote. It is pretty short.

nested

Code in a block quote:

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

A list:

  1. item one
  2. item two

Nested block quotes:

nested

nested

This should not be a block quote: 2 > 1.

And a following paragraph.

Code Blocks

Code:

---- (should be four hyphens)
+      >
This should not be a block quote: 2 > 1.
And a following paragraph.
Code Blocks
Code:
---- (should be four hyphens)
 
 sub status {
     print "working";
@@ -112,458 +135,474 @@ sub status {
 
 this code block is indented by one tab
 
And:
    this code block is indented by two tabs
+	>
And:
    this code block is indented by two tabs
 
 These should not be escaped:  \$ \\ \> \[ \{
 
Lists
Unordered
Asterisks tight:
  • asterisk 1
  • asterisk 2
  • asterisk 3
Asterisks loose:
  • asterisk 1
  • asterisk 2
  • asterisk 3
Pluses tight:
  • Plus 1
  • Plus 2
  • Plus 3
Pluses loose:
  • Plus 1
  • Plus 2
  • Plus 3
Minuses tight:
  • Minus 1
  • Minus 2
  • Minus 3
Minuses loose:
  • Minus 1
  • Minus 2
  • Minus 3
Ordered
Tight:
  1. First
  2. Second
  3. Third
and:
  1. One
  2. Two
  3. Three
Loose using tabs:
  1. First
  2. Second
  3. Third
and using spaces:
  1. One
  2. Two
  3. Three
Multiple paragraphs:
  1. Item 1, graf one.

Lists

Unordered

Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.

  • Item 2.

  • Item 3.

    • Nested

    • Tab
        Asterisks tight:

        • Tab
          • Tab
          asterisk 1
        • asterisk 2
        • asterisk 3

        Asterisks loose:

        • asterisk 1

        • asterisk 2

        • asterisk 3

      Here’s another:

      1. First
      2. Second:

          Pluses tight:

          • Fee
            • Plus 1
          • Fie
            • Plus 2
          • Foe
            • Plus 3
        • Third

      Same thing but with paragraphs:

      1. First

      2. Second:

        Pluses loose:

        • Fee

          • Plus 1

        • Fie

          • Plus 2

        • Foe

          • Plus 3

      3. Third

      Tabs and spaces

      • this is a list item indented with tabs

      • this is a list item indented with spaces

        Minuses tight:

        • Minus 1
        • Minus 2
        • Minus 3

        Minuses loose:

        • this is an example list item indented with tabs

          Minus 1

        • Minus 2

        • this is an example list item indented with spaces

          Minus 3

      Fancy list markers

      1. begins with 2

      2. and now 3

    Ordered

    with a continuation

      Tight:

      1. sublist with roman numerals, starting with 4
        2. First
      2. more items
        1. a subsublist
        2. a subsublist
        Second
      3. Third

      and:

      1. One
      2. Two
      3. Three

      Loose using tabs:

      1. First

      2. Second

      3. Third

    Nesting:

    1. Upper Alpha

        and using spaces:

        1. One

        2. Two

        3. Three

        Multiple paragraphs:

        1. Item 1, graf one.

          Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.

        2. Item 2.

        3. Item 3.

    Nested

    • Upper Roman.
        Tab
        • Decimal start with 6
            Tab
            • Lower alpha with paren
          Tab

    Autonumbering:

    1. Autonumber.
    2. More.

        Here’s another:

        1. Nested.
          2. First
        2. Second:
          • Fee
          • Fie
          • Foe
        3. Third

      Should not be a list item:

      M.A. 2007

      B. Williams

      Definition Lists

      Tight using spaces:

      apple
      red fruit
      orange
      orange fruit
      banana
      yellow fruit

      Tight using tabs:

      apple
      red fruit
      orange
      orange fruit
      banana
      yellow fruit

      Loose:

      apple

      red fruit

      Same thing but with paragraphs:

      1. First

      2. Second:

        • Fee
        • Fie
        • Foe

      3. Third

    Tabs and spaces

    • this is a list item indented with tabs

    • this is a list item indented with spaces

      • this is an example list item indented with tabs

      • this is an example list item indented with spaces

    Fancy list markers

    1. begins with 2

    2. and now 3

      with a continuation

      1. sublist with roman numerals, starting with 4
      2. more items
        1. a subsublist
        2. a subsublist

    Nesting:

    1. Upper Alpha
      1. Upper Roman.
        1. Decimal start with 6
          1. Lower alpha with paren

    Autonumbering:

    1. Autonumber.
    2. More.
      1. Nested.

    Should not be a list item:

    M.A. 2007

    B. Williams

    Definition Lists

    Tight using spaces:

    orange
    apple
    red fruit
    orange
    orange fruit
    banana
    yellow fruit

    orange fruit

    Tight using tabs:

    banana
    apple
    red fruit
    orange
    orange fruit
    banana
    yellow fruit

    yellow fruit

    Multiple blocks with italics:

    apple

    red fruit

    contains seeds, crisp, pleasant to taste

    Loose:

    orange
    apple

    red fruit

    orange

    orange fruit

    banana

    yellow fruit

    orange fruit

    { orange code block }
-
    Multiple blocks with italics:

    apple

    orange block quote

    HTML Blocks

    Simple block on one line:

    foo
    + >red fruit

    contains seeds, crisp, pleasant to taste

    orange

    orange fruit

    { orange code block }
+

    orange block quote

    HTML Blocks

    Simple block on one line:

    foo

    And nested without indentation:

    + >And nested without indentation:

    foo
    bar

    Interpreted markdown in a table:

    + >Interpreted markdown in a table:

    + >emphasized + >strong
    This is emphasized And this is strong

    Here’s a simple block:

    + >Here’s a simple block:

    foo

    This should be a code block, though:

    <div>
+      >This should be a code block, though:
    <div>
     foo
 </div>
 
    As should this:
    <div>foo</div>
+	>
    As should this:
    <div>foo</div>
 
    Now, nested:
    
+	>

    Now, nested:

    foo

    This should just be an HTML comment:

    + >This should just be an HTML comment:

    Multiline:

    @@ -572,25 +611,25 @@ Blah This is another comment. -->

    Code block:

    <!-- Comment -->
+      >Code block:
    <!-- Comment -->
 
    Just plain comment, with trailing spaces on the line:
       
+	>

    Just plain comment, with trailing spaces on the line:

    Code:

    <hr />
+      >Code:
    <hr />
 
    Hr’s:
    
+	>

    Hr’s:

    @@ -608,474 +647,497 @@ Blah

    Inline Markup

    This is emphasized, and so is this.

    This is strong, and so is this.

    An emphasized link.

    This is strong and em.

    So is this word.

    This is strong and em.

    So is this word.

    This is code: >, $, \, \$, <html>.

    Inline Markup

    This is strikeout.

    Superscripts: abcd ahello ahello there.

    Subscripts: H2O, H23O, Hmany of themO.

    These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.

    Smart quotes, ellipses, dashes

    “Hello,” said the spider. “‘Shelob’ is my name.”

    ‘A’, ‘B’, and ‘C’ are letters.

    ‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’

    ‘He said, “I want to go.”’ Were you alive in the 70’s?

    Here is some quoted ‘code’ and a “quoted link”.

    Some dashes: one—two — three—four — five.

    Dashes between numbers: 5–7, 255–66, 1987–1999.

    Ellipses…and…and….

    LaTeX

    • 2+2=4
    • emphasized, and so is this.

      This is strong, and so is this.

      An emphasized link.

      x ∈ y

    • α ∧ ω
    • 223
    • This is strong and em.

      So is this word.

      This is strong and em.

      So is this word.

      This is code: >, $, \, \$, <html>.

      This is strikeout.

      Superscripts: abcd ap-Tree

      • hello ahello there.

      Subscripts: H2O, H23O, Hmany of themO.

      These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.

    Smart quotes, ellipses, dashes

    “Hello,” said the spider. “‘Shelob’ is my name.”

    ‘A’, ‘B’, and ‘C’ are letters.

    ‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’

    ‘He said, “I want to go.”’ Were you alive in the 70’s?

    Here is some quoted ‘code’ and a “quoted link”.

    Some dashes: one—two — three—four — five.

    Dashes between numbers: 5–7, 255–66, 1987–1999.

    Ellipses…and…and….

    LaTeX

    • Here’s some display math: \frac{d}{dx}f(x)=\lim
    • 2+2=4
    • h → 0x ∈ y
    • α ∧ ω
    • 223
    • p-Tree
    • Here’s some display math: \frac{f(x+h)-f(x)}{h}
    • Here’s one that has a line break in it: α+ω × x2.

    These shouldn’t be math:

    • To get the famous equation, write $e = mc^2$.
    • $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.)
    • Shoes ($20) and socks ($5).
    • Escaped $: $73 this should be emphasized 23$.

    Here’s a LaTeX table:

    Special Characters

    Here is some unicode:

    • I hat: Î
    • o umlaut: ö
    • section: §
    • set membership: ∈
      • d}{dx}f(x)=\limh → 0\frac{f(x+h)-f(x)}{h}
    • Here’s one that has a line break in it: α+ω × x2.

    These shouldn’t be math:

    • copyright: ©

    AT&T has an ampersand in their name.

    AT&T is another way to write it.

    This & that.

    4 < 5.

    6 > 5.

    Backslash: \

    Backtick: `

    Asterisk: *

    Underscore: _

    Left brace: {

    Right brace: }

    Left bracket: [

    Right bracket: ]

    Left paren: (

    Right paren: )

    Greater-than: >

    Hash: #

    Period: .

    Bang: !

    Plus: +

    Minus: -

    Links

    Explicit

    Just a URL.

    URL and title.

    URL and title.

    URL and title.

    URL and title

    URL and title

    with_underscoreTo get the famous equation, write $e = mc^2$.

  • $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.)
  • Shoes ($20) and socks ($5).
  • Escaped $: $73 this should be emphasized 23$.

    • Here’s a LaTeX table:

    Empty.

    Reference

    Foo bar.

    Foo bar.

    Foo bar.

    With embedded [brackets].

    b by itself should be a link.

    Indented once.

    Indented twice.

    Indented thrice.

    This should [not][] be a link.

    [not]: /url
-

    Foo bar.

    Foo biz.

    With ampersands

    Here’s a link with an ampersand in the URL.

    Here’s a link with an amersand in the link text: AT&T.

    Here’s an inline link.

    Here’s an inline link in pointy braces.

    With an ampersand: http://example.com/?foo=1&bar=2

    Reference

    Foo bar.

    Foo bar.

    Foo bar.

    With embedded [brackets].

    b by itself should be a link.

    Indented once.

    Indented twice.

    Indented thrice.

    This should [not][] be a link.

    http://example.com/
  • It should.
    • An e-mail address: 
    Blockquoted: 
    Blockquoted: http://example.com/
    Auto-links should not occur here: <http://example.com/>
    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):
    lalune
    Here is a movie movie icon.
    Footnotes
    Here is a footnote reference,1 and another.2 This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3
    Notes can go in quotes.

    Footnotes

    Here is a footnote reference,41

    1. And in list items. and another.52

    This paragraph should not be part of the note, as it is not indented.

    This should not be a footnote reference, because it contains a space.[^my note] Here is an inline note.3

    Notes can go in quotes.4

    1. And in list items.5

    This paragraph should not be part of the note, as it is not indented.