Attachment 81183 Details for Bug 66024 – Patch

Patch

patch-mathaccents.diff (text/plain), 2.69 KB, created by Frédéric Wang on 2013-06-21 20:29:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang

Created: 2013-06-21 20:29:50 UTC

Size: 2.69 KB

patch

obsolete

>diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
>index ca2bea9..530736b 100644
>--- a/starmath/inc/types.hxx
>+++ b/starmath/inc/types.hxx
>@@ -139,8 +139,10 @@ enum MathSymbol
> 
>     MS_GRAVE        = (sal_Unicode) 0x0300,
>     MS_ACUTE        = (sal_Unicode) 0x0301,
>-    MS_HAT          = (sal_Unicode) 0x0302,
>-    MS_TILDE        = (sal_Unicode) 0x0303,
>+    MS_HAT          = (sal_Unicode) 0x005E,
>+    MS_COMBHAT      = (sal_Unicode) 0x0302,
>+    MS_TILDE        = (sal_Unicode) 0x007E,
>+    MS_COMBTILDE    = (sal_Unicode) 0x0303,
>     MS_BAR          = (sal_Unicode) 0x0304,
>     MS_BREVE        = (sal_Unicode) 0x0306,
>     MS_CIRCLE       = (sal_Unicode) 0x030A,
>diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
>index b2a9b38..8df9d28 100644
>--- a/starmath/source/mathmlexport.cxx
>+++ b/starmath/source/mathmlexport.cxx
>@@ -1121,6 +1121,15 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
>             break;
>         case TOVERSTRIKE:
>             break;
>+        case TWIDETILDE:
>+        case TWIDEHAT:
>+        case TWIDEVEC:
>+            {
>+            // make these wide accents stretchy
>+            AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_TRUE);
>+            ExportNodes(pNode->GetSubNode(0), nLevel+1);
>+            }
>+            break;
>         default:
>             ExportNodes(pNode->GetSubNode(0), nLevel+1);
>             break;
>diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
>index e0c7282..d3ae705 100644
>--- a/starmath/source/node.cxx
>+++ b/starmath/source/node.cxx
>@@ -2820,10 +2820,12 @@ void SmAttributNode::CreateTextFromNode(String &rText)
>             case MS_VEC: // COMBINING RIGHT ARROW ABOVE
>                 rText += "vec ";
>                 break;
>-            case MS_TILDE: // COMBINING TILDE
>+            case MS_TILDE: // TILDE
>+            case MS_COMBTILDE: // COMBINING TILDE
>                 rText += "tilde ";
>                 break;
>-            case MS_HAT: // COMBINING CIRCUMFLEX ACCENT
>+            case MS_HAT: // CIRCUMFLEX ACCENT
>+            case MS_COMBHAT: // COMBINING CIRCUMFLEX ACCENT
>                 rText += "hat ";
>                 break;
>             case MS_BAR: // COMBINING MACRON
>diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
>index a844195..cb355b7 100644
>--- a/starmath/source/ooxmlimport.cxx
>+++ b/starmath/source/ooxmlimport.cxx
>@@ -192,9 +192,11 @@ OUString SmOoxmlImport::handleAcc()
>             acc = "widevec";
>             break;
>         case MS_TILDE:
>+        case MS_COMBTILDE:
>             acc = "widetilde";
>             break;
>         case MS_HAT:
>+        case MS_COMBHAT:
>             acc = "widehat";
>             break;
>         case MS_DOT:

Actions: View

Attachments on bug 66024: 81183 | 81184