Merge pull request #951 from phpDocumentor/backport/1.x/pr-944

[1.x] Fix Tex template name

packages/guides-theme-bootstrap/resources/template/body/directive/tabs/tabs-body.html.twig

@@ -1,3 +1,4 @@
 <div class="tab-pane fade {%- if tab.active %} show active{% endif -%}" id="{{ tab.key }}-{{ tabsId }}" role="tabpanel" aria-labelledby="{{ tab.key }}-tab-{{ tabsId }}">
     {{ renderNode(tab.value) }}
 </div>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/body/directive/tabs/tabs-button.html.twig

@@ -6,3 +6,4 @@
         {{ renderNode(tab.content) }}
     </button>
 </li>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/body/menu/mainmenu/menu-level.html.twig

@@ -1,17 +1,19 @@
 
 <ul class="level-{{ menuEntry.level }}">
-        {% for entry in menuEntry.children -%}
-                <li><a href="{{ renderLink(entry.url) }}"
-                       class="nav-link {%- if menu.currentPath == entry.url %} current {%- endif -%}{% if entry.url in menu.rootlinePaths %} active {%- endif -%}"
-                            {%- if menu.currentPath == entry.url %} aria-current="page" {%- endif -%} >
-                                {{ renderNode(entry.value.value) }}
-                        </a>
+    {% for entry in menuEntry.children -%}
+        <li>
+            <a href="{{ renderLink(entry.url) }}"
+               class="nav-link {%- if menu.currentPath == entry.url %} current {%- endif -%}{% if entry.url in menu.rootlinePaths %} active {%- endif -%}"
+                {%- if menu.currentPath == entry.url %} aria-current="page" {%- endif -%}>
+                    {{- renderNode(entry.value.value) -}}
+            </a>
 
-                        {%- if entry.children|length %}
-                                {% include "body/menu/mainmenu/menu-level.html.twig" with {
-                                        menuEntry:entry
-                                } %}
-                        {%- endif -%}
-                </li>
-        {% endfor %}
+            {%- if entry.children|length %}
+                    {% include "body/menu/mainmenu/menu-level.html.twig" with {
+                            menuEntry:entry
+                    } %}
+            {%- endif ~%}
+        </li>
+    {% endfor %}
 </ul>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/body/menu/mainmenu/menu.html.twig

@@ -1,23 +1,24 @@
 <nav class="nav flex-column">
-        {% if node.caption %}
-            <h2>{{ renderNode(node.caption) }}</h2>
-        {% endif %}
-        <ul class="menu-level-main">
-    {% for entry in node.menuEntries -%}
-        <li><a href="{{ renderLink(entry.url) }}"
-           class="nav-link {%- if node.currentPath == entry.url %} current {%- endif -%}{% if entry.url in node.rootlinePaths %} active {%- endif -%}"
-                        {%- if node.currentPath == entry.url %} aria-current="page" {% endif -%} >
-            {{ renderNode(entry.value.value) }}
-                </a>
+    {% if node.caption %}
+        <h2>{{ renderNode(node.caption) }}</h2>
+    {% endif %}
+    <ul class="menu-level-main">
+        {% for entry in node.menuEntries -%}
+        <li>
+            <a href="{{ renderLink(entry.url) }}"
+               class="nav-link {%- if node.currentPath == entry.url %} current {%- endif -%}{% if entry.url in node.rootlinePaths %} active {%- endif -%}"
+               {%- if node.currentPath == entry.url %} aria-current="page"{% endif -%}>
+                {{- renderNode(entry.value.value) -}}
+            </a>
 
-        {%- if entry.children|length %}
-            {% include "body/menu/mainmenu/menu-level.html.twig" with {
-                    menu:node,
-                    menuEntry:entry
-            } %}
-        {%- endif -%}
+            {%- if entry.children|length %}
+                {% include "body/menu/mainmenu/menu-level.html.twig" with {
+                        menu:node,
+                        menuEntry:entry
+                } %}
+            {%- endif ~%}
         </li>
-    {% endfor %}
-        </ul>
-
+        {% endfor %}
+    </ul>
 </nav>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/body/menu/navbar/menu-level.html.twig

