Fix bug where markdown does not render correctly when including a fragment that is variable

packages/cli/test/functional/test_site/expected/index.html

@@ -370,9 +370,11 @@ <h4 id="focus-groups"><span id="focus-groups" class="anchor"></span>Focus groups
               resolved or clarified as necessary.</p>
           </div>
           <p><strong>Include segment</strong></p>
-          <div>Requirements gathering, requirements elicitation, requirements analysis,
-            requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
-            of understanding what a software product should do.</div>
+          <div>
+            <p>Requirements gathering, requirements elicitation, requirements analysis,
+              requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
+              of understanding what a software product should do.</p>
+          </div>
           <p><strong>Boilerplate include</strong></p>
           <div name="Boilerplate Referencing">
             <panel src="/test_site/requirements/UserStories._include_.html" no-close><template #header>
@@ -456,8 +458,7 @@ <h2 id="feature-list"><span id="feature-list" class="anchor"></span>Feature list
               <pic src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></pic>
             </div>
           </div>
-          <div>
-            <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png">
+          <div> <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png">
             <pic src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></pic>
           </div>
           <p><strong>Include nested sub-site directly</strong></p>
@@ -490,45 +491,47 @@ <h2 id="feature-list"><span id="feature-list" class="anchor"></span>Feature list
             </div>
           </box>
           <p><strong>Include a file using baseUrl</strong></p>
-          <div>As we establish requirements, they should be recorded in some way for future reference,
-            usually called a requirement specification. Furthermore, it is advisable to show these requirements to stakeholders,
-            and refine requirements based on their feedback. The next phase is to convert requirements into a product
-            specification that specifies how the product will address the requirements. </div>
+          <div>
+            <p>As we establish requirements, they should be recorded in some way for future reference,
+              usually called a requirement specification. Furthermore, it is advisable to show these requirements to stakeholders,
+              and refine requirements based on their feedback. The next phase is to convert requirements into a product
+              specification that specifies how the product will address the requirements.</p>
+          </div>
           <panel src="/test_site/requirements/SpecifyingRequirements._include_.html#preview" type="minimal" fragment="preview"><template #header>
               <p><strong>same test with panels</strong></p>
             </template></panel>
           <p><strong>Include a file in a sub-folder that uses baseUrl</strong></p>
           <div>
-            <div>Requirements gathering, requirements elicitation, requirements analysis,
-              requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
-              of understanding what a software product should do.</div>
+            <div>
+              <p>Requirements gathering, requirements elicitation, requirements analysis,
+                requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
+                of understanding what a software product should do.</p>
+            </div>
           </div>
           <panel src="/test_site/requirements/testBaseUrlInIncludeSrc._include_.html" type="minimal"><template #header>
               <p><strong>same test with panels</strong></p>
             </template></panel>
           <p><strong>Include a file in a sub-folder that uses baseUrl using baseUrl</strong></p>
           <div>
-            <div>Requirements gathering, requirements elicitation, requirements analysis,
-              requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
-              of understanding what a software product should do.</div>
+            <div>
+              <p>Requirements gathering, requirements elicitation, requirements analysis,
+                requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
+                of understanding what a software product should do.</p>
+            </div>
           </div>
           <panel src="/test_site/requirements/testBaseUrlInIncludeSrc._include_.html" type="minimal"><template #header>
               <p><strong>same test with panels</strong></p>
             </template></panel>
           <p><strong>Include a file in a sub-site that uses baseUrl</strong></p>
           <div>
-            <div>
-              <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png">
-            </div>
+            <div><img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></div>
           </div>
           <panel src="/test_site/sub_site/testBaseUrlInIncludeSrcSubSite._include_.html" type="minimal"><template #header>
               <p><strong>same test with panels</strong></p>
             </template></panel>
           <p><strong>Include a file in a sub-site that uses baseUrl using baseUrl</strong></p>
           <div>
-            <div>
-              <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png">
-            </div>
+            <div><img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></div>
           </div>
           <panel src="/test_site/sub_site/testBaseUrlInIncludeSrcSubSite._include_.html" type="minimal"><template #header>
               <p><strong>same test with panels</strong></p>
@@ -805,8 +808,7 @@ <h6 class="always-index" id="level-6-header-outside-headingsearchindex-with-alwa
             <a class="nav-link py-1" href="#panel-without-heading-with-keyword" v-pre>Panel without heading with keyword&#x200E;</a>
             <a class="nav-link py-1" href="#keyword-should-be-tagged-to-this-heading-not-the-panel-heading" v-pre>Keyword should be tagged to this heading, not the panel heading&#x200E;</a>
             <a class="nav-link py-1" href="#panel-with-heading-with-keyword" v-pre>Panel with heading with keyword&#x200E;</a>
-            <a class="nav-link py-1" href="#heading-fragment-with-leading-spaces-and-newline" v-pre>Heading
-              Fragment with leading spaces and newline
+            <a class="nav-link py-1" href="#heading-fragment-with-leading-spaces-and-newline" v-pre>Heading Fragment with leading spaces and newline
               &#x200E;</a>
             <a class="nav-link py-1" href="#heading-with-included-keyword" v-pre>Heading with included keyword&#x200E;</a>
             <a class="nav-link py-1" href="#included-heading" v-pre>Included Heading&#x200E;</a>

packages/cli/test/functional/test_site/expected/requirements/testBaseUrlInIncludeSrc._include_.html

@@ -1,3 +1,5 @@
-<div>Requirements gathering, requirements elicitation, requirements analysis,
-  requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
-  of understanding what a software product should do.</div>
+<div>
+  <p>Requirements gathering, requirements elicitation, requirements analysis,
+    requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
+    of understanding what a software product should do.</p>
+</div>

packages/cli/test/functional/test_site/expected/siteData.json

@@ -36,7 +36,7 @@
         "feature-list": "Feature list",
         "heading-with-multiple-keywords": "Heading with multiple keywords",
         "heading-with-keyword-in-panel": "Heading with keyword in panel",
-        "heading-fragment-with-leading-spaces-and-newline": "Heading \nFragment with leading spaces and newline\n",
+        "heading-fragment-with-leading-spaces-and-newline": "Heading Fragment with leading spaces and newline\n",
         "heading-with-included-keyword": "Heading with included keyword",
         "included-heading": "Included Heading",
         "heading-with-nested-keyword": "Heading with nested keyword",

packages/cli/test/functional/test_site/expected/sub_site/testBaseUrlInIncludeSrcSubSite._include_.html

@@ -1,3 +1 @@
-<div>
-  <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png">
-</div>
+<div><img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></div>

packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html

@@ -210,9 +210,11 @@ <h3 id="testing-site-nav"><span id="testing-site-nav" class="anchor"></span>Test
         <p><strong>For modals with non-unique id, only the first modal will be shown</strong></p>
         <div>
           <modal large id="modal:bugRepro"><template #header>Establishing Requirements</template>
-            <div>Requirements gathering, requirements elicitation, requirements analysis,
-              requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
-              of understanding what a software product should do.</div>
+            <div>
+              <p>Requirements gathering, requirements elicitation, requirements analysis,
+                requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
+                of understanding what a software product should do.</p>
+            </div>
           </modal>
         </div>
         <div>