-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #169 from doctrine/0.4.x-merge-up-into-0.5.x_GMXPuyGS
Merge release 0.4.4 into 0.5.x
- Loading branch information
Showing
7 changed files
with
109 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
tests/Functional/tests/code-block-diff/code-block-diff.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<pre><code class="diff">+ Added line | ||
- Removed line | ||
Normal line | ||
- Removed line | ||
+ Added line | ||
|
||
</code></pre> | ||
<pre><code class="diff"> Normal line | ||
+ Added line | ||
- Removed line | ||
Normal line | ||
- Removed line | ||
+ Added line | ||
</code></pre> |
18 changes: 18 additions & 0 deletions
18
tests/Functional/tests/code-block-diff/code-block-diff.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
|
||
.. code-block:: diff | ||
+ Added line | ||
- Removed line | ||
Normal line | ||
- Removed line | ||
+ Added line | ||
.. code-block:: diff | ||
Normal line | ||
+ Added line | ||
- Removed line | ||
Normal line | ||
- Removed line | ||
+ Added line |
21 changes: 21 additions & 0 deletions
21
tests/Functional/tests/table-simple-indented-header/table-simple-indented-header.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<table> | ||
<thead> | ||
<tr> | ||
<th>Col A</th> | ||
<th>Col B</th> | ||
<th>Col C</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<td>Col X</td> | ||
<td>Col Y</td> | ||
<td>Col Z</td> | ||
</tr> | ||
<tr> | ||
<td>Col U</td> | ||
<td>Col J</td> | ||
<td>Col K</td> | ||
</tr> | ||
</tbody> | ||
</table> |
7 changes: 7 additions & 0 deletions
7
.../Functional/tests/table-simple-indented-header/table-simple-indented-header.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
====== ===== ===== | ||
Col A Col B Col C | ||
====== ===== ===== | ||
Col X Col Y Col Z | ||
------ ----- ----- | ||
Col U Col J Col K | ||
====== ===== ===== |