@@ -1,13 +1,13 @@
+
 <ul class="level-{{ node.level }}">
     {% for entry in node.menuEntries -%}
-    {% apply spaceless %}
-        <li class="nav-item">
-            <a href="{{ renderLink(entry.url) }}"
-               class="nav-link  {%- if menu.currentPath == entry.url %} current {%- endif -%}{% if entry.url in menu.rootlinePaths %} active {%- endif -%}"
-                    {%- if menu.currentPath == entry.url %} aria-current="page" {% endif %} >
-                {{ renderNode(entry.value.value) }}
-            </a>
-        </li>
-        {% endapply %}
-    {%- endfor %}
+    <li class="nav-item">
+        <a href="{{ renderLink(entry.url) }}"
+           class="nav-link  {%- if menu.currentPath == entry.url %} current {%- endif -%}{% if entry.url in menu.rootlinePaths %} active {%- endif -%}"
+                {%- if menu.currentPath == entry.url %} aria-current="page"{% endif %}>
+            {{- renderNode(entry.value.value) -}}
+        </a>
+    </li>
+    {%~ endfor %}
 </ul>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/body/menu/navbar/table-of-content.html.twig

@@ -2,10 +2,10 @@
 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
     {% for entry in node.menuEntries -%}
         <li class="nav-item">
-                <a href="{{ renderLink(entry.url) }}" class="nav-link {%- if node.currentPath == entry.url %} current {%- endif -%}{% if entry.url in node.rootlinePaths %} active {%- endif -%}"
-                        {%- if node.currentPath == entry.url %} aria-current="page" {% endif %} >
-            {{ renderNode(entry.value.value) }}
-        </a>
+            <a href="{{ renderLink(entry.url) }}" class="nav-link {%- if node.currentPath == entry.url %} current {%- endif -%}{% if entry.url in node.rootlinePaths %} active {%- endif -%}"
+                    {%- if node.currentPath == entry.url %} aria-current="page"{% endif %}>
+                {{ renderNode(entry.value.value) }}
+            </a>
         </li>
 
         {%- if entry.children|length %}
@@ -16,3 +16,4 @@
         {%- endif -%}
     {% endfor %}
 </ul>
