[libreoffice/f16] Resolves: rhbz#533318 smath does not handle accents in MathML

[Caolán McNamara]

commit ef21d6a0d2443cb9234398e365d9bb213143d65c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 6 11:25:08 2012 +0000

    Resolves: rhbz#533318 smath does not handle accents in MathML

 0001-smath-does-not-handle-accents-in-MathML.patch |   72 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/0001-smath-does-not-handle-accents-in-MathML.patch b/0001-smath-does-not-handle-accents-in-MathML.patch
new file mode 100644
index 0000000..3805353
--- /dev/null
+++ b/0001-smath-does-not-handle-accents-in-MathML.patch
@@ -0,0 +1,72 @@
+From b90ac7d682fd65f75eff4225d871130c0ae9f185 Mon Sep 17 00:00:00 2001
+From: Joshua Cogliati <jjcogliati-r1 at yahoo.com>
+Date: Fri, 6 Jan 2012 10:48:01 +0000
+Subject: [PATCH] smath does not handle accents in MathML
+
+---
+ starmath/source/node.cxx |   36 ++++++++++++++++++++++++++++++++----
+ 1 files changed, 32 insertions(+), 4 deletions(-)
+
+diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
+index 58010e7..d5866cd 100644
+--- a/starmath/source/node.cxx
++++ b/starmath/source/node.cxx
+@@ -2821,23 +2821,51 @@ void SmAttributNode::CreateTextFromNode(String &rText)
+             nLast = aStr.GetChar(0);
+             switch (nLast)
+             {
+-            case 0xAF:
++            case 0xAF: // MACRON
+                 APPEND(rText,"overline ");
+                 break;
+-            case 0x2d9:
++            case 0x2d9: // DOT ABOVE
+                 APPEND(rText,"dot ");
+                 break;
+-            case 0x2dc:
++            case 0x2dc: // SMALL TILDE
+                 APPEND(rText,"widetilde ");
+                 break;
+-            case 0xA8:
++            case 0xA8: // DIAERESIS
+                 APPEND(rText,"ddot ");
+                 break;
+             case 0xE082:
+                 break;
+             case 0xE09B:
++            case 0x20DB: // COMBINING THREE DOTS ABOVE
+                 APPEND(rText,"dddot ");
+                 break;
++            case 0x301: // COMBINING ACUTE ACCENT
++                APPEND(rText,"acute ");
++                break;
++            case 0x300: // COMBINING GRAVE ACCENT
++                APPEND(rText,"grave ");
++                break;
++            case 0x30C: // COMBINING CARON
++                APPEND(rText,"check ");
++                break;
++            case 0x306: // COMBINING BREVE
++                APPEND(rText,"breve ");
++                break;
++            case 0x30A: // COMBINING RING ABOVE
++                APPEND(rText,"circle ");
++                break;
++            case 0x20D7: // COMBINING RIGHT ARROW ABOVE
++                APPEND(rText,"vec ");
++                break;
++            case 0x303: // COMBINING TILDE
++                APPEND(rText,"tilde ");
++                break;
++            case 0x302: // COMBINING CIRCUMFLEX ACCENT
++                APPEND(rText,"hat ");
++                break;
++            case 0x304: // COMBINING MACRON
++                APPEND(rText,"bar ");
++                break;
+             default:
+                 rText.Append(nLast);
+                 break;
+-- 
+1.7.6.5
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 942c7d5..314747a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -133,6 +133,7 @@ Patch34: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
 Patch35: 0001-Resolves-rhbz-754051-Libreoffice-calc-crashes-when-r.patch
 Patch36: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
 Patch37: 0001-sw-fdo-39159-fdo-40482-temp-selection-print-doc.patch
+Patch38: 0001-smath-does-not-handle-accents-in-MathML.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -813,7 +814,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch34 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch
 %patch35 -p1 -b .rhbz754051-Libreoffice-calc-crashes-when-r.patch
 %patch36 -p1 -b .rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
-%patch37 -p1 -b .sw-fdo-39159-fdo-40482-temp-selection-print-doc.patch
+%patch37 -p1 -b .fdo39159-fdo40482-temp-selection-print-doc.patch
+%patch38 -p1 -b .smath-does-not-handle-accents-in-MathML.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2125,8 +2127,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Thu Dec 22 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-7-UNBUILT
+* Fri Jan 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-7
 - Resolves: fdo#40482 Writer view options destroyed by printing
+- Resolves: rhbz#533318 smath does not handle accents in MathML
 
 * Thu Dec 15 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-6
 - Resolves: rhbz#761009 IFSD_Equal is asymmetrical