Skip to content

Commit

Permalink
Merge pull request #131 from doctrine/0.2.x-merge-up-into-1.0.x_603e8…
Browse files Browse the repository at this point in the history
…dc4c4b682.86346258

Merge release 0.2.0 into 1.0.x
  • Loading branch information
greg0ire authored Mar 7, 2021
2 parents 10a5e33 + 6517cbc commit e92fb09
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 17 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"php": "^7.1 || ^8.0",
"symfony/filesystem": "^4.1 || ^5.0",
"symfony/finder": "^4.1 || ^5.0",
"twig/twig": "^2.5",
"twig/twig": "^2.9.0",
"twig/twig": "^2.9 || ^3.3",
"doctrine/event-manager": "^1.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion docs/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ You can install the Doctrine RST Parser with composer:

.. code-block:: console
$ composer install doctrine/rst-parser
$ composer require doctrine/rst-parser
Basic Usage
-----------
Expand Down
4 changes: 0 additions & 4 deletions lib/Nodes/TableNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,6 @@ private function compilePrettyTable(): void
}

if ($currentColumnStart !== null) {
if ($previousColumnEnd === null) {
throw new LogicException('The previous column end is not set yet');
}

$gapText = substr($line, $previousColumnEnd, $start - $previousColumnEnd);
if (strpos($gapText, '|') === false && strpos($gapText, '+') === false) {
// text continued through the "gap". This is a colspan
Expand Down
4 changes: 2 additions & 2 deletions lib/Templates/default/html/definition-list.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% spaceless %}
{% apply spaceless %}
<dl{% if definitionListNode.classes %} class="{{ definitionListNode.classesString }}"{% endif %}>
{% for definitionListTerm in definitionList.terms %}
{% if definitionListTerm.classifiers is empty %}
Expand Down Expand Up @@ -31,4 +31,4 @@
{% endif %}
{% endfor %}
</dl>
{% endspaceless %}
{% endapply %}
4 changes: 2 additions & 2 deletions lib/Templates/default/html/figure.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% spaceless %}
{% apply spaceless %}
<figure>
{{ figureNode.image.render()|raw }}

Expand All @@ -10,4 +10,4 @@
{% endif %}
{% endif %}
</figure>
{% endspaceless %}
{% endapply %}
4 changes: 2 additions & 2 deletions lib/Templates/default/html/toc-level.html.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% spaceless %}
{% apply spaceless %}
<ul>
{% for tocItem in tocItems %}
{% include "toc-item.html.twig" %}
{% endfor %}
</ul>
{% endspaceless %}
{% endapply %}
4 changes: 2 additions & 2 deletions lib/Templates/default/html/toc.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% spaceless %}
{% apply spaceless %}
<div class="toc">
{% include "toc-level.html.twig" %}
</div>
{% endspaceless %}
{% endapply %}
4 changes: 2 additions & 2 deletions lib/Templates/default/tex/paragraph.tex.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% spaceless %}
{% apply spaceless %}
{% set text = paragraphNode.value.render() %}

{% if text|trim %}
{{ text|raw }}

{% endif %}
{% endspaceless %}
{% endapply %}

0 comments on commit e92fb09

Please sign in to comment.