From 832ce1e5fec62ac8c95cf18c95183530ae02e8fc Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <505143+robertatakenaka@users.noreply.github.com>
Date: Thu, 16 May 2024 14:17:39 -0300
Subject: [PATCH] =?UTF-8?q?Corrige=20gera=C3=A7=C3=A3o=20das=20=C3=A2ncora?=
 =?UTF-8?q?s=20do=20menu=20esquerdo=20da=20p=C3=A1gina=20do=20artigo=20par?=
 =?UTF-8?q?a=20layout=20v3.0=20(#616)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Corrige geração das âncoras do menu esquerdo da página do artigo para o layout v2.0

* Adiciona comentário para manter class='articleSection' e data-anchor='título da seção no menu' nos arquivos v3.0
---
 .../catalogs/htmlgenerator/v2.0/article-meta-abstract.xsl   | 2 ++
 packtools/catalogs/htmlgenerator/v2.0/article-text-back.xsl | 6 +++++-
 packtools/catalogs/htmlgenerator/v2.0/article-text-fn.xsl   | 2 ++
 .../v2.0/article-text-section-data-availability.xsl         | 1 +
 .../htmlgenerator/v2.0/article-text-sub-article.xsl         | 1 +
 packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl | 2 +-
 packtools/catalogs/htmlgenerator/v2.0/article-text.xsl      | 1 +
 packtools/catalogs/htmlgenerator/v2.0/generic-history.xsl   | 1 +
 packtools/catalogs/htmlgenerator/v2.0/generic-pub-date.xsl  | 1 +
 .../catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl   | 3 ++-
 packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl  | 1 +
 .../v3.0/article-text-section-data-availability.xsl         | 1 +
 packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl   | 1 +
 packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl  | 1 +
 14 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-meta-abstract.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-meta-abstract.xsl
index ca7611699..405222ed2 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-meta-abstract.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-meta-abstract.xsl
@@ -129,6 +129,7 @@
 
     <xsl:template match="article" mode="create-anchor-and-title-for-abstracts-without-title-div-h-number">
         <xsl:param name="title"/>
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection" data-anchor="{$title}">
             <h1 class="articleSectionTitle"><xsl:value-of select="$title"/></h1>
         </div>
@@ -191,6 +192,7 @@
         <!-- Apresenta a âncora e o título, ou seja, Abstract, Resumo, ou Resumen -->
 
         <!-- âncora -->
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <xsl:attribute name="class">articleSection</xsl:attribute>
         <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="title"/></xsl:attribute>
         <xsl:if test="@xml:lang='ar'">
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-back.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-back.xsl
index 21a6451af..969425f71 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-back.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-back.xsl
@@ -85,6 +85,8 @@
 
     <xsl:template match="*" mode="back-section-menu">
         <xsl:if test="title or label">
+            <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
+            <xsl:attribute name="class">articleSection</xsl:attribute>
             <xsl:attribute name="data-anchor">
                 <xsl:apply-templates select="label"/>
                 <xsl:if test="label and title">&#160;</xsl:if>
@@ -97,6 +99,8 @@
         <xsl:variable name="name" select="name()"/>
         <!-- cria menu somente para o primeiro ref-list (há casos de série de ref-list) -->
         <xsl:if test="not(preceding-sibling::node()) or preceding-sibling::*[1][name()!=$name]">
+            <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
+            <xsl:attribute name="class">articleSection</xsl:attribute>
             <xsl:attribute name="data-anchor">
                 <xsl:apply-templates select="." mode="text-labels">
                     <xsl:with-param name="text">ref-list</xsl:with-param>
@@ -116,7 +120,7 @@
     </xsl:template>
         
     <xsl:template match="*" mode="back-section">
-        <div class="articleSection">
+        <div>
             <xsl:apply-templates select="." mode="back-section-menu"/>
             <xsl:apply-templates select="." mode="back-section-h"/>
             <xsl:apply-templates select="." mode="back-section-content"/>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-fn.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-fn.xsl
index 860f405aa..a40404e75 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-fn.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-fn.xsl
@@ -121,6 +121,8 @@
         Evita que no menu apareça o mesmo título mais de uma vez 
         -->
         <xsl:if test="not(preceding-sibling::node()) or preceding-sibling::*[1][not(@fn-type)] or preceding-sibling::*[1][@fn-type!=$name]">
+            <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
+            <xsl:attribute name="class">articleSection</xsl:attribute>
             <xsl:attribute name="data-anchor">
                 <xsl:apply-templates select="." mode="text-labels">
                     <xsl:with-param name="text"><xsl:value-of select="@fn-type"/></xsl:with-param>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-section-data-availability.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-section-data-availability.xsl
index eb4753949..36a650fa5 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-section-data-availability.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-section-data-availability.xsl
@@ -41,6 +41,7 @@
                 <xsl:with-param name="text">Data availability</xsl:with-param>
             </xsl:apply-templates>
         </xsl:variable>
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
             <xsl:attribute name="data-anchor"><xsl:value-of select="$title"/></xsl:attribute>
             <h1 class="articleSectionTitle"><xsl:value-of select="$title"/></h1>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-sub-article.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-sub-article.xsl
index 215b58ec7..3ed88bfb5 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-sub-article.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-sub-article.xsl
@@ -77,6 +77,7 @@
 
     <xsl:template match="title-group" mode="sub-article-not-translation-component">
         <!-- Apresentação padrão de um compontente do Bloco do sub-article (not translation) ou response -->
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
             <xsl:attribute name="data-anchor">
                 <xsl:apply-templates select=".//article-title"/>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl
index 11139ec6e..997cf4222 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl
@@ -41,7 +41,7 @@
         <xsl:variable name="id"><xsl:value-of select="@rid"/></xsl:variable>
         <xsl:variable name="text"><xsl:apply-templates select=".//text()"/></xsl:variable>
         <xsl:variable name="elem"><xsl:choose>
-            <xsl:when test="contains('1234567890',substring(normalize-space($text),1,1))">sup</xsl:when>
+            <xsl:when test="$article//ref/label">sup</xsl:when>
             <xsl:otherwise>strong</xsl:otherwise>
         </xsl:choose></xsl:variable>
         <!--
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text.xsl
index 06fa1ec41..799cb0203 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text.xsl
@@ -40,6 +40,7 @@
         <xsl:param name="alt_title"></xsl:param>
         <div>
             <xsl:if test="$alt_title!=''">
+                <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
                 <xsl:attribute name="class">articleSection</xsl:attribute>
                 <xsl:attribute name="data-anchor"><xsl:value-of select="$alt_title"/></xsl:attribute>
             </xsl:if>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/generic-history.xsl b/packtools/catalogs/htmlgenerator/v2.0/generic-history.xsl
index bd6b7ea86..16c7830c9 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/generic-history.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/generic-history.xsl
@@ -19,6 +19,7 @@
     </xsl:template>
 
     <xsl:template match="history" mode="history-section">
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
             <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
                 <xsl:with-param name="text">History</xsl:with-param>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/generic-pub-date.xsl b/packtools/catalogs/htmlgenerator/v2.0/generic-pub-date.xsl
index 57b749369..8e63e716d 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/generic-pub-date.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/generic-pub-date.xsl
@@ -4,6 +4,7 @@
 
     <xsl:template match="article-meta | sub-article | response" mode="generic-pub-date">
        <xsl:if test=".//pub-date">
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
              <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
                  <xsl:with-param name="text">Publication Dates</xsl:with-param>
diff --git a/packtools/catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl b/packtools/catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl
index d8d031fb2..93abc4025 100644
--- a/packtools/catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl
+++ b/packtools/catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl
@@ -7,6 +7,7 @@
 
     <xsl:template match="article" mode="create-anchor-and-title-for-abstracts-without-title-div-h-number">
         <xsl:param name="title"/>
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection" data-anchor="{$title}">
             <h3 class="articleSectionTitle"><xsl:value-of select="$title"/></h3>
         </div>
@@ -21,7 +22,7 @@
 
         <xsl:if test="not($gs_abstract_lang)">
             <!-- âncora -->
-
+            <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
             <xsl:variable name="title"><xsl:apply-templates select="." mode="title"/></xsl:variable>
             <xsl:attribute name="class">articleSection articleSection--<xsl:value-of select="translate($title,'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"/></xsl:attribute>
             <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="title"/></xsl:attribute>
diff --git a/packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl b/packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl
index 131681018..d84d0067e 100644
--- a/packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl
+++ b/packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl
@@ -16,6 +16,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <div>
+                    <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
                     <xsl:attribute name="class">articleSection</xsl:attribute>
                     <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="title"/></xsl:attribute>
                     <h3>
diff --git a/packtools/catalogs/htmlgenerator/v3.0/article-text-section-data-availability.xsl b/packtools/catalogs/htmlgenerator/v3.0/article-text-section-data-availability.xsl
index 1af01a60f..cd30bf946 100644
--- a/packtools/catalogs/htmlgenerator/v3.0/article-text-section-data-availability.xsl
+++ b/packtools/catalogs/htmlgenerator/v3.0/article-text-section-data-availability.xsl
@@ -11,6 +11,7 @@
                 <xsl:with-param name="text">Data availability</xsl:with-param>
             </xsl:apply-templates>
         </xsl:variable>
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
             <xsl:attribute name="data-anchor"><xsl:value-of select="$title"/></xsl:attribute>
             <h3 class="articleSectionTitle"><xsl:value-of select="$title"/></h3>
diff --git a/packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl b/packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl
index a8afe38ed..ad2622f21 100644
--- a/packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl
+++ b/packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl
@@ -6,6 +6,7 @@
     <xsl:include href="../v2.0/generic-history.xsl"/>
 
     <xsl:template match="history" mode="history-section">
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
             <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
                 <xsl:with-param name="text">History</xsl:with-param>
diff --git a/packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl b/packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl
index b6efdad31..ecedea161 100644
--- a/packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl
+++ b/packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl
@@ -7,6 +7,7 @@
 
     <xsl:template match="article-meta | sub-article | response" mode="generic-pub-date">
        <xsl:if test=".//pub-date">
+        <!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
         <div class="articleSection">
              <xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
                  <xsl:with-param name="text">Publication Dates</xsl:with-param>