+{# force a new line at the end of the file #}

packages/guides-theme-bootstrap/resources/template/structure/navigation/navbar.html.twig

@@ -7,7 +7,6 @@
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
-
             {% if parts.navbar %}
                 {% for child in parts.navbar -%}
                     {{ renderNode(child) }}
@@ -18,3 +17,4 @@
         </div>
     </div>
 </nav>
+{# force a new line at the end of the file #}

packages/guides/resources/config/guides.php

@@ -57,6 +57,7 @@
 use phpDocumentor\Guides\Twig\EnvironmentBuilder;
 use phpDocumentor\Guides\Twig\GlobalMenuExtension;
 use phpDocumentor\Guides\Twig\Theme\ThemeManager;
+use phpDocumentor\Guides\Twig\TrimFilesystemLoader;
 use phpDocumentor\Guides\Twig\TwigTemplateRenderer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\DependencyInjection\Reference;
@@ -223,11 +224,12 @@
             param('phpdoc.guides.base_template_paths'),
         )
 
-        ->set(FilesystemLoader::class)
+        ->set(TrimFilesystemLoader::class)
         ->arg(
             '$paths',
             param('phpdoc.guides.base_template_paths'),
         )
+        ->alias(FilesystemLoader::class, TrimFilesystemLoader::class)
 
         ->set(LoadSettingsFromComposer::class)
         ->tag('event_listener', ['event' => PostProjectNodeCreated::class])

packages/guides/resources/template/html/body/admonition.html.twig

@@ -1,3 +1,4 @@
+
 <div class="admonition {{ name }}{{ class ? (' '~class) }}{% if node.classes %} {{ node.classesString }}{% endif %}">
     {% if title and isTitled %}<p class="admonition-title">{{ renderNode(title) }}</p>{% endif %}
     {% if title and not isTitled %}<p>{{ renderNode(title) }}</p>{% endif %}

packages/guides/resources/template/html/body/code.html.twig

@@ -12,4 +12,4 @@
                 {%- if node.emphasizeLines %} data-emphasize-lines="{{ node.emphasizeLines }}"{% endif -%}>
     {%- include "body/code/highlighted-code.html.twig" -%}
         </code></pre>
-{%- endif -%}
+{%~ endif -%}

packages/guides/resources/template/html/body/container.html.twig

@@ -1,3 +1,4 @@
 <div class="{{ class }}"{% if id is defined and id %} id="{{ id }}"{% endif %}>
     {{ renderNode(node) }}
 </div>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/body/definition-list.html.twig

@@ -16,7 +16,7 @@
         {% if definitionListTerm.children %}
             {%- for definition in definitionListTerm.children -%}
             <dd>{{ renderNode(definition) }}</dd>
-            {%- endfor -%}
+            {%- endfor ~%}
         {% endif %}
     {% endfor %}
 </dl>

packages/guides/resources/template/html/body/list/list.html.twig

@@ -9,3 +9,4 @@
     {{ renderNode(child) }}
 {% endfor %}
 </{{ keyword }}>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/body/menu/menu-item.html.twig

@@ -1,16 +1,17 @@
-<li class="toc-item {%- if node.isCurrent %} current{% endif -%} {%- if node.isInRootline %} active{% endif -%}"><a href="{{ url }}">{{ node.value.toString }}</a>
-    {%- if node.children|length %}
+<li class="toc-item {%- if node.isCurrent %} current{% endif -%} {%- if node.isInRootline %} active{% endif -%}">
+    <a href="{{ url }}">{{ node.value.toString }}</a>
+    {%~ if node.children|length %}
         <ul class="menu-level-{{ node.level }}">
             {% for child in node.children -%}
                 {{ renderNode(child) }}
             {% endfor %}
         </ul>
-    {%- endif -%}
-    {%- if node.sections|length %}
+    {%- endif ~%}
+    {%~ if node.sections|length %}
         <ul class="section-level-{{ node.level }}">
             {% for subsection in node.sections -%}
                 {{ renderNode(subsection) }}
             {% endfor %}
         </ul>
-    {%- endif -%}
+    {%- endif ~%}
 </li>

packages/guides/resources/template/html/body/menu/menu-level.html.twig

@@ -3,3 +3,4 @@
         {{ renderNode(entry) }}
     {% endfor %}
 </ul>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/body/paragraph.html.twig

@@ -1,7 +1,5 @@
-{% apply spaceless %}
-    {% set text = renderNode(node.value) %}
+{% set text = renderNode(node.value) %}
 
-    {% if text %}
-        <p{% if node.classes %} class="{{ node.classesString }}"{% endif %}>{{ text|raw }}</p>
-    {% endif %}
-{% endapply %}
+{% if text %}
+    <p{% if node.classes %} class="{{ node.classesString }}"{% endif %}>{{ text|raw }}</p>
+{% endif %}

packages/guides/resources/template/html/body/quote.html.twig

@@ -1 +1 @@
-<blockquote{% if node.classes %} class="{{ node.classesString }}"{% endif %}>{{ renderNode(node.value) }}</blockquote>
+<blockquote{% if node.classes %} class="{{ node.classesString }}"{% endif %}>{{- renderNode(node.value) -}}</blockquote>

packages/guides/resources/template/html/body/table/table-body.html.twig

@@ -3,3 +3,4 @@
     {% include "body/table/table-row.html.twig" %}
 {% endfor %}
 </tbody>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/body/table/table-cell.html.twig

@@ -2,3 +2,4 @@
     {%- for child in column.children -%}
         {{- renderNode(child) -}}
     {%- else %}&nbsp;{% endfor %}</td>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/body/table/table-row.html.twig

@@ -3,3 +3,4 @@
         {% include "body/table/table-cell.html.twig" %}
     {% endfor %}
 </tr>
+{# force a new line at the end of the file #}

packages/guides/resources/template/html/inline/anchor.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <a id="{{- node.value -}}"></a>
-{% endapply %}

packages/guides/resources/template/html/inline/doc.html.twig

@@ -1 +1 @@
-{% apply spaceless %}{{ include('inline/link.html.twig') }}{% endapply %}
+{{- include('inline/link.html.twig') -}}

packages/guides/resources/template/html/inline/emphasis.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <em>{{- node.value -}}</em>
-{% endapply %}

packages/guides/resources/template/html/inline/image.html.twig

@@ -1,2 +1 @@
-{% apply spaceless %}<img src="{{- node.url -}}" alt="{{- node.altText -}}"/>
-{% endapply %}
+<img src="{{- node.url -}}" alt="{{- node.altText -}}"/>

packages/guides/resources/template/html/inline/literal.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <code>{{- node.value -}}</code>
-{% endapply %}

packages/guides/resources/template/html/inline/nbsp.html.twig

@@ -1 +1 @@
-{% apply spaceless %} {% endapply %}
+ 

packages/guides/resources/template/html/inline/newline.html.twig

@@ -1 +1 @@
-{% apply spaceless %}<br>{% endapply %}
+<br>

packages/guides/resources/template/html/inline/ref.html.twig

@@ -1 +1 @@
-{% apply spaceless %}{{ include('inline/link.html.twig') }}{% endapply %}
+{{- include('inline/link.html.twig') -}}

packages/guides/resources/template/html/inline/strong.html.twig

@@ -1,2 +1 @@
-{% apply spaceless %}<strong>{{- node.value -}}</strong>
-{% endapply %}
+<strong>{{- node.value -}}</strong>

packages/guides/resources/template/html/inline/textroles/abbreviation.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <abbr title="{{ node.definition }}"{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.term }}</abbr>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/aspect.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <em class="aspect{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</em>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/br.html.twig

@@ -1 +1 @@
-{%- apply spaceless %}<br/>{% endapply -%}
+<br/>

packages/guides/resources/template/html/inline/textroles/code.html.twig

@@ -1,4 +1 @@
-{% apply spaceless %}
 <code{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</code>
-
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/command.html.twig

@@ -1,4 +1 @@
-{% apply spaceless %}
 <strong class="command{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</strong>
-
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/dfn.html.twig

@@ -1,4 +1 @@
-{% apply spaceless %}
 <em class="dfn{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</em>
-
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/emphasis.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <em{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</em>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/file.html.twig

@@ -1,4 +1 @@
-{% apply spaceless %}
 <span class="pre file{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</span>
-
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/guilabel.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <span class="guilabel{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</span>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/kbd.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <kbd{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</kbd>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/literal.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <code{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</code>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/mailheader.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <em class="mailheader{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</em>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/math.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <math{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</math>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/span.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <span{%- if node.class %} class="{{ node.class }}"{% endif %}>{{- node.value -}}</span>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/strong.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <strong{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</strong>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/sub.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <sub{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</sub>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/subscript.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <sub{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</sub>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/sup.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <sup{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</sup>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/superscript.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <sup{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</sup>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/t.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <cite{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</cite>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/title-reference.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <cite{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</cite>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/title.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <cite{%- if node.class %} class="{{ node.class }}"{% endif %}>{{ node.value }}</cite>
-{% endapply %}

packages/guides/resources/template/html/inline/textroles/unknown.html.twig

@@ -1,3 +1 @@
-{% apply spaceless %}
 <code class="{{ node.type }}{%- if node.class %} {{ node.class }}{% endif %}">{{ node.value }}</code>
-{% endapply %}

packages/guides/resources/template/html/inline/variable.html.twig

@@ -1,2 +1 @@
-{% apply spaceless %}{{ renderNode(node.child) }}
-{% endapply %}
+{{- renderNode(node.child) -}}

packages/guides/resources/template/tex/body/paragraph.tex.twig

@@ -1,8 +1,5 @@
-{% apply spaceless %}
-{% set text = renderNode(node.value) %}
+{%- set text = renderNode(node.value) -%}
 
-{% if text|trim %}
-{{ text|raw }}
-
-{% endif %}
-{% endapply %}
+{%- if text|trim %}
+    {{- text|raw -}}
+{% endif -%}