diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 3b14b0700..518ae3c73 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -1264,12 +1264,6 @@ tableRowToHtml :: PandocMonad m -> TableRow -> StateT WriterState m Html tableRowToHtml opts (TableRow tblpart attr rownum rowhead rowbody) = do - let rowclass = case rownum of - Ann.RowNumber x | x `rem` 2 == 1 -> "odd" - _ | tblpart /= Thead -> "even" - _ -> "header" - let attr' = case attr of - (id', classes, rest) -> (id', rowclass:classes, rest) let celltype = case tblpart of Thead -> HeaderCell _ -> BodyCell diff --git a/test/command/1166.md b/test/command/1166.md index 756a065db..20829a3b1 100644 --- a/test/command/1166.md +++ b/test/command/1166.md @@ -17,28 +17,28 @@ col 1 col 2 ^D - + - + - + - + - + diff --git a/test/command/1881.md b/test/command/1881.md index 7a2468c1b..afa75c74e 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -3,7 +3,7 @@
col 1 col 2
1 Second column of row 1.

2

Second column of row 2. Second line of paragraph.

3
  • Second column of row 3.
  • Second item in bullet list (row 3, column 2).
Row 4; column 1 will be empty.
- + @@ -11,7 +11,7 @@ - + @@ -111,7 +111,7 @@ ``` % pandoc -f html -t native
Demonstration of simple table syntax.
Right Left Center
12 12 12
- + diff --git a/test/command/2606.md b/test/command/2606.md index 53eaa0d06..cf9132174 100644 --- a/test/command/2606.md +++ b/test/command/2606.md @@ -6,7 +6,7 @@ ^D
12 12 12
- + @@ -22,7 +22,7 @@ ^D

* hello
- + @@ -40,7 +40,7 @@ ^D
  • hello
- + diff --git a/test/command/2649.md b/test/command/2649.md index 7225ae0f4..2308e2744 100644 --- a/test/command/2649.md +++ b/test/command/2649.md @@ -7,7 +7,7 @@ ^D

* hello
- +
@@ -31,24 +31,24 @@ ^D - + - + - + - + @@ -80,26 +80,26 @@ ^D

peildatum Simbase

november 2005

uitslagen Flohrgambiet

totaal aantal partijen Simbase

7.316.773

wit wint

53%

percentage (en partijen) Flohrgambiet

0.023 % (1.699)

zwart wint

27%

percentage Flohrgambiet in aug 2003

0.035 %

remise

- + - + - + - + diff --git a/test/command/3314.md b/test/command/3314.md index 064b04cbd..6c78254ad 100644 --- a/test/command/3314.md +++ b/test/command/3314.md @@ -18,12 +18,12 @@ See #3315 and - + - + diff --git a/test/command/3432.md b/test/command/3432.md index 381f8af87..aaa8526be 100644 --- a/test/command/3432.md +++ b/test/command/3432.md @@ -28,24 +28,24 @@ List-table with header-rows and widths options. - + - + - + - + @@ -79,24 +79,24 @@ List-table whose widths is "auto".

Plaats

Rijder

Aantal

1

Sébastien Loeb

78

2

Sébastien Ogier

38

10

Hannu Mikkola

First 12.0 Example row spanning lines
Second 5.0 Another
Treat Quantity Description
Albatross 2.99 On a stick!
Crunchy Frog 1.49 If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + - + @@ -130,24 +130,24 @@ List-table with header-rows which is bigger than 1. Only the first row is treate
Frozen Delights!
Treat Quantity Description
Albatross 2.99 On a stick!
Crunchy Frog 1.49 If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + - + @@ -176,17 +176,17 @@ List-table without header-rows.
Frozen Delights!
Treat Quantity Description
Albatross 2.99 On a stick!
Crunchy Frog 1.49 If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + @@ -219,24 +219,24 @@ List-table with empty cells. You need a space after '-', otherwise the row will
Frozen Delights!
Albatross 2.99 On a stick!
Crunchy Frog 1.49 If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + - + @@ -266,7 +266,7 @@ List-table with a cell having a bulletlist
Frozen Delights!
Treat Quantity Description
Albatross 2.99
Crunchy Frog If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + diff --git a/test/command/3494.md b/test/command/3494.md index 7c480fde6..ba526620c 100644 --- a/test/command/3494.md +++ b/test/command/3494.md @@ -14,22 +14,22 @@ ^D
Frozen Delights!
Albatross 2.99
    @@ -274,12 +274,12 @@ List-table with a cell having a bulletlist
  • In a cup!
Crunchy Frog 1.49 If we took the bones out, it wouldn't be crunchy, now would it?
Gannet Ripple 1.99 On a stick!
- + - + - + - + diff --git a/test/command/3499.md b/test/command/3499.md index ba9f03589..4058e887b 100644 --- a/test/command/3499.md +++ b/test/command/3499.md @@ -9,7 +9,7 @@ Org-mode tables can't be on the same line as list markers:
  • |something|
  • ﺍ
    ﺄﺤﺴﻨﺘـ(ﻭﺍ) IV ʾaḥsant(ū) thank you
    blah blah blah
    blah blah blah
    - + diff --git a/test/command/3667.md b/test/command/3667.md index 97de8f598..07cd93c72 100644 --- a/test/command/3667.md +++ b/test/command/3667.md @@ -4,7 +4,7 @@ ^D
    else
    - + diff --git a/test/command/6441.md b/test/command/6441.md index d0488767c..621e536d1 100644 --- a/test/command/6441.md +++ b/test/command/6441.md @@ -7,13 +7,13 @@ ^D
    link text
    - + - + diff --git a/test/command/6481.md b/test/command/6481.md index 06b64605c..fb40114e0 100644 --- a/test/command/6481.md +++ b/test/command/6481.md @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/test/command/6549.md b/test/command/6549.md index e41f4b76a..4ba11b462 100644 --- a/test/command/6549.md +++ b/test/command/6549.md @@ -8,13 +8,13 @@
    h1 h2
    c1 c2
    Col 1 Col 2 Col 3
    High Med Med
    - + - + - + - + diff --git a/test/command/7112.md b/test/command/7112.md index a75b9250a..e2254170d 100644 --- a/test/command/7112.md +++ b/test/command/7112.md @@ -6,7 +6,7 @@ ^D
    Test table
    Column1 Column2
    Data1
    • data1
      • diff --git a/test/command/7064.md b/test/command/7064.md index 58b72e363..2690b928d 100644 --- a/test/command/7064.md +++ b/test/command/7064.md @@ -15,14 +15,14 @@
    Version Date Description
    0.1.0 18/02/2013 Initial Release
    - + diff --git a/test/command/7214.md b/test/command/7214.md index 43bf9e4ca..1d29b0443 100644 --- a/test/command/7214.md +++ b/test/command/7214.md @@ -13,12 +13,12 @@ - + - + diff --git a/test/command/7713.md b/test/command/7713.md index 851cb4729..09aec8df9 100644 --- a/test/command/7713.md +++ b/test/command/7713.md @@ -11,14 +11,14 @@ - + - + - + - + @@ -60,14 +60,14 @@ sit amet, rhoncus porta, malesuada elementum, nisi. - + - + diff --git a/test/command/7871.md b/test/command/7871.md index 94670f32b..299e79cfa 100644 --- a/test/command/7871.md +++ b/test/command/7871.md @@ -6,7 +6,7 @@ ^D
    setting echo PATH="path"
    日本語 の文字列 words in english
    abc defghij def xyz
    aaaaaaaaaaaa bbbbb ccccccccccc
    cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc diff --git a/test/command/7847.md b/test/command/7847.md index 06fa5cc46..534d9749e 100644 --- a/test/command/7847.md +++ b/test/command/7847.md @@ -7,14 +7,14 @@
    aaa bbb ccc
    Consequat nisi sit amet nibh. Nunc mi tortor, tristique sit amet, rhoncus porta, malesuada elementum, nisi.
    aaa bbb ccc
    Consequat nisi sit amet nibh. Nunc mi tortor, tristique sit amet, rhoncus porta, malesuada elementum, nisi. bbb
    - + diff --git a/test/command/7919.md b/test/command/7919.md index 5aac78fcb..2fa7f359b 100644 --- a/test/command/7919.md +++ b/test/command/7919.md @@ -7,15 +7,15 @@ item 2 | ^D
    a
    - + - + - + @@ -31,15 +31,15 @@ item 2 | ^D
    single column table
    item 1
    item 2
    - + - + - + @@ -66,15 +66,15 @@ item 2 | ^D
    single column table
    item 1
    item 2
    - + - + - + @@ -90,15 +90,15 @@ item 2 | ^D
    single column table
    item 1
    item 2
    - + - + - + diff --git a/test/command/8110.md b/test/command/8110.md index b19d9511c..e4d578e8b 100644 --- a/test/command/8110.md +++ b/test/command/8110.md @@ -18,19 +18,19 @@ ^D
    single column table
    item 1
    item 2
    - + - + - + diff --git a/test/command/8216.md b/test/command/8216.md index 5aeb2efea..109342cd1 100644 --- a/test/command/8216.md +++ b/test/command/8216.md @@ -18,15 +18,15 @@ Misaligned separators in grid table - + - + - + diff --git a/test/command/8257.md b/test/command/8257.md index a284fd38a..d1f3b4408 100644 --- a/test/command/8257.md +++ b/test/command/8257.md @@ -16,22 +16,22 @@ - + - + - + - + diff --git a/test/command/8307.md b/test/command/8307.md index d211d7003..8474051de 100644 --- a/test/command/8307.md +++ b/test/command/8307.md @@ -13,7 +13,7 @@ breaks">hello ^D

    Header text

    Header text

    Header text

    Example

    Example

    Example

    Example

    Example

    Example
    Some text text
    Some text text
    Some text text
    Item Price
    Eggs 5£
    Spam 3£
    Sum 8£
    - + diff --git a/test/command/8659.md b/test/command/8659.md index 4721e1909..5bbb6f166 100644 --- a/test/command/8659.md +++ b/test/command/8659.md @@ -5,7 +5,7 @@ ^D
    hello
    - +
    @@ -30,20 +30,20 @@ The misaligned pipe in the first row is treated as an empty table. - + - +
    - + a b c diff --git a/test/command/8789.md b/test/command/8789.md index 6f6daf94f..291f5082e 100644 --- a/test/command/8789.md +++ b/test/command/8789.md @@ -16,7 +16,7 @@ ^D - + @@ -24,13 +24,13 @@ - + - + - + diff --git a/test/tables.html4 b/test/tables.html4 index 0f699133b..c25d4a25d 100644 --- a/test/tables.html4 +++ b/test/tables.html4 @@ -2,7 +2,7 @@
    First Second Third
    160 1 test test
    160 2 This is a test:
    a b
    - + @@ -10,19 +10,19 @@ - + - + - + @@ -33,7 +33,7 @@

    Simple table without caption:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -41,19 +41,19 @@ - + - + - + @@ -65,7 +65,7 @@
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -73,19 +73,19 @@ - + - + - + @@ -103,7 +103,7 @@ - + @@ -111,13 +111,13 @@ - + - + @@ -134,7 +134,7 @@ - + @@ -142,13 +142,13 @@ - + - + @@ -159,19 +159,19 @@

    Table without column headers:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - + - + - + @@ -188,13 +188,13 @@ - + - + diff --git a/test/tables.html5 b/test/tables.html5 index b3ee0ec79..109384c32 100644 --- a/test/tables.html5 +++ b/test/tables.html5 @@ -2,7 +2,7 @@
    12 12 12 12
    123 123 123 123
    1 1 1
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - + @@ -10,19 +10,19 @@ - + - + - + @@ -33,7 +33,7 @@

    Simple table without caption:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -41,19 +41,19 @@ - + - + - + @@ -65,7 +65,7 @@
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -73,19 +73,19 @@ - + - + - + @@ -103,7 +103,7 @@ - + @@ -111,13 +111,13 @@ - + - + @@ -135,7 +135,7 @@ rows. - + @@ -143,13 +143,13 @@ rows. - + - + @@ -161,19 +161,19 @@ rows.

    Table without column headers:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - + - + - + @@ -190,13 +190,13 @@ rows. - + - + diff --git a/test/tables/nordics.html4 b/test/tables/nordics.html4 index 3cc94845c..762534055 100644 --- a/test/tables/nordics.html4 +++ b/test/tables/nordics.html4 @@ -17,38 +17,38 @@ - + - + - + - + - + - + diff --git a/test/tables/nordics.html5 b/test/tables/nordics.html5 index dbc13d313..4affe81b4 100644 --- a/test/tables/nordics.html5 +++ b/test/tables/nordics.html5 @@ -17,38 +17,38 @@ - + - + - + - + - + - + diff --git a/test/tables/planets.html4 b/test/tables/planets.html4 index e0cd646d8..91bd48888 100644 --- a/test/tables/planets.html4 +++ b/test/tables/planets.html4 @@ -1,7 +1,7 @@
    12 12 12 12
    123 123 123 123
    1 1 1
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    Denmark Copenhagen 5,809,502 43,094
    Finland Helsinki 5,537,364 338,145
    Iceland Reykjavik 343,518 103,000
    Norway Oslo 5,372,191 323,802
    Sweden Stockholm 10,313,447 450,295
    Total 27,376,022
    Denmark Copenhagen 5,809,502 43,094
    Finland Helsinki 5,537,364 338,145
    Iceland Reykjavik 343,518 103,000
    Norway Oslo 5,372,191 323,802
    Sweden Stockholm 10,313,447 450,295
    Total 27,376,022
    - + @@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/test/tables/planets.html5 b/test/tables/planets.html5 index 99aa0b04c..e785329d8 100644 --- a/test/tables/planets.html5 +++ b/test/tables/planets.html5 @@ -1,7 +1,7 @@

    Data about the planets of our solar system.
    Name Mass (10^24kg)
    Terrestrial planets Mercury 0.3300 Closest to the Sun
    Venus 4.87 12,1040
    Earth 5.97 12,7561 Our world
    Mars 0.642 6,7922 The red planet
    Jovian planets Gas giants Jupiter67 The largest planet
    Saturn 568 120,53662
    Ice giants Uranus 86.827
    Neptune 102 49,52814
    Dwarf planets Pluto 0.0146
    - + @@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/test/tables/students.html4 b/test/tables/students.html4 index cbfffaa1e..1a6c8c474 100644 --- a/test/tables/students.html4 +++ b/test/tables/students.html4 @@ -5,49 +5,49 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/test/tables/students.html5 b/test/tables/students.html5 index a7e0127c8..b0bd6f609 100644 --- a/test/tables/students.html5 +++ b/test/tables/students.html5 @@ -5,49 +5,49 @@ - + - + - + - + - + - + - + - + - + - +

    Data about the planets of our solar system.
    Name Mass (10^24kg)
    Terrestrial planets Mercury 0.3300 Closest to the Sun
    Venus 4.87 12,1040
    Earth 5.97 12,7561 Our world
    Mars 0.642 6,7922 The red planet
    Jovian planets Gas giants Jupiter67 The largest planet
    Saturn 568 120,53662
    Ice giants Uranus 86.827
    Neptune 102 49,52814
    Dwarf planets Pluto 0.0146
    Student ID Name
    Computer Science
    3741255 Jones, Martha
    4077830 Pierce, Benjamin
    5151701 Kirk, James
    Russian Literature
    3971244 Nim, Victor
    Astrophysics
    4100332 Petrov, Alexandra
    4100332 Toyota, Hiroko
    Student ID Name
    Computer Science
    3741255 Jones, Martha
    4077830 Pierce, Benjamin
    5151701 Kirk, James
    Russian Literature
    3971244 Nim, Victor
    Astrophysics
    4100332 Petrov, Alexandra
    4100332 Toyota, Hiroko