[Libreoffice-commits] help.git: help3xsl/online_transform.xsl source/text

[Olivier Hallot (via logerrit)]

 help3xsl/online_transform.xsl      |    2 +-
 source/text/shared/00/00000002.xhp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 05ca41502856e01755d7de748789cdfefd5e6d16
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Nov 10 13:16:14 2022 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Nov 10 18:05:52 2022 +0100

    tdf#150909 Fix regression: HTML entities badly rendered
    
    The "branding" XSL template is applied to every text in the Help to
    replace %PRODUCTNAME or [$officename] by the correct product name.
    It must not escape HTML entities such as &lt; or other.
    
    Reverted previous workaround in xhp page.
    
    Change-Id: I1f7da19ca2899d92917504f162ba497bd9c787bb
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142555
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 6176574c33..c398e97a5e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -900,7 +900,7 @@
         </xsl:when>
 
         <xsl:otherwise>
-            <xsl:value-of disable-output-escaping="yes" select="$string"/>
+            <xsl:value-of select="$string"/>
         </xsl:otherwise>
     </xsl:choose>
 
diff --git a/source/text/shared/00/00000002.xhp 
b/source/text/shared/00/00000002.xhp
index b54a974f98..0cfbc9b60a 100644
--- a/source/text/shared/00/00000002.xhp
+++ b/source/text/shared/00/00000002.xhp
@@ -190,7 +190,7 @@
 
 
 <h2 id="hd_id3150751" xml-lang="en-US">Tags</h2>
-<paragraph id="par_id3156360" role="paragraph" xml-lang="en-US"><link 
href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> pages contain 
certain structural and formatting instructions called tags. Tags are code words 
enclosed by brackets in the document description language HTML. Many tags 
contain text or hyperlink references between the opening and closing brackets. 
For example, titles are marked by the tags &lt; h1 &gt; at the beginning and 
&lt; /h1 &gt; at the end of the title. Some tags only appear on their own such 
as &lt; br &gt; for a line break or &lt; img ... &gt; to link a 
graphic.</paragraph>
+<paragraph id="par_id3156360" role="paragraph" xml-lang="en-US"><link 
href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> pages contain 
certain structural and formatting instructions called tags. Tags are code words 
enclosed by brackets in the document description language HTML. Many tags 
contain text or hyperlink references between the opening and closing brackets. 
For example, titles are marked by the tags &lt;h1&gt; at the beginning and 
&lt;/h1&gt; at the end of the title. Some tags only appear on their own such as 
&lt;br&gt; for a line break or &lt;img ...&gt; to link a graphic.</paragraph>
 </section>
 
 <section id="url">