Skip to content

Fix table renderer which including default alignment #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cebe merged 1 commit into from
Sep 26, 2016
Merged

Fix table renderer which including default alignment #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions block/TableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ protected function renderTable($block)
$first = true;
foreach($block['rows'] as $row) {
$this->_tableCellTag = $first ? 'th' : 'td';
$align = empty($this->_tableCellAlign[$this->_tableCellCount]) ? '' : ' align="' . $this->_tableCellAlign[$this->_tableCellCount++] . '"';
$align = empty($this->_tableCellAlign[$this->_tableCellCount]) ? '' : ' align="' . $this->_tableCellAlign[$this->_tableCellCount] . '"';
$this->_tableCellCount++;
$tds = "<$this->_tableCellTag$align>" . trim($this->renderAbsy($this->parseInline($row))) . "</$this->_tableCellTag>"; // TODO move this to the consume step
$content .= "<tr>$tds</tr>\n";
if ($first) {
Expand All @@ -109,7 +110,8 @@ protected function renderTable($block)
protected function parseTd($markdown)
{
if (isset($this->context[1]) && $this->context[1] === 'table') {
$align = empty($this->_tableCellAlign[$this->_tableCellCount]) ? '' : ' align="' . $this->_tableCellAlign[$this->_tableCellCount++] . '"';
$align = empty($this->_tableCellAlign[$this->_tableCellCount]) ? '' : ' align="' . $this->_tableCellAlign[$this->_tableCellCount] . '"';
$this->_tableCellCount++;
return [['text', "</$this->_tableCellTag><$this->_tableCellTag$align>"], isset($markdown[1]) && $markdown[1] === ' ' ? 2 : 1]; // TODO make a absy node
}
return [['text', $markdown[0]], 1];
Expand Down
8 changes: 4 additions & 4 deletions tests/extra-data/tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ <h2>Tables</h2>
</table>
<table>
<thead>
<tr><th align="left">Left-Aligned </th><th align="center">Center Aligned </th><th align="right">Right Aligned</th></tr>
<tr><th>Default-Align </th><th align="left">Left-Aligned </th><th align="center">Center Aligned </th><th align="right">Right Aligned</th></tr>
</thead>
<tbody>
<tr><td align="left">col 3 is </td><td align="center">some wordy text </td><td align="right">$1600</td></tr>
<tr><td align="left">col 2 is </td><td align="center">centered </td><td align="right"> $12</td></tr>
<tr><td align="left">zebra stripes </td><td align="center">are neat </td><td align="right"> $1</td></tr>
<tr><td>1 </td><td align="left">col 3 is </td><td align="center">some wordy text </td><td align="right">$1600</td></tr>
<tr><td>2 </td><td align="left">col 2 is </td><td align="center">centered </td><td align="right"> $12</td></tr>
<tr><td>3 </td><td align="left">zebra stripes </td><td align="center">are neat </td><td align="right"> $1</td></tr>
</tbody>
</table>
<table>
Expand Down
10 changes: 5 additions & 5 deletions tests/extra-data/tables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Content Cell | Content Cell
| Help | **Display the** help window.|
| Close | _Closes_ a window |

| Left-Aligned | Center Aligned | Right Aligned |
| :------------ |:---------------:| -----:|
| col 3 is | some wordy text | $1600 |
| col 2 is | centered | $12 |
| zebra stripes | are neat | $1 |
| Default-Align | Left-Aligned | Center Aligned | Right Aligned |
| ------------- | :------------ |:---------------:| -----:|
| 1 | col 3 is | some wordy text | $1600 |
| 2 | col 2 is | centered | $12 |
| 3 | zebra stripes | are neat | $1 |


Simple | Table
Expand Down
8 changes: 4 additions & 4 deletions tests/github-data/tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ <h2>Tables</h2>
</table>
<table>
<thead>
<tr><th align="left">Left-Aligned </th><th align="center">Center Aligned </th><th align="right">Right Aligned</th></tr>
<tr><th>Default-Align </th><th align="left">Left-Aligned </th><th align="center">Center Aligned </th><th align="right">Right Aligned</th></tr>
</thead>
<tbody>
<tr><td align="left">col 3 is </td><td align="center">some wordy text </td><td align="right">$1600</td></tr>
<tr><td align="left">col 2 is </td><td align="center">centered </td><td align="right"> $12</td></tr>
<tr><td align="left">zebra stripes </td><td align="center">are neat </td><td align="right"> $1</td></tr>
<tr><td>1 </td><td align="left">col 3 is </td><td align="center">some wordy text </td><td align="right">$1600</td></tr>
<tr><td>2 </td><td align="left">col 2 is </td><td align="center">centered </td><td align="right"> $12</td></tr>
<tr><td>3 </td><td align="left">zebra stripes </td><td align="center">are neat </td><td align="right"> $1</td></tr>
</tbody>
</table>
<table>
Expand Down
10 changes: 5 additions & 5 deletions tests/github-data/tables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Content Cell | Content Cell
| Help | **Display the** help window.|
| Close | _Closes_ a window |

| Left-Aligned | Center Aligned | Right Aligned |
| :------------ |:---------------:| -----:|
| col 3 is | some wordy text | $1600 |
| col 2 is | centered | $12 |
| zebra stripes | are neat | $1 |
| Default-Align | Left-Aligned | Center Aligned | Right Aligned |
| ------------- | :------------ |:---------------:| -----:|
| 1 | col 3 is | some wordy text | $1600 |
| 2 | col 2 is | centered | $12 |
| 3 | zebra stripes | are neat | $1 |


Simple | Table
Expand Down