From 2390e81c95d14d1c95763b6d7c7f48253f1b704b Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:24:06 -0300
Subject: [PATCH 1/7] =?UTF-8?q?Atualiza=20a=20vers=C3=A3o=20para=202.8.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packtools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packtools/version.py b/packtools/version.py
index 6c658fe8f..d095de839 100644
--- a/packtools/version.py
+++ b/packtools/version.py
@@ -1,5 +1,5 @@
 """Single source to the version across setup.py and the whole project.
 """
 from __future__ import unicode_literals
-__version__ = '2.8.2'
+__version__ = '2.8.3'
 

From 54c776dd62cfde68f773180a0f3de3e36d7ea389 Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:24:56 -0300
Subject: [PATCH 2/7] Acrescenta match por `math`, sem namespace

---
 packtools/catalogs/htmlgenerator/v2.0/article-text-mathml.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-mathml.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-mathml.xsl
index 4d40066ea..2b53131e6 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-mathml.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-mathml.xsl
@@ -5,7 +5,7 @@
     xmlns:mml="http://www.w3.org/1998/Math/MathML"
     exclude-result-prefixes="xlink mml"
     version="1.0">
-    <xsl:template match="mml:math">
+    <xsl:template match="mml:math | math">
         <xsl:copy-of select="."/>
     </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file

From dea4313bb322ef075c2bb0955ca05348bbc2f197 Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:38:39 -0300
Subject: [PATCH 3/7] =?UTF-8?q?Completa=20com=20os=20delimitadores=20da=20?=
 =?UTF-8?q?equa=C3=A7=C3=A3o=20de=20`tex-math`=20para=20que=20seja=20rende?=
 =?UTF-8?q?rizada=20corretamente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2.0/article-text-formula.xsl             | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-formula.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-formula.xsl
index 54e127a20..4d4f8badd 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-formula.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-formula.xsl
@@ -25,15 +25,34 @@
         <xsl:apply-templates select="alternatives" />
     </xsl:template>
 
-    <xsl:template match="tex-math">
+    <xsl:template match="inline-formula/tex-math | inline-formula/alternatives/tex-math">
+        <xsl:choose>
+            <xsl:when test="starts-with(.,'\begin') and contains(.,'\end')">
+                <xsl:value-of select="."/>
+            </xsl:when>
+            <xsl:when test="starts-with(.,'\(') and ends-with(.,'\)')">
+                <xsl:value-of select="."/>
+            </xsl:when>
+            <xsl:when test="starts-with(.,'$') and ends-with(.,'$')">
+                <xsl:value-of select="."/>
+            </xsl:when>
+            <xsl:otherwise>\(<xsl:value-of select="."/>\)</xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="disp-formula/tex-math | disp-formula/alternatives/tex-math">
         <span class="formula-body">
             <xsl:choose>
-                <xsl:when test="contains(.,'\begin{document}') and contains(.,'\end{document}')">
-                    <xsl:value-of select="substring-after(substring-before(.,'\end{document}'),'\begin{document}')"/>
+                <xsl:when test="starts-with(.,'\begin') and contains(.,'\end')">
+                    <xsl:value-of select="."/>
                 </xsl:when>
-                <xsl:otherwise>
+                <xsl:when test="starts-with(.,'\[') and ends-with(.,'\]')">
                     <xsl:value-of select="."/>
-                </xsl:otherwise>
+                </xsl:when>
+                <xsl:when test="starts-with(.,'$$') and ends-with(.,'$$')">
+                    <xsl:value-of select="."/>
+                </xsl:when>
+                <xsl:otherwise>\[<xsl:value-of select="."/>\]</xsl:otherwise>
             </xsl:choose>
         </span>
     </xsl:template>

From 40870dfd7b918abb78955ea6da522039e730d596 Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:40:31 -0300
Subject: [PATCH 4/7] =?UTF-8?q?Cria=20condi=C3=A7=C3=A3o=20para=20selecion?=
 =?UTF-8?q?ar=20entre=20tex-math=20ou=20mml:math?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2.0/article-text-alternatives.xsl        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-alternatives.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-alternatives.xsl
index 5e21224d1..0fdd99aec 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-alternatives.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-alternatives.xsl
@@ -7,6 +7,40 @@
     version="1.0">
 
     <xsl:template match="alternatives">
+        <!-- primeiro -->
+        <xsl:apply-templates select="*[1]"/>
+    </xsl:template>
+
+    <xsl:template match="disp-formula/alternatives | inline-formula/alternatives">
+        <xsl:choose>
+            <xsl:when test="$MATH_ELEM_PREFERENCE='tex-math' and tex-math">
+                <xsl:apply-templates select="tex-math" />
+            </xsl:when>
+            <xsl:when test="$MATH_ELEM_PREFERENCE='math' and math">
+                <xsl:apply-templates select="math" />
+            </xsl:when>
+            <xsl:when test="$MATH_ELEM_PREFERENCE='mml:math' and mml:math">
+                <xsl:apply-templates select="mml:math" />
+            </xsl:when>
+            <xsl:when test="tex-math">
+                <xsl:apply-templates select="tex-math" />
+            </xsl:when>
+            <xsl:when test="mml:math">
+                <xsl:apply-templates select="mml:math" />
+            </xsl:when>
+            <xsl:when test="math">
+                <xsl:apply-templates select="math" />
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="*[1]"></xsl:apply-templates>
+            </xsl:otherwise>
+        </xsl:choose>    
+    </xsl:template>
+
+    <xsl:template match="fig/alternatives">
+        <!-- 
+            Apresentar a imagem padrão 
+        -->
         <xsl:choose>
             <xsl:when test="inline-graphic[@specific-use='scielo-web']">
                 <xsl:apply-templates select="inline-graphic[@specific-use='scielo-web']" />

From 21f218a39e439ce5e902650090a69be58efc376b Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:41:45 -0300
Subject: [PATCH 5/7] =?UTF-8?q?Cria=20par=C3=A2metro=20para=20selecionar?=
 =?UTF-8?q?=20entre=20tex-math=20ou=20mml:math=20Cria=20par=C3=A2metro=20p?=
 =?UTF-8?q?ara=20selecionar=20o=20javascript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../catalogs/htmlgenerator/v2.0/config-vars.xsl | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/config-vars.xsl b/packtools/catalogs/htmlgenerator/v2.0/config-vars.xsl
index 04fa0d470..960879322 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/config-vars.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/config-vars.xsl
@@ -16,9 +16,24 @@
     <xsl:param name="legendary"></xsl:param>
     <xsl:param name="abbr_contrib"></xsl:param>
 
+    <xsl:param name="math_elem_preference" select="''"/>
+    <xsl:param name="math_js" select="''"/>
+
     <xsl:param name="output_style"/>
     
-    <xsl:variable name="MATHJAX">https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML</xsl:variable>
+    <xsl:variable name="MATH_ELEM_PREFERENCE">
+        <xsl:choose>
+            <xsl:when test="$math_elem_preference='mml:math'">mml:math</xsl:when>
+            <xsl:otherwise>tex-math</xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="MATHJAX">
+        <xsl:choose>
+            <xsl:when test="$math_js!=''"><xsl:value-of select="$math_js"/></xsl:when>
+            <xsl:otherwise>https://cdn.jsdelivr.net/npm/mathjax@3.0.0/es5/tex-chtml.js</xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+
     <xsl:variable name="ABBR_CONTRIB"><xsl:choose>
         <xsl:when test="$abbr_contrib!=''"><xsl:value-of select="$abbr_contrib"/></xsl:when>
         <xsl:otherwise>false</xsl:otherwise>

From e8353c3caba9f89847f5fb5657958400d92499da Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:51:31 -0300
Subject: [PATCH 6/7] =?UTF-8?q?Altera=20a=20inclus=C3=A3o=20do=20javascrip?=
 =?UTF-8?q?t=20que=20renderiza=20as=20f=C3=B3rmulas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../catalogs/htmlgenerator/v2.0/article.xsl      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packtools/catalogs/htmlgenerator/v2.0/article.xsl b/packtools/catalogs/htmlgenerator/v2.0/article.xsl
index 31b9de92d..c2fedd8a4 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article.xsl
@@ -187,9 +187,19 @@
                 <script src="{$JS_PATH}/js/min/main-min.js"/>
             </xsl:otherwise>
         </xsl:choose>
-        <xsl:if test=".//math or .//mml:math">
-            <script type="text/javascript"
-                    src="{$MATHJAX}">
+        <xsl:if test=".//tex-math or .//math or .//mml:math">
+            <script>
+            MathJax = {
+              tex: {
+                inlineMath: [['$', '$'], ['\\(', '\\)']]
+              },
+              svg: {
+                fontCache: 'global'
+              }
+            };
+            </script>
+            <script type="text/javascript" id="MathJax-script" async="true"
+              src="{$MATHJAX}">
             </script>
         </xsl:if>
     </xsl:template>

From 8ff2283a836503ed6868004dc6491ba358be209a Mon Sep 17 00:00:00 2001
From: Roberta Takenaka <roberta.takenaka@scielo.org>
Date: Thu, 3 Mar 2022 00:52:23 -0300
Subject: [PATCH 7/7] =?UTF-8?q?Troca=20a=20cor=20branca=20por=20preta=20do?=
 =?UTF-8?q?=20label=20da=20f=C3=B3rmula?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../htmlgenerator/static/scielo-article-standalone.css         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packtools/catalogs/htmlgenerator/static/scielo-article-standalone.css b/packtools/catalogs/htmlgenerator/static/scielo-article-standalone.css
index 7072ddf87..d66ed6585 100644
--- a/packtools/catalogs/htmlgenerator/static/scielo-article-standalone.css
+++ b/packtools/catalogs/htmlgenerator/static/scielo-article-standalone.css
@@ -8,4 +8,5 @@
     height: auto;
     min-height: 131px;
     display: block;
-}
\ No newline at end of file
+}
+.formula-container .label { color:  black;} 
\ No newline at end of file