mathcast-checkin Mailing List for MathCast Equation Editor

Brought to you by: timothylee, tom_chekam

mathcast-checkin — List for monitoring SVN checkins

You can subscribe to this list here.

2012	_Jan	_Feb	_Mar	_Apr	_May	_Jun (29)	_Jul (11)	_Aug (4)	_Sep (2)	_Oct	_Nov	_Dec
2013	_Jan (6)	_Feb (38)	_Mar (30)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2014	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (1)	_Sep (12)	_Oct	_Nov (4)	_Dec
2015	_Jan	_Feb (6)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2016	_Jan	_Feb	_Mar	_Apr (2)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

[Mathcast-checkin] SF.net SVN: mathcast:[202] trunk/chrome/content

From: <tim...@us...> - 2016-04-07 22:45:32

Revision: 202
          http://sourceforge.net/p/mathcast/code/202
Author:   timothylee
Date:     2016-04-07 22:45:30 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Mark keys.dat and lowlist.dat as text files.
Added coproduct symbol, and symbols for set.

Modified Paths:
--------------
    trunk/chrome/content/keys.dat

Property Changed:
----------------
    trunk/chrome/content/keys.dat
    trunk/chrome/content/lowlist.dat

Modified: trunk/chrome/content/keys.dat
===================================================================
(Binary files differ)

Index: trunk/chrome/content/keys.dat
===================================================================
--- trunk/chrome/content/keys.dat	2016-04-07 22:27:09 UTC (rev 201)
+++ trunk/chrome/content/keys.dat	2016-04-07 22:45:30 UTC (rev 202)

Property changes on: trunk/chrome/content/keys.dat
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/chrome/content/lowlist.dat
===================================================================
--- trunk/chrome/content/lowlist.dat	2016-04-07 22:27:09 UTC (rev 201)
+++ trunk/chrome/content/lowlist.dat	2016-04-07 22:45:30 UTC (rev 202)

Property changes on: trunk/chrome/content/lowlist.dat
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[201] trunk/chrome/locale

From: <tim...@us...> - 2016-04-07 22:27:10

Revision: 201
          http://sourceforge.net/p/mathcast/code/201
Author:   timothylee
Date:     2016-04-07 22:27:09 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Added coproduct symbol

Modified Paths:
--------------
    trunk/chrome/locale/en-US/known.xml
    trunk/chrome/locale/zh-TW/known.xml

Modified: trunk/chrome/locale/en-US/known.xml
===================================================================
--- trunk/chrome/locale/en-US/known.xml	2015-02-18 02:54:53 UTC (rev 200)
+++ trunk/chrome/locale/en-US/known.xml	2016-04-07 22:27:09 UTC (rev 201)
@@ -1193,6 +1193,12 @@
 			<i>product</i>
 			<ukmaths>_p</ukmaths>
 		</in>
+		<in>
+			<m>&#x2210;</m>
+			<t>∐</t>
+			<i>coproduct</i>
+			<ukmaths>_v</ukmaths>
+		</in>
 	</group>
 	<group name='geometry'>
 		<in>

Modified: trunk/chrome/locale/zh-TW/known.xml
===================================================================
--- trunk/chrome/locale/zh-TW/known.xml	2015-02-18 02:54:53 UTC (rev 200)
+++ trunk/chrome/locale/zh-TW/known.xml	2016-04-07 22:27:09 UTC (rev 201)
@@ -1193,6 +1193,12 @@
 			<i>求積</i>
 			<ukmaths>_p</ukmaths>
 		</in>
+		<in>
+			<m>&#x2210;</m>
+			<t>∐</t>
+			<i>求餘積</i>
+			<ukmaths>_v</ukmaths>
+		</in>
 	</group>
 	<group name='幾何'>
 		<in>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[200] trunk/chrome/content

From: <tim...@us...> - 2015-02-18 02:55:01

Revision: 200
          http://sourceforge.net/p/mathcast/code/200
Author:   timothylee
Date:     2015-02-18 02:54:53 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
- Support HTTP result code 200 when loading MathML files in newer xulrunner

Modified Paths:
--------------
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/content/file.js

Modified: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
--- trunk/chrome/content/bindings/ukmaths.xml	2015-02-18 02:48:43 UTC (rev 199)
+++ trunk/chrome/content/bindings/ukmaths.xml	2015-02-18 02:54:53 UTC (rev 200)
@@ -29,7 +29,7 @@
       <xul:box class="ukmaths-container" flex="1">
         <xul:vbox flex="1">
           <xul:textbox class="ukmaths-textarea" anonid="textbox"
-              wrap="off" flex="1" multiline="true" newlines="pasateintact"/>
+              wrap="on" flex="1" multiline="true" newlines="pasateintact"/>
           <xul:hbox>
             <xul:label class="ukmaths-name" anonid="name" flex="1"/>
             <xul:button class="ukmaths-ok" anonid="button1"

Modified: trunk/chrome/content/file.js
===================================================================
--- trunk/chrome/content/file.js	2015-02-18 02:48:43 UTC (rev 199)
+++ trunk/chrome/content/file.js	2015-02-18 02:54:53 UTC (rev 200)
@@ -225,7 +225,8 @@
     var request = new XMLHttpRequest();
     request.open("GET", spec, false);
     try { request.send(null); }  catch (error) {;}
-    if ((request.status == 0) && request.responseXML)
+    if (((request.status == 0) || (request.status == 200)) &&
+            request.responseXML)
     {
         list = request.responseXML.getElementsByTagName("math");
         if (list.length > 0)  return list;
@@ -703,7 +704,8 @@
     var request = new XMLHttpRequest();
     request.open("GET", "chrome://mathcast/content/template.xml", false);
     try { request.send(null); }  catch (error) {;}
-    if ((request.status == 0) && (request.responseXML))
+    if (((request.status == 0) || (request.status == 200)) &&
+            request.responseXML)
         doc = request.responseXML;
 
     // Add per-file content
@@ -744,7 +746,8 @@
         var request = new XMLHttpRequest();
         request.open("GET", uri, false);
         try { request.send(null); }  catch (error) {;}
-        if ((request.status == 0) && (request.responseXML))
+        if (((request.status == 0) || (request.status == 200)) &&
+                request.responseXML)
         {
             // Re-use existing XML document if it exists
             doc = request.responseXML;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[199] trunk/chrome/content

From: <tim...@us...> - 2015-02-18 02:48:46

Revision: 199
          http://sourceforge.net/p/mathcast/code/199
Author:   timothylee
Date:     2015-02-18 02:48:43 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
- Support HTTP result code 200 in newer version of xulrunner

Modified Paths:
--------------
    trunk/chrome/content/bindings/mathline.xml
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/content/template.xml

Property Changed:
----------------
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/content/template.xml

Modified: trunk/chrome/content/bindings/mathline.xml
===================================================================
--- trunk/chrome/content/bindings/mathline.xml	2015-02-18 02:17:28 UTC (rev 198)
+++ trunk/chrome/content/bindings/mathline.xml	2015-02-18 02:48:43 UTC (rev 199)
@@ -263,7 +263,7 @@
           request.open("GET", "chrome://mathcast/content/keys.dat", false);
           request.overrideMimeType("text/plain");
           request.send(null);
-          if (request.status != 0)  return;
+          if ((request.status != 0) && (request.status != 200))  return;
           var text = request.responseText;
           if (!text)  return;
 
@@ -292,7 +292,7 @@
           request.open("GET", "chrome://mathcast/content/lowlist.dat", false);
           request.overrideMimeType("text/plain");
           request.send(null);
-          if (request.status != 0)  return;
+          if ((request.status != 0) && (request.status != 200))  return;
           var text = request.responseText;
           if (!text)  return;
 
@@ -366,7 +366,7 @@
           var request = new XMLHttpRequest();
           request.open("GET", "chrome://mathcast/locale/known.xml", false);
           request.send(null);
-          if (request.status != 0)  return;
+          if ((request.status != 0) && (request.status != 200))  return;
 
           // Handle only <mathematics> DOM tree
           var xml = request.responseXML;

Modified: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
(Binary files differ)

Index: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
--- trunk/chrome/content/bindings/ukmaths.xml	2015-02-18 02:17:28 UTC (rev 198)
+++ trunk/chrome/content/bindings/ukmaths.xml	2015-02-18 02:48:43 UTC (rev 199)

Property changes on: trunk/chrome/content/bindings/ukmaths.xml
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/chrome/content/template.xml
===================================================================
(Binary files differ)

Index: trunk/chrome/content/template.xml
===================================================================
--- trunk/chrome/content/template.xml	2015-02-18 02:17:28 UTC (rev 198)
+++ trunk/chrome/content/template.xml	2015-02-18 02:48:43 UTC (rev 199)

Property changes on: trunk/chrome/content/template.xml
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[198] trunk/chrome/content

From: <tim...@us...> - 2015-02-18 02:17:36

Revision: 198
          http://sourceforge.net/p/mathcast/code/198
Author:   timothylee
Date:     2015-02-18 02:17:28 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
- Update libbrl2mml for 32-bit and 64-bit linux

Modified Paths:
--------------
    trunk/chrome/content/lib32/libbrl2mml.so.1
    trunk/chrome/content/lib64/libbrl2mml.so.1

Modified: trunk/chrome/content/lib32/libbrl2mml.so.1
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib64/libbrl2mml.so.1
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[197] trunk/win32/mathcast.nsi

From: <tim...@us...> - 2015-02-18 02:03:40

Revision: 197
          http://sourceforge.net/p/mathcast/code/197
Author:   timothylee
Date:     2015-02-18 02:03:33 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
- Bump version to 0.94-beta2

Modified Paths:
--------------
    trunk/win32/mathcast.nsi

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2015-02-18 02:02:45 UTC (rev 196)
+++ trunk/win32/mathcast.nsi	2015-02-18 02:03:33 UTC (rev 197)
@@ -1,5 +1,5 @@
 !define APP_VER "0.94"
-!define APP_REL "beta1"
+!define APP_REL "beta2"
 !define APP_NAME "mathcast"
 !define APP_DESC "MathCast"
 !define APP_LINK "${APP_DESC}" 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[196] trunk/chrome/content/lib32/libbrl2mml-1.dll

From: <tim...@us...> - 2015-02-18 02:02:47

Revision: 196
          http://sourceforge.net/p/mathcast/code/196
Author:   timothylee
Date:     2015-02-18 02:02:45 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
- Update libbrl2mml to latest version

Modified Paths:
--------------
    trunk/chrome/content/lib32/libbrl2mml-1.dll

Modified: trunk/chrome/content/lib32/libbrl2mml-1.dll
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[195] trunk/chrome/content/httpd.js

From: <tim...@us...> - 2015-02-09 05:42:53

Revision: 195
          http://sourceforge.net/p/mathcast/code/195
Author:   timothylee
Date:     2015-02-09 05:42:51 +0000 (Mon, 09 Feb 2015)
Log Message:
-----------
- Move writeMore() in accordance with strict JS syntax

Modified Paths:
--------------
    trunk/chrome/content/httpd.js

Modified: trunk/chrome/content/httpd.js
===================================================================
--- trunk/chrome/content/httpd.js	2014-11-14 04:36:38 UTC (rev 194)
+++ trunk/chrome/content/httpd.js	2015-02-09 05:42:51 UTC (rev 195)
@@ -2675,6 +2675,12 @@
   {
     const PR_RDONLY = 0x01;
 
+    function writeMore()
+    {
+      gThreadManager.currentThread
+                    .dispatch(writeData, Ci.nsIThread.DISPATCH_NORMAL);
+    }
+
     var type = this._getTypeFromFile(file);
     if (type === SJS_TYPE)
     {
@@ -2799,12 +2805,6 @@
         throw e;
       }
 
-      function writeMore()
-      {
-        gThreadManager.currentThread
-                      .dispatch(writeData, Ci.nsIThread.DISPATCH_NORMAL);
-      }
-
       var input = new BinaryInputStream(fis);
       var output = new BinaryOutputStream(response.bodyOutputStream);
       var writeData =

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[194] trunk

From: <tim...@us...> - 2014-11-14 04:36:42

Revision: 194
          http://sourceforge.net/p/mathcast/code/194
Author:   timothylee
Date:     2014-11-14 04:36:38 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
- Bump up to version 0.94-beta1

Modified Paths:
--------------
    trunk/chrome/content/version.js
    trunk/chrome/locale/en-US/mathcast.dtd
    trunk/chrome/locale/zh-TW/mathcast.dtd
    trunk/win32/mathcast.nsi

Modified: trunk/chrome/content/version.js
===================================================================
--- trunk/chrome/content/version.js	2014-11-14 04:28:20 UTC (rev 193)
+++ trunk/chrome/content/version.js	2014-11-14 04:36:38 UTC (rev 194)
@@ -8,7 +8,7 @@
 **********************************************************************/
 
 
-const MATHCAST_VERSION = "0.93";
+const MATHCAST_VERSION = "0.94";
 
 
 /* vim: set cindent tabstop=8 softtabstop=4 expandtab shiftwidth=4: */

Modified: trunk/chrome/locale/en-US/mathcast.dtd
===================================================================
--- trunk/chrome/locale/en-US/mathcast.dtd	2014-11-14 04:28:20 UTC (rev 193)
+++ trunk/chrome/locale/en-US/mathcast.dtd	2014-11-14 04:36:38 UTC (rev 194)
@@ -10,7 +10,7 @@
 <!ENTITY grpUiSettings.label "User Interface">
 
 <!ENTITY appVersion.label "Version MATHCAST_VERSION">
-<!ENTITY appCopyright.label "Copyright (C) Tom Chakam and Timothy Lee, 2004-2013.">
+<!ENTITY appCopyright.label "Copyright (C) Tom Chakam and Timothy Lee, 2004-2014.">
 <!ENTITY appLicence.label "This software is licenced under GPL.">
 
 <!ENTITY okButton.label "OK">

Modified: trunk/chrome/locale/zh-TW/mathcast.dtd
===================================================================
--- trunk/chrome/locale/zh-TW/mathcast.dtd	2014-11-14 04:28:20 UTC (rev 193)
+++ trunk/chrome/locale/zh-TW/mathcast.dtd	2014-11-14 04:36:38 UTC (rev 194)
@@ -10,7 +10,7 @@
 <!ENTITY grpUiSettings.label "使用介面">
 
 <!ENTITY appVersion.label "MATHCAST_VERSION 版">
-<!ENTITY appCopyright.label "(C) 2004-2013 版權屬 Tom Chakam 及 Timothy Lee。">
+<!ENTITY appCopyright.label "(C) 2004-2014 版權屬 Tom Chakam 及 Timothy Lee。">
 <!ENTITY appLicence.label "此軟件以 GPL 授權。">
 
 <!ENTITY okButton.label "確定(O)">

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2014-11-14 04:28:20 UTC (rev 193)
+++ trunk/win32/mathcast.nsi	2014-11-14 04:36:38 UTC (rev 194)
@@ -1,4 +1,4 @@
-!define APP_VER "0.93"
+!define APP_VER "0.94"
 !define APP_REL "beta1"
 !define APP_NAME "mathcast"
 !define APP_DESC "MathCast"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[193] trunk/chrome/content/lib32

From: <tim...@us...> - 2014-11-14 04:28:31

Revision: 193
          http://sourceforge.net/p/mathcast/code/193
Author:   timothylee
Date:     2014-11-14 04:28:20 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
- Updated libbrl2mml for win32 and linux32

Modified Paths:
--------------
    trunk/chrome/content/lib32/libbrl2mml-1.dll
    trunk/chrome/content/lib32/libbrl2mml.so.1

Modified: trunk/chrome/content/lib32/libbrl2mml-1.dll
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib32/libbrl2mml.so.1
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[192] trunk

From: <tim...@us...> - 2014-11-13 15:07:08

Revision: 192
          http://sourceforge.net/p/mathcast/code/192
Author:   timothylee
Date:     2014-11-13 15:07:05 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
- Added ASCII Braille font for use in UK Maths edit mode

Modified Paths:
--------------
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/content/lib64/libbrl2mml.so.1
    trunk/chrome/skin/mathcast.css
    trunk/chrome/skin/ukmaths.css

Added Paths:
-----------
    trunk/chrome/skin/AsciiBraille.ttf
    trunk/fonts/AsciiBraille/
    trunk/fonts/AsciiBraille/AsciiBraille.sfd

Modified: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib64/libbrl2mml.so.1
===================================================================
(Binary files differ)

Added: trunk/chrome/skin/AsciiBraille.ttf
===================================================================
(Binary files differ)

Index: trunk/chrome/skin/AsciiBraille.ttf
===================================================================
--- trunk/chrome/skin/AsciiBraille.ttf	2014-11-05 05:47:42 UTC (rev 191)
+++ trunk/chrome/skin/AsciiBraille.ttf	2014-11-13 15:07:05 UTC (rev 192)

Property changes on: trunk/chrome/skin/AsciiBraille.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-font-ttf
\ No newline at end of property
Modified: trunk/chrome/skin/mathcast.css
===================================================================
--- trunk/chrome/skin/mathcast.css	2014-11-05 05:47:42 UTC (rev 191)
+++ trunk/chrome/skin/mathcast.css	2014-11-13 15:07:05 UTC (rev 192)
@@ -9,8 +9,13 @@
 
 @import url("chrome://global/skin/");
 
+@font-face {
+  font-family:AsciiBraille;
+  src:url("chrome://mathcast/skin/AsciiBraille.ttf");
+}
+
 /* Default font */
-#wndMain { font-family:Lucida Sans Unicode,Verdana,Arial,Helvetica,sans-serif; }
+#wndMain { font-family:"Lucida Sans Unicode",Verdana,Arial,Helvetica,sans-serif; }
 
 /* XBL bindings */
 flatbutton { -moz-binding:url("chrome://mathcast/content/bindings/flatbutton.xml#flatbutton"); }

Modified: trunk/chrome/skin/ukmaths.css
===================================================================
--- trunk/chrome/skin/ukmaths.css	2014-11-05 05:47:42 UTC (rev 191)
+++ trunk/chrome/skin/ukmaths.css	2014-11-13 15:07:05 UTC (rev 192)
@@ -1,6 +1,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 ukmaths { -moz-appearance:toolbox; }
-.ukmaths-textarea { font-size:200%; font-weight:bold; }
+.ukmaths-textarea { font-size:300%; font-family:AsciiBraille; }
 .ukmaths-ok { list-style-image:url("chrome://mathcast/skin/icon16/ok.png"); }
 .ukmaths-cancel { list-style-image:url("chrome://mathcast/skin/icon16/cancel.png"); }

Added: trunk/fonts/AsciiBraille/AsciiBraille.sfd
===================================================================
(Binary files differ)

Index: trunk/fonts/AsciiBraille/AsciiBraille.sfd
===================================================================
--- trunk/fonts/AsciiBraille/AsciiBraille.sfd	2014-11-05 05:47:42 UTC (rev 191)
+++ trunk/fonts/AsciiBraille/AsciiBraille.sfd	2014-11-13 15:07:05 UTC (rev 192)

Property changes on: trunk/fonts/AsciiBraille/AsciiBraille.sfd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/vnd.font-fontforge-sfd
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[191] trunk/examples/3 - Matrix.xml

From: <tim...@us...> - 2014-11-05 05:47:49

Revision: 191
          http://sourceforge.net/p/mathcast/code/191
Author:   timothylee
Date:     2014-11-05 05:47:42 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
- Make sure elements 1x3 matrix are separate

Modified Paths:
--------------
    trunk/examples/3 - Matrix.xml

Modified: trunk/examples/3 - Matrix.xml
===================================================================
--- trunk/examples/3 - Matrix.xml	2014-09-24 02:21:17 UTC (rev 190)
+++ trunk/examples/3 - Matrix.xml	2014-11-05 05:47:42 UTC (rev 191)
@@ -1,8 +1,6 @@
-<?xml version='1.0'?>
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN'
-  'http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd'
-  [<!ENTITY mathml '" rel="nofollow">http://www.w3.org/1998/Math/MathML'>]>
-<html xmlns='" rel="nofollow">http://www.w3.org/1999/xhtml'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd" [<!ENTITY mathml '" rel="nofollow">http://www.w3.org/1998/Math/MathML'>]>
+<html xmlns="" rel="nofollow">http://www.w3.org/1999/xhtml">
 <head>
 <!-- MathML created with MathCast Equation Editor version 0.83 -->
 </head>
@@ -82,14 +80,18 @@
       </mtr>
     </mtable>
     <mo>]</mo>
-    <mo>&#x00B7;</mo>
+    <mo>&#xb7;</mo>
     <mrow>
       <mo>[</mo>
       <mtable>
         <mtr>
           <mtd>
             <mi>e</mi>
+          </mtd>
+          <mtd>
             <mi>f</mi>
+          </mtd>
+          <mtd>
             <mi>g</mi>
           </mtd>
         </mtr>
@@ -232,7 +234,7 @@
         </mtable>
       </mrow>
     </mfenced>
-    <mo>&#x00B7;</mo>
+    <mo>&#xb7;</mo>
     <mfenced>
       <mrow>
         <mtable>
@@ -403,7 +405,7 @@
           <mo>,</mo>
           <mspace width="1em"/>
           <mi>x</mi>
-          <mo>></mo>
+          <mo>&gt;</mo>
           <mn>0</mn>
         </mtd>
       </mtr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[190] trunk/chrome/locale

From: <tim...@us...> - 2014-09-24 02:21:30

Revision: 190
          http://sourceforge.net/p/mathcast/code/190
Author:   timothylee
Date:     2014-09-24 02:21:17 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
- Fully translated known.xml for zh-TW

Modified Paths:
--------------
    trunk/chrome/locale/en-US/known.xml
    trunk/chrome/locale/zh-TW/known.xml

Modified: trunk/chrome/locale/en-US/known.xml
===================================================================
--- trunk/chrome/locale/en-US/known.xml	2014-09-22 13:13:05 UTC (rev 189)
+++ trunk/chrome/locale/en-US/known.xml	2014-09-24 02:21:17 UTC (rev 190)
@@ -351,7 +351,7 @@
 		<in>
 			<m>ℏ</m>
 			<t>ℏ</t>
-			<i>planck's constant</i>
+			<i>planck's constant over two pi</i>
 		</in>
 		<in>
 			<m>℃</m>
@@ -1083,7 +1083,7 @@
 			<ukmaths>'''</ukmaths>
 		</in>
 		<in>
-			<m>&#x2026;</m>
+			<m>&#x22ef;</m>
 			<t>⋯</t>
 			<i>midline three dots</i>
 		</in>
@@ -1900,13 +1900,13 @@
 			<m>cosec</m>
 			<t>cosec</t>
 			<i>cosecant</i>
-			<i>$&lt;</i>
+			<ukmaths>$&lt;</ukmaths>
 		</in>
 		<in>
 			<m>cot</m>
 			<t>cot</t>
 			<i>cotangent</i>
-			<i>$\</i>
+			<ukmaths>$\</ukmaths>
 		</in>
 		<in>
 			<m>arcsin</m>

Modified: trunk/chrome/locale/zh-TW/known.xml
===================================================================
--- trunk/chrome/locale/zh-TW/known.xml	2014-09-22 13:13:05 UTC (rev 189)
+++ trunk/chrome/locale/zh-TW/known.xml	2014-09-24 02:21:17 UTC (rev 190)
@@ -17,7 +17,7 @@
 	<g>頂標符號</g>
 	<g>箭號</g>
 	<g>集合與邏輯符號</g>
-	<g>點版字母</g>
+	<g>雙線體字母</g>
 	<g>特別字母</g>
 	<g>小楷希臘字母</g>
 	<g>大楷希臘字母</g>
@@ -330,88 +330,88 @@
 		<in>
 			<m>&#x221E;</m>
 			<t>∞</t>
-			<i>infinity</i>
+			<i>無限</i>
 			<ukmaths>=</ukmaths>
 		</in>
 		<in>
 			<m>ℒ</m>
 			<t>ℒ</t>
-			<i>laplace transform</i>
+			<i>拉普拉斯轉換</i>
 		</in>
 		<in>
 			<m>ℱ</m>
 			<t>ℱ</t>
-			<i>fourier transform</i>
+			<i>傅立葉轉換</i>
 		</in>
 		<in>
 			<m>ℎ</m>
 			<t>ℎ</t>
-			<i>planck's constant</i>
+			<i>普朗克常數</i>
 		</in>
 		<in>
 			<m>ℏ</m>
 			<t>ℏ</t>
-			<i>planck's constant</i>
+			<i>約化普朗克常數</i>
 		</in>
 		<in>
 			<m>℃</m>
 			<t>℃</t>
-			<i>degree celsius </i>
+			<i>攝氏</i>
 			<ukmaths>0,c</ukmaths>
 		</in>
 		<in>
 			<m>℉</m>
 			<t>℉</t>
-			<i>degree fahrenheit</i>
+			<i>華氏</i>
 			<ukmaths>0,f</ukmaths>
 		</in>
 		<in>
 			<m>K</m>
 			<t>К</t>
-			<i>Kelvin</i>
+			<i>凱氏</i>
 			<ukmaths> ;,k</ukmaths>
 		</in>
 		<in>
 			<m>Å</m>
 			<t>Å</t>
-			<i>Angstrom</i>
+			<i>埃</i>
 			<ukmaths> ^a</ukmaths>
 		</in>
 		<in>
 			<m>℥</m>
 			<t>℥</t>
-			<i>ounce</i>
+			<i>盎司</i>
 		</in>
 		<in>
 			<m>Ω</m>
 			<t>Ω</t>
-			<i>Ohm</i>
+			<i>歐姆</i>
 			<ukmaths> _w</ukmaths>
 		</in>
 		<in>
 			<m>℧</m>
 			<t>℧</t>
-			<i>Inverted Ohm</i>
+			<i>倒置歐姆</i>
 		</in>
 		<in>
 			<m>ℬ</m>
 			<t>ℬ</t>
-			<i>script B</i>
+			<i>草書 B</i>
 		</in>
 		<in>
 			<m>ℭ</m>
 			<t>ℭ</t>
-			<i>black letter C</i>
+			<i>黑體 C</i>
 		</in>
 		<in>
 			<m>ℰ</m>
 			<t>ℰ</t>
-			<i>script E</i>
+			<i>草書 E</i>
 		</in>
 		<in>
 			<m>ℇ</m>
 			<t>ℇ</t>
-			<i>euler constant</i>
+			<i>歐拉常數</i>
 		</in>
 		<in>
 			<m>℈</m>
@@ -421,72 +421,72 @@
 		<in>
 			<m>℮</m>
 			<t>℮</t>
-			<i>estimated symbol</i>
+			<i>估計符號</i>
 		</in>
 		<in>
 			<m>Ⅎ</m>
 			<t>Ⅎ</t>
-			<i>upside-down F</i>
+			<i>倒置 F</i>
 		</in>
 		<in>
 			<m>ℊ</m>
 			<t>ℊ</t>
-			<i>script g</i>
+			<i>草書 g</i>
 		</in>
 		<in>
 			<m>ℋ</m>
 			<t>ℋ</t>
-			<i>script H</i>
+			<i>草書 H</i>
 		</in>
 		<in>
 			<m>ℌ</m>
 			<t>ℌ</t>
-			<i>black letter H</i>
+			<i>黑體 H</i>
 		</in>
 		<in>
 			<m>ℐ</m>
 			<t>ℐ</t>
-			<i>script I</i>
+			<i>草書 I</i>
 		</in>
 		<in>
 			<m>ℑ</m>
 			<t>ℑ</t>
-			<i>black letter I</i>
+			<i>黑體 I</i>
 		</in>
 		<in>
 			<m>ℓ</m>
 			<t>ℓ</t>
-			<i>script l</i>
+			<i>草書 l</i>
 		</in>
 		<in>
 			<m>ℳ</m>
 			<t>ℳ</t>
-			<i>script M</i>
+			<i>草書 M</i>
 		</in>
 		<in>
 			<m>ℴ</m>
 			<t>ℴ</t>
-			<i>script o</i>
+			<i>草書 o</i>
 		</in>
 		<in>
 			<m>℘</m>
 			<t>℘</t>
-			<i>script P</i>
+			<i>草書 P</i>
 		</in>
 		<in>
 			<m>ℛ</m>
 			<t>ℛ</t>
-			<i>script R</i>
+			<i>草書 R</i>
 		</in>
 		<in>
 			<m>ℜ</m>
 			<t>ℜ</t>
-			<i>black letter R</i>
+			<i>黑體 R</i>
 		</in>
 		<in>
 			<m>ℨ</m>
 			<t>ℨ</t>
-			<i>black letter Z</i>
+			<i>黑體 Z</i>
 		</in>
 		<in>
 			<m>℣</m>
@@ -524,51 +524,51 @@
 			<i>numero</i>
 		</in>
 	</group>
-	<group name="點版字母">
+	<group name="雙線體字母">
 		<in>
 			<m>&#x2147;</m>
 			<t>ℯ</t>
-			<i>double-struck exponential e</i>
+			<i>雙線體 e 指數</i>
 		</in>
 		<in>
 			<m>&#x2148;</m>
 			<t>ί</t>
-			<i>double-struck imaginary i</i>
+			<i>雙線體虛數 i</i>
 		</in>
 		<in>
 			<m>ℂ</m>
 			<t>ℂ</t>
-			<i>double-struck C</i>
+			<i>雙線體 C</i>
 		</in>
 		<in>
 			<m>ℍ</m>
 			<t>ℍ</t>
-			<i>double-struck H</i>
+			<i>雙線體 H</i>
 		</in>
 		<in>
 			<m>ℕ</m>
 			<t>ℕ</t>
-			<i>double-struck N</i>
+			<i>雙線體 N</i>
 		</in>
 		<in>
 			<m>ℙ</m>
 			<t>ℙ</t>
-			<i>double-struck P</i>
+			<i>雙線體 P</i>
 		</in>
 		<in>
 			<m>ℚ</m>
 			<t>ℚ</t>
-			<i>double-struck Q</i>
+			<i>雙線體 Q</i>
 		</in>
 		<in>
 			<m>ℝ</m>
 			<t>ℝ</t>
-			<i>double-struck R</i>
+			<i>雙線體 R</i>
 		</in>
 		<in>
 			<m>ℤ</m>
 			<t>ℤ</t>
-			<i>double-struck capital Z</i>
+			<i>雙線體大楷 Z</i>
 		</in>
 	</group>
 </letters>
@@ -578,81 +578,81 @@
 			<m>+</m>
 			<t>+</t>
 			<sp/>
-			<i>plus</i>
+			<i>加</i>
 			<ukmaths> ;6</ukmaths>
 		</in>
 		<in>
 			<m>&#x2212;</m>
 			<t>−</t>
 			<sp/>
-			<i>minus</i>
+			<i>減</i>
 			<ukmaths> ;-</ukmaths>
 		</in>
 		<in>
 			<m>&#x207A;</m>
 			<t>⁺</t>
 			<sp>before</sp>
-			<i>positive</i>
+			<i>正</i>
 			<u>⁺15.2</u>
 		</in>
 		<in>
 			<m>&#x207B;</m>
 			<t>⁻</t>
 			<sp>before</sp>
-			<i>negative</i>
+			<i>負</i>
 			<u>⁻18.56</u>
 		</in>
 		<in>
 			<m>&#x00B7;</m>
 			<t>·</t>
-			<i>dot</i>
+			<i>點</i>
 			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>&#x00D7;</m>
 			<t>×</t>
-			<i>cross</i>
+			<i>乘</i>
 			<ukmaths> ;8</ukmaths>
 		</in>
 		<in>
 			<m>&#x2062;</m>
 			<t>‧</t>
-			<i>invisible times</i>
+			<i>隱形乘號</i>
 		</in>
 		<in>
 			<m>∗</m>
 			<t>∗</t>
-			<i>asterisk</i>
+			<i>星號</i>
 		</in>
 		<in>
 			<m>&#x002F;</m>
 			<t>/</t>
-			<i>solidus</i>
+			<i>斜線</i>
 		</in>
 		<in>
 			<m>&#x2215;</m>
 			<t>∕</t>
-			<i>division slash</i>
+			<i>除數斜線</i>
 			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<m>&#x00F7;</m>
 			<t>÷</t>
-			<i>divided by</i>
+			<i>除</i>
 			<ukmaths> ;4</ukmaths>
 		</in>
 		<in>
 			<m>&#x00B1;</m>
 			<t>±</t>
 			<sp/>
-			<i>plus or minus</i>
+			<i>加或減</i>
 			<ukmaths> ;6-</ukmaths>
 		</in>
 		<in>
 			<m>&#x2213;</m>
 			<t>∓</t>
 			<sp/>
-			<i>minus or plus</i>
+			<i>減或加</i>
 			<ukmaths> ;-6</ukmaths>
 		</in>
 	</group>
@@ -661,212 +661,212 @@
 			<m>=</m>
 			<t>=</t>
 			<sp/>
-			<i>equals to</i>
+			<i>等於</i>
 			<ukmaths> ;7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2260;</m>
 			<t>≠</t>
 			<sp/>
-			<i>not equals to</i>
+			<i>不等於</i>
 			<ukmaths> "7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2261;</m>
 			<t>≡</t>
 			<sp/>
-			<i>identical to</i>
+			<i>全等於</i>
 			<ukmaths> 77</ukmaths>
 		</in>
 		<in>
 			<m>&#x221D;</m>
 			<t>∝</t>
 			<sp/>
-			<i>proportional to</i>
+			<i>成正比</i>
 			<ukmaths> 37</ukmaths>
 		</in>
 		<in>
 			<m>≟</m>
 			<t>≟</t>
 			<sp/>
-			<i>questioned equal to</i>
+			<i>問號等於</i>
 		</in>
 		<in>
 			<m>&#x2248;</m>
 			<t>≈</t>
 			<sp/>
-			<i>almost equal to</i>
+			<i>幾乎等於</i>
 			<ukmaths> _7</ukmaths>
 		</in>
 		<in>
 			<m>≉</m>
 			<t>≉</t>
 			<sp/>
-			<i>not almost equal to</i>
+			<i>不幾乎等於</i>
 			<ukmaths> "_7</ukmaths>
 		</in>
 		<in>
 			<m>∼</m>
 			<t>∼</t>
 			<sp/>
-			<i>tilde</i>
+			<i>波浪號</i>
 			<ukmaths>"-</ukmaths>
 		</in>
 		<in>
 			<m>≁</m>
 			<t>≁</t>
 			<sp/>
-			<i>not tilde</i>
+			<i>非波浪號</i>
 		</in>
 		<in>
 			<m>≂</m>
 			<t>≂</t>
 			<sp/>
-			<i>minus tilde</i>
+			<i>減波浪號</i>
 		</in>
 		<in>
 			<m>≃</m>
 			<t>≃</t>
 			<sp/>
-			<i>asymptotically equal to</i>
+			<i>漸近相等</i>
 			<ukmaths> .7</ukmaths>
 		</in>
 		<in>
 			<m>≄</m>
 			<t>≄</t>
 			<sp/>
-			<i>not asymptotically equal to</i>
+			<i>非漸近相等</i>
 			<ukmaths> ".7</ukmaths>
 		</in>
 		<in>
 			<m>≅</m>
 			<t>≅</t>
 			<sp/>
-			<i>approximately equal to</i>
+			<i>大約等於</i>
 			<ukmaths> -7</ukmaths>
 		</in>
 		<in>
 			<m>≆</m>
 			<t>≆</t>
 			<sp/>
-			<i>approximately but not equal to</i>
+			<i>大約但不等於</i>
 		</in>
 		<in>
 			<m>≇</m>
 			<t>≇</t>
 			<sp/>
-			<i>not approximately and not equal to</i>
+			<i>大約但不等於</i>
 			<ukmaths> "-7</ukmaths>
 		</in>
 		<in>
 			<m>≊</m>
 			<t>≊</t>
 			<sp/>
-			<i>almost equal or equal to</i>
+			<i>幾乎等於或等於</i>
 		</in>
 		<in>
 			<m>≌</m>
 			<t>≌</t>
 			<sp/>
-			<i>all equal to</i>
+			<i>全部等於</i>
 		</in>
 		<in>
 			<m>≍</m>
 			<t>≍</t>
 			<sp/>
-			<i>equivalent to</i>
+			<i>相等</i>
 		</in>
 		<in>
 			<m>≭</m>
 			<t>≭</t>
 			<sp/>
-			<i>not equivalent to</i>
+			<i>不相等</i>
 		</in>
 		<in>
 			<m>≎</m>
 			<t>≎</t>
 			<sp/>
-			<i>geometrically equivalent</i>
+			<i>幾何相等</i>
 		</in>
 		<in>
 			<m>≏</m>
 			<t>≏</t>
 			<sp/>
-			<i>difference between</i>
+			<i>相差</i>
 		</in>
 		<in>
 			<m>≐</m>
 			<t>≐</t>
 			<sp/>
-			<i>approches the limit</i>
+			<i>趨向極限</i>
 		</in>
 		<in>
 			<m>≑</m>
 			<t>≑</t>
 			<sp/>
-			<i>geometrically equal to</i>
+			<i>幾何等於</i>
 		</in>
 		<in>
 			<m>≒</m>
 			<t>≒</t>
 			<sp/>
-			<i>approximately equal to or the image of</i>
+			<i>大約等於或是影像</i>
 		</in>
 		<in>
 			<m>≓</m>
 			<t>≓</t>
 			<sp/>
-			<i>image of or approximately equal to</i>
+			<i>是影像或大約等於</i>
 		</in>
 		<in>
 			<m>≔</m>
 			<t>≔</t>
 			<sp>after</sp>
-			<i>colon equals</i>
+			<i>冒號等於</i>
 			<ukmaths> 3;7</ukmaths>
 		</in>
 		<in>
 			<m>≘</m>
 			<t>≘</t>
 			<sp/>
-			<i>corresponds to</i>
+			<i>對應</i>
 		</in>
 		<in>
 			<m>≙</m>
 			<t>≙</t>
 			<sp/>
-			<i>estimates</i>
+			<i>估計</i>
 		</in>
 		<in>
 			<m>≚</m>
 			<t>≚</t>
 			<sp/>
-			<i>equiangular to</i>
+			<i>等角</i>
 		</in>
 		<in>
 			<m>≛</m>
 			<t>≛</t>
 			<sp/>
-			<i>star equal to</i>
+			<i>星號等於</i>
 		</in>
 		<in>
 			<m>≜</m>
 			<t>≜</t>
 			<sp/>
-			<i>delta equal to</i>
+			<i>三角洲等於</i>
 			<ukmaths> ;;7</ukmaths>
 		</in>
 		<in>
 			<m>≝</m>
 			<t>≝</t>
 			<sp/>
-			<i>equal to by definition</i>
+			<i>根據定義等於</i>
 		</in>
 		<in>
 			<m>≞</m>
 			<t>≞</t>
 			<sp/>
-			<i>measured by</i>
+			<i>測定方法</i>
 		</in>
 	</group>
 	<group name='大於、小於符號'>
@@ -874,155 +874,155 @@
 			<m>&lt;</m>
 			<t>&lt;</t>
 			<sp/>
-			<i>less than</i>
+			<i>小於</i>
 			<ukmaths> [ </ukmaths>
 		</in>
 		<in>
 			<m>></m>
 			<t>></t>
 			<sp/>
-			<i>greater than</i>
+			<i>大於</i>
 			<ukmaths> o </ukmaths>
 		</in>
 		<in>
 			<m>&#x2264;</m>
 			<t>≤</t>
 			<sp/>
-			<i>less than or equals to</i>
+			<i>小於或等於</i>
 			<ukmaths> [7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2265;</m>
 			<t>≥</t>
 			<sp/>
-			<i>greater than or equals to</i>
+			<i>大於或等於</i>
 			<ukmaths> o7</ukmaths>
 		</in>
 		<in>
 			<m>≪</m>
 			<t>≪</t>
 			<sp/>
-			<i>much less than</i>
+			<i>遠小於</i>
 			<ukmaths> [[ </ukmaths>
 		</in>
 		<in>
 			<m>≫</m>
 			<t>≫</t>
 			<sp/>
-			<i>much greater than</i>
+			<i>遠大於</i>
 			<ukmaths> oo </ukmaths>
 		</in>
 		<in>
 			<m>≮</m>
 			<t>≮</t>
 			<sp/>
-			<i>not less than</i>
+			<i>不小於</i>
 			<ukmaths> "[ </ukmaths>
 		</in>
 		<in>
 			<m>≯</m>
 			<t>≯</t>
 			<sp/>
-			<i>not greater than</i>
+			<i>不大於</i>
 			<ukmaths> "o </ukmaths>
 		</in>
 		<in>
 			<m>≰</m>
 			<t>≰</t>
 			<sp/>
-			<i>neither less than nor equal to</i>
+			<i>非小於或等於</i>
 			<ukmaths> "[7</ukmaths>
 		</in>
 		<in>
 			<m>≱</m>
 			<t>≱</t>
 			<sp/>
-			<i>neither greater than nor equal to</i>
+			<i>非大於或等於</i>
 			<ukmaths> "o7</ukmaths>
 		</in>
 		<in>
 			<m>≶</m>
 			<t>≶</t>
 			<sp/>
-			<i>less than or greater than</i>
+			<i>小於或大於</i>
 		</in>
 		<in>
 			<m>≷</m>
 			<t>≷</t>
 			<sp/>
-			<i>greater than or less than</i>
+			<i>大於或小於</i>
 		</in>
 		<in>
 			<m>≸</m>
 			<t>≸</t>
 			<sp/>
-			<i>neither less than nor greater than</i>
+			<i>非小於或大於</i>
 		</in>
 		<in>
 			<m>≹</m>
 			<t>≹</t>
 			<sp/>
-			<i>neither greater than nor less than</i>
+			<i>非大於或小於</i>
 		</in>
 	</group>
 	<group name='基本符號'>
 		<in>
 			<m>[</m>
 			<t>[</t>
-			<i>left bracket</i>
+			<i>左方括號</i>
 			<ukmaths>(</ukmaths>
 		</in>
 		<in>
 			<m>]</m>
 			<t>]</t>
-			<i>right bracket</i>
+			<i>右方括號</i>
 			<ukmaths>)</ukmaths>
 		</in>
 		<in>
 			<m>{</m>
 			<t>{</t>
-			<i>left curly brace</i>
+			<i>左大括號</i>
 			<ukmaths>[</ukmaths>
 		</in>
 		<in>
 			<m>}</m>
 			<t>}</t>
-			<i>right curly brace</i>
+			<i>右大括號</i>
 			<ukmaths>]</ukmaths>
 		</in>
 		<in>
 			<m>“</m>
 			<t>“</t>
-			<i>left quotes</i>
+			<i>左雙引號</i>
 			<ukmaths>8</ukmaths>
 		</in>
 		<in>
 			<m>”</m>
 			<t>”</t>
-			<i>right quotes</i>
+			<i>右雙引號</i>
 			<ukmaths>0 </ukmaths>
 		</in>
 		<in>
 			<m>'</m>
 			<t>'</t>
-			<i>apostrophe</i>
+			<i>單引號</i>
 		</in>
 		<in>
 			<m>°</m>
 			<t>°</t>
-			<i>degree</i>
+			<i>角度</i>
 			<ukmaths>0</ukmaths>
 		</in>
 		<in>
 			<m>:</m>
 			<t>:</t>
-			<i>colon</i>
+			<i>冒號</i>
 			<ukmaths>,3</ukmaths>
 		</in>
 		<in>
 			<m>;</m>
 			<t>;</t>
-			<i>semicolon</i>
+			<i>分號</i>
 			<ukmaths>,2</ukmaths>
 		</in>
 		<in>
@@ -1035,17 +1035,17 @@
 		<in>
 			<m>%</m>
 			<t>%</t>
-			<i>percentage</i>
+			<i>百份比</i>
 		</in>
 		<in>
 			<m>?</m>
 			<t>?</t>
-			<i>question mark</i>
+			<i>問號</i>
 		</in>
 		<in>
 			<m>#</m>
 			<t>#</t>
-			<i>number sign</i>
+			<i>井號</i>
 			<ukmaths>_8</ukmaths>
 		</in>
 		<in>
@@ -1056,89 +1056,89 @@
 		<in>
 			<m>\</m>
 			<t>\</t>
-			<i>backslash</i>
+			<i>反斜線</i>
 		</in>
 		<in>
 			<m>-</m>
 			<t>-</t>
-			<i>hyphen</i>
+			<i>連字符號</i>
 		</in>
 		<in>
 			<m>,</m>
 			<t>,</t>
-			<i>comma</i>
+			<i>逗號</i>
 			<ukmaths>,1</ukmaths>
 		</in>
 		<in>
 			<m>.</m>
 			<t>.</t>
 			<sp>after</sp>
-			<i>period</i>
+			<i>句號</i>
 			<ukmaths>,4</ukmaths>
 		</in>
 		<in>
 			<m>&#x2026;</m>
 			<t>…</t>
-			<i>three periods</i>
+			<i>省略號</i>
 			<ukmaths>'''</ukmaths>
 		</in>
 		<in>
-			<m>&#x2026;</m>
+			<m>&#x22ef;</m>
 			<t>⋯</t>
-			<i>midline three dots</i>
+			<i>置中省略號</i>
 		</in>
 		<in>
 			<m>⋮</m>
 			<t>⋮</t>
-			<i>ratio</i>
+			<i>垂直省略號</i>
 		</in>
 		<in>
 			<m>∴</m>
 			<t>∴</t>
-			<i>therefore</i>
+			<i>所以</i>
 			<ukmaths> ,* </ukmaths>
 		</in>
 		<in>
 			<m>∵</m>
 			<t>∵</t>
-			<i>because</i>
+			<i>因為</i>
 			<ukmaths> @/ </ukmaths>
 		</in>
 		<in>
 			<m>∷</m>
 			<t>∷</t>
-			<i>proportion</i>
+			<i>比例</i>
 		</in>
 		<in>
 			<m>■</m>
 			<t>■</t>
-			<i>filled square</i>
+			<i>填滿方形</i>
 		</in>
 		<in>
 			<m>▶</m>
 			<t>▶</t>
-			<i>filled triangle</i>
+			<i>填滿三角形</i>
 		</in>
 		<in>
 			<m>●</m>
 			<t>●</t>
-			<i>filled circle</i>
+			<i>填滿圓形</i>
 		</in>
 		<in>
 			<m>‸</m>
 			<t>‸</t>
-			<i>caret</i>
+			<i>帽子</i>
 		</in>
 		<in>
 			<m>∣</m>
 			<t>∣</t>
-			<i>divides</i>
+			<i>分隔</i>
 			<ukmaths>|</ukmaths>
 		</in>
 		<in>
 			<m>∤</m>
 			<t>∤</t>
-			<i>does not divide</i>
+			<i>不分隔</i>
 		</in>
 		<in>
 			<m>⊢</m>
@@ -1167,30 +1167,30 @@
 		<in>
 			<m>!</m>
 			<t>!</t>
-			<i>factorial</i>
+			<i>階乘</i>
 			<ukmaths>,6</ukmaths>
 		</in>
 		<in>
 			<m>‼</m>
 			<t>‼</t>
-			<i>double factorial</i>
+			<i>雙階乘</i>
 		</in>
 		<in>
 			<m>|</m>
 			<t>|</t>
-			<i>absolute value</i>
+			<i>絕對值</i>
 			<ukmaths>_</ukmaths>
 		</in>
 		<in>
 			<m>&#x2211;</m>
 			<t>∑</t>
-			<i>sum</i>
+			<i>求和</i>
 			<ukmaths>_s</ukmaths>
 		</in>
 		<in>
 			<m>&#x220F;</m>
 			<t>∏</t>
-			<i>product</i>
+			<i>求積</i>
 			<ukmaths>_p</ukmaths>
 		</in>
 	</group>
@@ -1198,45 +1198,45 @@
 		<in>
 			<m>∟</m>
 			<t>∟</t>
-			<i>right angle</i>
+			<i>直角</i>
 		</in>
 		<in>
 			<m>∠</m>
 			<t>∠</t>
-			<i>angle</i>
+			<i>角</i>
 			<ukmaths>_[</ukmaths>
 		</in>
 		<in>
 			<m>∡</m>
 			<t>∡</t>
-			<i>measured angle</i>
+			<i>測量角</i>
 		</in>
 		<in>
 			<m>∢</m>
 			<t>∢</t>
-			<i>spherical angle</i>
+			<i>球面角</i>
 		</in>
 		<in>
 			<m>⊾</m>
 			<t>⊾</t>
-			<i>right angle with arc</i>
+			<i>直角及弧</i>
 		</in>
 		<in>
 			<m>∥</m>
 			<t>∥</t>
-			<i>parallel to</i>
+			<i>平行</i>
 			<ukmaths>__</ukmaths>
 		</in>
 		<in>
 			<m>∦</m>
 			<t>∦</t>
-			<i>not parallel to</i>
+			<i>非平行</i>
 			<ukmaths> "__</ukmaths>
 		</in>
 		<in>
 			<m>⊿</m>
 			<t>⊿</t>
-			<i>right triangle</i>
+			<i>直角三角形</i>
 		</in>
 	</group>
 	<group name='微積分'>
@@ -1249,261 +1249,261 @@
 		<in>
 			<m>″</m>
 			<t>″</t>
-			<i>double prime</i>
+			<i>雙重 prime</i>
 			<ukmaths>@99</ukmaths>
 		</in>
 		<in>
 			<m>‴</m>
 			<t>‴</t>
-			<i>triple prime</i>
+			<i>三重 prime</i>
 			<ukmaths>@999</ukmaths>
 		</in>
 		<in>
 			<m>&#x2146;</m>
 			<t>đ</t>
-			<i>differential d</i>
+			<i>微分 d</i>
 		</in>
 		<in>
 			<m>&#x2145;</m>
 			<t>Đ</t>
-			<i>capital differential D</i>
+			<i>大楷微分 D</i>
 		</in>
 		<in>
 			<m>&#x2202;</m>
 			<t>∂</t>
-			<i>partial differential</i>
+			<i>偏微分</i>
 			<ukmaths>@d</ukmaths>
 		</in>
 		<in>
 			<m>&#x222B;</m>
 			<t>∫</t>
-			<i>integral</i>
+			<i>積分</i>
 			<ukmaths>!</ukmaths>
 		</in>
 		<in>
 			<m>∬</m>
 			<t>∬</t>
-			<i>double integral</i>
+			<i>雙重積分</i>
 			<replace><![CDATA[ <mrow><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>			
 			<ukmaths>!!</ukmaths>
 		</in>
 		<in>
 			<m>∭</m>
 			<t>∭</t>
-			<i>triple integral</i>
+			<i>三重積分</i>
 			<replace><![CDATA[ <mrow><mspace width="0.1em"/><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>
 			<ukmaths>!!!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222E;</m>
 			<t>∮</t>
-			<i>contour integral</i>
+			<i>線積分</i>
 			<ukmaths>@!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222F;</m>
 			<t>∯</t>
-			<i>double contour integral</i>
+			<i>雙重線積分</i>
 			<replace><![CDATA[ <mo largeop="false" minsize="2em">∯</mo> ]]></replace>
 		</in>
 		<in>
 			<m>&#x2232;</m>
 			<t>∲</t>
-			<i>clockwise contour integral</i>
+			<i>順時針線積分</i>
 			<replace><![CDATA[ <mo largeop="false" minsize="2em">∲</mo> ]]></replace>
 		</in>
 		<in>
 			<m>&#x2233;</m>
 			<t>∳</t>
-			<i>counter-clockwise contour integral</i>
+			<i>逆時針線積分</i>
 			<replace><![CDATA[ <mo largeop="false" minsize="2em">∳</mo> ]]></replace>
 		</in>
 		<in>
 			<m>‵</m>
 			<t>‵</t>
-			<i>reversed prime</i>
+			<i>反向 prime</i>
 		</in>
 		<in>
 			<m>‶</m>
 			<t>‶</t>
-			<i>reversed double prime</i>
+			<i>反向雙重 prime</i>
 		</in>
 		<in>
 			<m>‷</m>
 			<t>‷</t>
-			<i>reversed triple prime</i>
+			<i>反向三重 prime</i>
 		</in>
 	</group>
 	<group name='集合與邏輯符號'>
 		<in>
 			<m>∀</m>
 			<t>∀</t>
-			<i>for all</i>
+			<i>所有</i>
 			<ukmaths> \1</ukmaths>
 		</in>
 		<in>
 			<m>∃</m>
 			<t>∃</t>
-			<i>there exists</i>
+			<i>存在</i>
 			<ukmaths> \5</ukmaths>
 		</in>
 		<in>
 			<m>∄</m>
 			<t>∄</t>
-			<i>there does not exist</i>
+			<i>不存在</i>
 			<ukmaths> \"5</ukmaths>
 		</in>
 		<in>
 			<m>∅</m>
 			<t>∅</t>
-			<i>empty set</i>
+			<i>空集合</i>
 			<ukmaths> \0</ukmaths>
 		</in>
 		<in>
 			<m>∈</m>
 			<t>∈</t>
-			<i>is element of</i>
+			<i>元素</i>
 			<ukmaths> \9</ukmaths>
 		</in>
 		<in>
 			<m>∉</m>
 			<t>∉</t>
-			<i>is not element of</i>
+			<i>非元素</i>
 			<ukmaths> \"9</ukmaths>
 		</in>
 		<in>
 			<m>∩</m>
 			<t>∩</t>
-			<i>intersection</i>
+			<i>焦集</i>
 			<ukmaths> \8</ukmaths>
 		</in>
 		<in>
 			<m>∪</m>
 			<t>∪</t>
-			<i>union</i>
+			<i>聯集</i>
 			<ukmaths> \6</ukmaths>
 		</in>
 		<in>
 			<m>∖</m>
 			<t>∖</t>
-			<i>set minus</i>
+			<i>減子集</i>
 			<ukmaths> \*</ukmaths>
 		</in>
 		<in>
 			<m>∧</m>
 			<t>∧</t>
-			<i>logical and</i>
+			<i>邏輯和</i>
 			<ukmaths> ^8</ukmaths>
 		</in>
 		<in>
 			<m>∨</m>
 			<t>∨</t>
-			<i>logical or</i>
+			<i>邏輯或</i>
 			<ukmaths> ^6</ukmaths>
 		</in>
 		<in>
 			<m>⊂</m>
 			<t>⊂</t>
-			<i>subset of</i>
+			<i>子集</i>
 			<ukmaths> \[</ukmaths>
 		</in>
 		<in>
 			<m>⊃</m>
 			<t>⊃</t>
-			<i>superset of</i>
+			<i>超集</i>
 			<ukmaths> \o</ukmaths>
 		</in>
 		<in>
 			<m>⊄</m>
 			<t>⊄</t>
-			<i>not a subset of</i>
+			<i>非子集</i>
 			<ukmaths> \"[</ukmaths>
 		</in>
 		<in>
 			<m>⊅</m>
 			<t>⊅</t>
-			<i>not a superset of</i>
+			<i>非超集</i>
 			<ukmaths> \"o</ukmaths>
 		</in>
 		<in>
 			<m>⊆</m>
 			<t>⊆</t>
-			<i>subset of or equal to</i>
+			<i>子集或等於</i>
 			<ukmaths> \[7</ukmaths>
 		</in>
 		<in>
 			<m>⊇</m>
 			<t>⊇</t>
-			<i>superset of or equal to</i>
+			<i>超集或等於</i>
 			<ukmaths> \o7</ukmaths>
 		</in>
 		<in>
 			<m>⊈</m>
 			<t>⊈</t>
-			<i>neither a subset of nor equal to</i>
+			<i>非子集或等於</i>
 			<ukmaths> \"[7</ukmaths>
 		</in>
 		<in>
 			<m>⊉</m>
 			<t>⊉</t>
-			<i>neither a superset of nor equal to</i>
+			<i>非超集或等於</i>
 			<ukmaths> \"o7</ukmaths>
 		</in>
 		<in>
 			<m>⊌</m>
 			<t>⊌</t>
-			<i>multiset</i>
+			<i>多重集</i>
 		</in>
 		<in>
 			<m>⊍</m>
 			<t>⊍</t>
-			<i>multiset multiplication</i>
+			<i>多重集乘</i>
 		</in>
 		<in>
 			<m>⊎</m>
 			<t>⊎</t>
-			<i>multiset union</i>
+			<i>多重集聯合</i>
 		</in>
 		<in>
 			<m>⊏</m>
 			<t>⊏</t>
-			<i>square image of</i>
+			<i>方形影像</i>
 		</in>
 		<in>
 			<m>⊐</m>
 			<t>⊐</t>
-			<i>square original of</i>
+			<i>方形原值</i>
 		</in>
 		<in>
 			<m>⊑</m>
 			<t>⊑</t>
-			<i>square image of or equal to</i>
+			<i>方形影像或等於</i>
 		</in>
 		<in>
 			<m>⊒</m>
 			<t>⊒</t>
-			<i>square original of or equal to</i>
+			<i>方形原值或等於</i>
 		</in>
 		<in>
 			<m>⊓</m>
 			<t>⊓</t>
-			<i>square cap</i>
+			<i>方形帽子</i>
 		</in>
 		<in>
 			<m>⊔</m>
 			<t>⊔</t>
-			<i>square cup</i>
+			<i>方形杯子</i>
 		</in>
 		<in>
 			<m>⊕</m>
 			<t>⊕</t>
-			<i>circled plus</i>
+			<i>帶圓圈加號</i>
 			<ukmaths>&lt;;6&gt;</ukmaths>
 		</in>
 		<in>
 			<m>⊖</m>
 			<t>⊖</t>
-			<i>circled minus</i>
+			<i>帶圓圈減號</i>
 			<ukmaths>&lt;;-&gt;</ukmaths>
 		</in>
 	</group>
@@ -1512,92 +1512,92 @@
 		<in>
 			<m>&#x2192;</m>
 			<t>→</t>
-			<i>right arrow</i>
+			<i>右箭頭</i>
 			<ukmaths> 3o</ukmaths>
 		</in>
 		<in>
 			<m>&#x2190;</m>
 			<t>←</t>
-			<i>left arrow</i>
+			<i>左箭頭</i>
 			<ukmaths> [3</ukmaths>
 		</in>
 		<in>
 			<m>&#x2194;</m>
 			<t>↔</t>
-			<i>left-right arrow</i>
+			<i>左右箭頭</i>
 			<ukmaths> [3o</ukmaths>
 		</in>
 		<in>
 			<m>↑</m>
 			<t>↑</t>
-			<i>up arrow</i>
+			<i>上箭頭</i>
 			<ukmaths> 3i</ukmaths>
 		</in>
 		<in>
 			<m>↓</m>
 			<t>↓</t>
-			<i>down arrow</i>
+			<i>下箭頭</i>
 			<ukmaths> 35</ukmaths>
 		</in>
 		<in>
 			<m>↕</m>
 			<t>↕</t>
-			<i>up-down arrow</i>
+			<i>上下箭頭</i>
 		</in>
 		<in>
 			<m>↖</m>
 			<t>↖</t>
-			<i>northwest arrow</i>
+			<i>西北箭頭</i>
 		</in>
 		<in>
 			<m>↗</m>
 			<t>↗</t>
-			<i>northeast arrow</i>
+			<i>東北箭頭</i>
 		</in>
 		<in>
 			<m>↘</m>
 			<t>↘</t>
-			<i>southeast arrow</i>
+			<i>東南箭頭</i>
 		</in>
 		<in>
 			<m>↙</m>
 			<t>↙</t>
-			<i>southwest arrow</i>
+			<i>西南箭頭</i>
 		</in>
 
 		<in>
 			<m>⇒</m>
 			<t>⇒</t>
-			<i>right double arrow</i>
+			<i>右雙箭頭</i>
 			<ukmaths> \3o</ukmaths>
 		</in>
 		<in>
 			<m>⇐</m>
 			<t>⇐</t>
-			<i>left double arrow</i>
+			<i>左雙箭頭</i>
 			<ukmaths> \[3</ukmaths>
 		</in>
 		<in>
 			<m>⇔</m>
 			<t>⇔</t>
-			<i>right-left double arrow</i>
+			<i>左右雙箭頭</i>
 			<ukmaths> \[3o</ukmaths>
 		</in>
 
 		<in>
 			<m>⇏</m>
 			<t>⇏</t>
-			<i>right double arrow with stroke</i>
+			<i>帶斜線右雙箭頭</i>
 		</in>
 		<in>
 			<m>⇍</m>
 			<t>⇍</t>
-			<i>left double arrow with stroke</i>
+			<i>帶斜線左雙箭頭</i>
 		</in>
 		<in>
 			<m>⇎</m>
 			<t>⇎</t>
-			<i>right-left double arrow with stroke</i>
+			<i>帶斜線左右雙箭頭</i>
 		</in>
 	</group>
 
@@ -1605,48 +1605,48 @@
 		<in>
 			<m>&#x2207;</m>
 			<t>∇</t>
-			<i>nabla/del/grad</i>
+			<i>倒三角算子</i>
 			<hk>Ctrl+N</hk>
 			<ukmaths>_0</ukmaths>
 		</in>
 		<in>
 			<t>∇²</t>
 			<sc>∇²</sc>
-			<i>laplacian</i>
+			<i>拉普拉斯算子</i>
 			<ukmaths>_0+2</ukmaths>
 		</in>
 		<in>
 			<m>⋄</m>
 			<t>⋄</t>
-			<i>diamond</i>
+			<i>菱形</i>
 		</in>
 		<in>
 			<m>∙</m>
 			<t>∙</t>
-			<i>bullet</i>
+			<i>項目符號</i>
 		</in>
 		<in>
 			<m>∘</m>
 			<t>∘</t>
-			<i>ring</i>
+			<i>環形</i>
 			<ukmaths> \7</ukmaths>
 		</in>
 		<in>
 			<m>&#x22C5;</m>
 			<t>⋅</t>
-			<i>dot operator</i>
+			<i>點號算子</i>
 			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>
 			<t>⋆</t>
-			<i>star operator</i>
+			<i>星號算子</i>
 			<ukmaths> \=</ukmaths>
 		</in>
 		<in>
 			<m>□</m>
 			<t>□</t>
-			<i>square</i>
+			<i>方形</i>
 			<ukmaths>$q</ukmaths>
 		</in>
 	</group>
@@ -1655,59 +1655,59 @@
 		<in>
 			<m>&#x00AF;</m>
 			<t>¯</t>
-			<i>stretched line</i>
+			<i>伸展線</i>
 			<ukmaths>:</ukmaths>
 		</in>
 		<in>
 			<m>~</m>
 			<t>~</t>
-			<i>stretched tilde</i>
+			<i>伸展波浪線</i>
 			<ukmaths>^:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C6;</m>
 			<t>ˆ</t>
-			<i>stretched caret</i>
+			<i>伸展帽子</i>
 			<ukmaths>@:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C7;</m>
 			<t>ˇ</t>
-			<i>stretched caron</i>
+			<i>伸展倒置帽子</i>
 			<ukmaths>@&gt;</ukmaths>
 		</in>
 		<in>
 			<m>&#x23DC;</m>
 			<t>◠</t>
-			<i>top parenthesis</i>
+			<i>上括號</i>
 		</in>
 		<in>
 			<m>&#x23DD;</m>
 			<t>◡</t>
-			<i>bottom parenthesis</i>
+			<i>下括號</i>
 		</in>
 		<in>
 			<m>&#x23B4;</m>
 			<t>⎴</t>
-			<i>top bracket</i>
+			<i>上方括號</i>
 			<ti>┌┐</ti>
 		</in>
 		<in>
 			<m>&#x23B5;</m>
 			<t>⎵</t>
-			<i>bottom bracket</i>
+			<i>下方括號</i>
 			<ti>└┘</ti>
 		</in>
 		<in>
 			<m>&#x23DE;</m>
 			<t>⌢</t>
-			<i>top curly brace</i>
+			<i>上大括號</i>
 			<ti>┌┴┐</ti>
 		</in>
 		<in>
 			<m>&#x23DF;</m>
 			<t>⌣</t>
-			<i>bottom curly brace</i>
+			<i>下大括號</i>
 			<ti>└┬┘</ti>
 		</in>
 	</group>
@@ -1716,7 +1716,7 @@
 		<in>
 			<m>&#x2061;</m>
 			<t/>
-			<i>apply function</i>
+			<i>應用函數</i>
 		</in>
 	</group>
 </operators>
@@ -1727,26 +1727,26 @@
 		<in>
 			<t>⁻¹</t>
 			<sc>^⁻1</sc>
-			<i>-1 power</i>
+			<i>-1 次方</i>
 			<ukmaths>+;-1</ukmaths>
 		</in>
 		<in>
 			<t>¹</t>
 			<sc>^1</sc>
-			<i>1 power</i>
+			<i>1 次方</i>
 			<ukmaths>+1</ukmaths>
 		</in>
 		<in>
 			<t>²</t>
 			<sc>^2</sc>
-			<i>squared</i>
+			<i>平方</i>
 			<hk>Ctrl+2</hk>
 			<ukmaths>+2</ukmaths>
 		</in>
 		<in>
 			<t>³</t>
 			<sc>^3</sc>
-			<i>cubed</i>
+			<i>立方</i>
 			<hk>Ctrl+3</hk>
 			<ukmaths>+3</ukmaths>
 		</in>
@@ -1755,7 +1755,7 @@
 		<in>
 			<t>∆</t>
 			<sc>"Δ"</sc>
-			<i>discriminant/change</i>
+			<i>判別式／增量</i>
 			<hk>Ctrl+D</hk>
 		</in>
 	</group>
@@ -1763,7 +1763,7 @@
 		<in>
 			<t>̅</t>
 			<sc>‾→</sc>
-			<i>vector</i>
+			<i>向量</i>
 			<hk>Ctrl+-</hk>
 			<ti>x̅</ti>
 			<ukmaths>.3o</ukmaths>
@@ -1771,7 +1771,7 @@
 		<in>
 			<t>̇</t>
 			<sc>‾·</sc>
-			<i>dot derivative</i>
+			<i>上置點</i>
 			<hk>Ctrl+4</hk>
 			<ti>ẋ</ti>
 			<ukmaths>'</ukmaths>
@@ -1779,7 +1779,7 @@
 		<in>
 			<t>̈</t>
 			<sc>‾‹··›</sc>
-			<i>two dots above</i>
+			<i>上置兩點</i>
 			<hk>Ctrl+5</hk>
 			<ti>ẍ</ti>
 			<ukmaths>-</ukmaths>
@@ -1787,7 +1787,7 @@
 		<in>
 			<t>̿̿</t>
 			<sc>‾¯</sc>
-			<i>overline</i>
+			<i>上置線</i>
 			<hk>Ctrl+=</hk>
 			<ti>x̿</ti>
 			<ukmaths>:</ukmaths>
@@ -1795,7 +1795,7 @@
 		<in>
 			<t>̂</t>
 			<sc>‾‸</sc>
-			<i>rooftop</i>
+			<i>上置帽子</i>
 			<hk>Ctrl+6</hk>
 			<ti>x̂</ti>
 			<ukmaths>@:</ukmaths>
@@ -1803,7 +1803,7 @@
 		<in>
 			<t>̃</t>
 			<sc>‾∼</sc>
-			<i>tilde above</i>
+			<i>上置波浪線</i>
 			<hk>Ctrl+`</hk>
 			<ti>x̃</ti>
 			<ukmaths>^:</ukmaths>
@@ -1811,7 +1811,7 @@
 		<in>
 			<t>̱</t>
 			<sc>_¯</sc>
-			<i>underline</i>
+			<i>下置線</i>
 			<hk>Ctrl+\</hk>
 			<ti>x̱</ti>
 			<ukmaths>*:</ukmaths>
@@ -1825,49 +1825,49 @@
 		<in>
 			<m>log</m>
 			<t>log</t>
-			<i>logarithm</i>
+			<i>對數</i>
 			<ukmaths>$l</ukmaths>
 		</in>
 		<in>
 			<m>ln</m>
 			<t>ln</t>
-			<i>natural logarithm</i>
+			<i>自然對數</i>
 			<ukmaths>$ln</ukmaths>
 		</in>
 		<in>
 			<m>exp</m>
 			<t>exp</t>
-			<i>exponent</i>
+			<i>指數</i>
 			<ukmaths>$exp</ukmaths>
 		</in>
 		<in>
 			<m>max</m>
 			<t>max</t>
-			<i>maximum</i>
+			<i>最大</i>
 			<ukmaths>$max</ukmaths>
 		</in>
 		<in>
 			<m>min</m>
 			<t>min</t>
-			<i>minimum</i>
+			<i>最小</i>
 			<ukmaths>$min</ukmaths>
 		</in>
 		<in>
 			<m>const</m>
 			<t>const</t>
-			<i>constant</i>
+			<i>常數</i>
 			<ukmaths>$const</ukmaths>
 		</in>
 		<in>
 			<m>sign</m>
 			<t>sign</t>
-			<i>sign</i>
+			<i>符號</i>
 			<ukmaths>$sign</ukmaths>
 		</in>
 		<in>
 			<m>dB</m>
 			<t>dB</t>
-			<i>decibel</i>
+			<i>分貝</i>
 			<ukmaths> ;d,b</ukmaths>
 		</in>		
 	</group>
@@ -1875,103 +1875,103 @@
 		<in>
 			<m>sin</m>
 			<t>sin</t>
-			<i>sine</i>
+			<i>正弦</i>
 			<ukmaths>$s</ukmaths>
 		</in>
 		<in>
 			<m>cos</m>
 			<t>cos</t>
-			<i>cosine</i>
+			<i>餘弦</i>
 			<ukmaths>$c</ukmaths>
 		</in>
 		<in>
 			<m>tan</m>
 			<t>tan</t>
-			<i>tangent</i>
+			<i>正切</i>
 			<ukmaths>$t</ukmaths>
 		</in>
 		<in>
 			<m>sec</m>
 			<t>sec</t>
-			<i>secant</i>
+			<i>正割</i>
 			<ukmaths>$-</ukmaths>
 		</in>
 		<in>
 			<m>cosec</m>
 			<t>cosec</t>
-			<i>cosecant</i>
-			<i>$&lt;</i>
+			<i>餘割</i>
+			<ukmaths>$&lt;</ukmaths>
 		</in>
 		<in>
 			<m>cot</m>
 			<t>cot</t>
-			<i>cotangent</i>
-			<i>$\</i>
+			<i>餘切</i>
+			<ukmaths>$\</ukmaths>
 		</in>
 		<in>
 			<m>arcsin</m>
 			<t>arcsin</t>
-			<i>arc-sine</i>
+			<i>反正弦</i>
 			<ukmaths>$@s</ukmaths>
 		</in>
 		<in>
 			<m>arccos</m>
 			<t>arccos</t>
-			<i>arc-cosine</i>
+			<i>反餘弦</i>
 			<ukmaths>$@c</ukmaths>
 		</in>
 		<in>
 			<m>arctan</m>
 			<t>arctan</t>
-			<i>arc-tangent</i>
+			<i>反正切</i>
 			<ukmaths>$@t</ukmaths>
 		</in>
 		<in>
 			<m>arccot</m>
 			<t>arccot</t>
-			<i>arc-cotangent</i>
+			<i>反餘切</i>
 			<ukmaths>$@\</ukmaths>
 		</in>
 		<in>
 			<m>sinh</m>
 			<t>sinh</t>
-			<i>hyperbolic sine</i>
+			<i>雙曲正弦</i>
 			<ukmaths>$hs</ukmaths>
 		</in>
 		<in>
 			<m>cosh</m>
 			<t>cosh</t>
-			<i>hyperbolic cosine</i>
+			<i>雙曲餘弦</i>
 			<ukmaths>$hc</ukmaths>
 		</in>
 		<in>
 			<m>tanh</m>
 			<t>tanh</t>
-			<i>hyperbolic tangent</i>
+			<i>雙曲正切</i>
 			<ukmaths>$ht</ukmaths>
 		</in>
 		<in>
 			<m>Arcsin</m>
 			<t>Arcsin</t>
-			<i>Arc-sine</i>
+			<i>反正弦</i>
 			<ukmaths>$8s</ukmaths>
 		</in>
 		<in>
 			<m>Arccos</m>
 			<t>Arccos</t>
-			<i>Arc-cosine</i>
+			<i>反餘弦</i>
 			<ukmaths>$8c</ukmaths>
 		</in>
 		<in>
 			<m>Arctan</m>
 			<t>Arctan</t>
-			<i>Arc-tangent</i>
+			<i>反正切</i>
 			<ukmaths>$8t</ukmaths>
 		</in>
 		<in>
 			<m>rad</m>
 			<t>rad</t>
-			<i>radian</i>
+			<i>弧度</i>
 			<ukmaths> -</ukmaths>
 		</in>
 	</group>
@@ -1979,25 +1979,25 @@
 		<in>
 			<m>det</m>
 			<t>det</t>
-			<i>determinant</i>
+			<i>行列式</i>
 			<ukmaths>$det</ukmaths>
 		</in>
 		<in>
 			<m>rank</m>
 			<t>rank</t>
-			<i>rank</i>
+			<i>等級</i>
 			<ukmaths>$rank</ukmaths>
 		</in>
 		<in>
 			<m>dim</m>
 			<t>dim</t>
-			<i>dimension</i>
+			<i>尺度</i>
 			<ukmaths>$dim</ukmaths>
 		</in>
 		<in>
 			<m>ker</m>
 			<t>ker</t>
-			<i>kernel</i>
+			<i>核心</i>
 			<ukmaths>$ker</ukmaths>
 		</in>
 	</group>
@@ -2005,37 +2005,37 @@
 		<in>
 			<m>conj</m>
 			<t>conj</t>
-			<i>conjugate</i>
+			<i>共軛複數</i>
 			<ukmaths>$conj</ukmaths>
 		</in>
 		<in>
 			<m>Re</m>
 			<t>Re</t>
-			<i>real part</i>
+			<i>實數部份</i>
 			<ukmaths>$re</ukmaths>
 		</in>
 		<in>
 			<m>Im</m>
 			<t>Im</t>
-			<i>imaginary part</i>
+			<i>虛數部份</i>
 			<ukmaths>$im</ukmaths>
 		</in>
 		<in>
 			<m>abs</m>
 			<t>abs</t>
-			<i>absolute value</i>
+			<i>絕對值</i>
 			<ukmaths>$abs</ukmaths>
 		</in>
 		<in>
 			<m>arg</m>
 			<t>arg</t>
-			<i>argument</i>
+			<i>引數</i>
 			<ukmaths>$arg</ukmaths>
 		</in>
 		<in>
 			<m>angle</m>
 			<t>angle</t>
-			<i>angle</i>
+			<i>角度</i>
 			<ukmaths>$angle</ukmaths>
 		</in>
 	</group>
@@ -2043,7 +2043,7 @@
 		<in>
 			<m>lim</m>
 			<t>lim</t>
-			<i>limit</i>
+			<i>極限</i>
 			<ukmaths>$lim</ukmaths>
 		</in>
 	</group>
@@ -2051,25 +2051,25 @@
 		<in>
 			<m>grad</m>
 			<t>grad</t>
-			<i>gradient</i>
+			<i>梯度</i>
 			<ukmaths>$g</ukmaths>
 		</in>
 		<in>
 			<m>div</m>
 			<t>div</t>
-			<i>divergence</i>
+			<i>散度</i>
 			<ukmaths>$?</ukmaths>
 		</in>
 		<in>
 			<m>rot</m>
 			<t>rot</t>
-			<i>rotor</i>
+			<i>旋度 rot</i>
 			<ukmaths>$rot</ukmaths>
 		</in>
 		<in>
 			<m>curl</m>
 			<t>curl</t>
-			<i>curl</i>
+			<i>旋度</i>
 			<ukmaths>$%</ukmaths>
 		</in>
 	</group>
@@ -2079,26 +2079,26 @@
 		<in>
 			<mname>mtext</mname>
 			<t>"</t>
-			<i>text</i>
+			<i>文字</i>
 			<u>"Any Text"</u>
 		</in>
 		<in>
 			<mname>mstyle</mname>
 			<t>◢</t>
-			<i>Bold</i>
+			<i>粗體</i>
 			<u>◢x</u>
 			<hk>Ctrl+B</hk>
 		</in>
 		<in>
 			<mname>mspace</mname>
 			<t>░</t>
-			<i>Space</i>
+			<i>空格</i>
 			<hk>Ctrl+S</hk>
 		</in>
 		<in>
 			<mname>msub</mname>
 			<t>◟</t>
-			<i>subscript</i>
+			<i>下標</i>
 			<u>b◟x</u>
 			<hk>Ctrl+L</hk>
 			<ukmaths>*</ukmaths>
@@ -2106,7 +2106,7 @@
 		<in>
 			<mname>msup</mname>
 			<t>^</t>
-			<i>superscript</i>
+			<i>上標</i>
 			<u>b^x</u>
 			<hk>Ctrl+H</hk>
 			<ukmaths>+</ukmaths>
@@ -2114,14 +2114,14 @@
 		<in>
 			<mname>msubsup</mname>
 			<t>¦</t>
-			<i>subscript-superscript</i>
+			<i>下上標</i>
 			<u>b¦x¸y</u>
 			<hk>Ctrl+J</hk>
 		</in>
 		<in>
 			<mname>munder</mname>
 			<t>_</t>
-			<i>underscript</i>
+			<i>底標</i>
 			<u>b_x</u>
 			<hk>Ctrl+U</hk>
 			<ukmaths>*</ukmaths>
@@ -2129,7 +2129,7 @@
 		<in>
 			<mname>mover</mname>
 			<t>‾</t>
-			<i>overscript</i>
+			<i>頂標</i>
 			<u>b‾x</u>
 			<hk>Ctrl+O</hk>
 			<ukmaths>+</ukmaths>
@@ -2137,21 +2137,21 @@
 		<in>
 			<mname>munderover</mname>
 			<t>‡</t>
-			<i>underscript-overscript</i>
+			<i>底頂標</i>
 			<u>b‡x¸y</u>
 			<hk>Ctrl+K</hk>
 		</in>
 		<in>
 			<m>¸</m>
 			<t>¸</t>
-			<i>Argument separator or Comma</i>
+			<i>引算分隔元或逗號</i>
 		</in>
 	</group>
 	<group name='次方及次方根'>
 		<in>
 			<mname>msqrt</mname>
 			<t>√</t>
-			<i>square root</i>
+			<i>平方根</i>
 			<u>√x</u>
 			<hk>Ctrl+R</hk>
 			<ukmaths>%</ukmaths>
@@ -2159,7 +2159,7 @@
 		<in>
 			<mname>mroot</mname>
 			<t>∜</t>
-			<i>n'th root (not just 4th)</i>
+			<i>n 次根</i>
 			<u>n∜x</u>
 			<hk>Ctrl+T</hk>
 			<ukmaths>%</ukmaths>
@@ -2169,55 +2169,55 @@
 		<in>
 			<mname>mfrac</mname>
 			<t>╱</t>
-			<i>over</i>
+			<i>上下除</i>
 			<u>a╱b</u>
 			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<mname>mfrac</mname>
 			<t>⁄</t>
-			<i>slash over</i>
+			<i>斜數除</i>
 			<u>a ⁄ b</u>
 		</in>
 	</group>
 	<group name='括號、方塊、矩陣、向量'>
 		<in>
 			<t>(</t>
-			<i>left parenthesis</i>
-			<remark>remember to close with ')'</remark>
+			<i>左括號</i>
+			<remark>請以 ')' 結束</remark>
 			<u>f(a+b)</u>
 			<ukmaths>&lt;</ukmaths>
 		</in>
 		<in>
 			<t>)</t>
-			<i>right parenthesis</i>
+			<i>右括號</i>
 			<u>f(a+b)</u>
 			<ukmaths>&gt;</ukmaths>
 		</in>
 		<in>
 			<t>‹</t>
-			<i>block start</i>
-			<remark>remember to close with '›'</remark>
+			<i>開始方塊</i>
+			<remark>請以 '›' 結束</remark>
 			<u>‹a+b›╱‹c+d›</u>
 			<hk>Ctrl+9</hk>
 			<hk>Ctrl+,</hk>
 		</in>
 		<in>
 			<t>›</t>
-			<i>block end</i>
+			<i>結束方塊</i>
 			<u>‹a+b›╱‹c+d›</u>
 			<hk>Ctrl+0</hk>
 			<hk>Ctrl+.</hk>
 		</in>
 		<in>
 			<t>⌈</t>
-			<i>Matrix, Matrix Row, or Vector start</i>
-			<remark>remember to close with '⌋'</remark>
+			<i>開始矩陣、矩陣列或向量</i>
+			<remark>請以 '⌋' 結束</remark>
 			<hk>Ctrl+[</hk>
 		</in>
 		<in>
 			<t>⌋</t>
-			<i>Matrix, Matrix Row, or Vector end</i>
+			<i>結束矩陣、矩陣列或向量</i>
 			<hk>Ctrl+]</hk>
 		</in>
 	</group>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[189] trunk

From: <tim...@us...> - 2014-09-22 13:13:16

Revision: 189
          http://sourceforge.net/p/mathcast/code/189
Author:   timothylee
Date:     2014-09-22 13:13:05 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
- Offer UI locale as user preference

Modified Paths:
--------------
    trunk/chrome/content/edit.js
    trunk/chrome/content/settingsdialog.xul
    trunk/chrome/locale/en-US/mathcast.dtd
    trunk/chrome/locale/en-US/mathcast.properties
    trunk/chrome/locale/zh-TW/mathcast.dtd
    trunk/chrome/locale/zh-TW/mathcast.properties
    trunk/win32/mathcast.nsi

Modified: trunk/chrome/content/edit.js
===================================================================
--- trunk/chrome/content/edit.js	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/content/edit.js	2014-09-22 13:13:05 UTC (rev 189)
@@ -100,6 +100,19 @@
 // Loads user settings from preference service
 function doLoadSettings()
 {
+    // Determine UI locale
+    gSettings["locale"] = "";
+    try 
+    {
+        var pref = gPrefService.getBranch("intl.locale.");
+        var match_os = pref.getBoolPref("matchOS");
+        if (!match_os)
+        {
+            pref = gPrefService.getBranch("general.useragent.");
+            gSettings["locale"] = pref.getCharPref("locale");
+        }
+    }  catch (err)  {;}
+
     // Load settings
     for (var n in gKnownSettings)
     {
@@ -121,7 +134,7 @@
         catch (err)
         {
             // Clear invalid user setting and load default value
-            try { gPref.clearUserPref(name); }  catch (err)  {;}
+            try  { gPref.clearUserPref(name); }  catch (err)  {;}
             try
             {
                 switch (gKnownSettings[n])
@@ -148,6 +161,19 @@
 // Saves new settings from Settings Screen
 function doSaveSettings()
 {
+    // Save UI locale
+    if (gSettings["locale"] == "")
+    {
+        gPrefService.getBranch("intl.locale.").setBoolPref("matchOS", true);
+        gPrefService.getBranch("general.useragent.").clearUserPref("locale");
+    }
+    else
+    {
+        gPrefService.getBranch("intl.locale.").setBoolPref("matchOS", false);
+        gPrefService.getBranch("general.useragent.")
+            .setCharPref("locale", gSettings["locale"]);
+    }
+
     // Save settings now
     for (var n in gKnownSettings)
     {
@@ -169,12 +195,25 @@
 // Shows the Settings dialog box
 function doEditSettings()
 {
+    var old_locale = gSettings["locale"];
+
     var result = {};
     window.openDialog("chrome://mathcast/content/settingsdialog.xul",
             "settingsdialog",
             "chrome,centerscreen,modal",
             gSettings, result);
-    if (result.changed)  doSaveSettings();
+    if (!result.changed)  return;
+
+    // Tell user to restart editor if locale has changed
+    if (gSettings["locale"] != old_locale)
+    {
+        var title = gStrBundle.getString("title.appName");
+        var message = gStrBundle.getString("message.localeChanged");
+        gPrompt.alert(null, title, message);
+    }
+
+    // Save settings
+    doSaveSettings();
 }
 
 

Modified: trunk/chrome/content/settingsdialog.xul
===================================================================
--- trunk/chrome/content/settingsdialog.xul	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/content/settingsdialog.xul	2014-09-22 13:13:05 UTC (rev 189)
@@ -30,7 +30,7 @@
         .getService(Components.interfaces.nsIXULRuntime); 
     var gSettings = window.arguments[0];
     var gPrompt = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-            .getService(Components.interfaces.nsIPromptService);
+        .getService(Components.interfaces.nsIPromptService);
 
     // Sets a radio group by value
     function _setRadioGroup(id, value, defValue)
@@ -75,6 +75,37 @@
         return value;
     }
 
+    // Populates the locale menulist
+    function _populateLocale()
+    {
+        var o = document.getElementById("setUiLocale");
+        if (!o)  return;
+
+        // Insert an item for system's default locale
+        var gStrBundle = document.getElementById("bundleMathcast");
+        var systemDefault = gStrBundle.getString("title.systemDefault");
+        o.appendItem(systemDefault, "");
+
+        // Obtain available locales
+        var creg = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
+            .getService(Components.interfaces.nsIChromeRegistry);
+        var toolkit_creg = creg.QueryInterface(
+            Components.interfaces.nsIToolkitChromeRegistry);
+
+        var avail = toolkit_creg.getLocalesForPackage("mathcast");
+
+        // Enumerate locales
+        while (avail.hasMore())
+        {
+            var locale = avail.getNext();
+            o.appendItem(locale, locale);
+        }
+
+        // Select current locale
+        o.value = gSettings["locale"];
+        if (o.selectedItem === null)  o.value = "";
+    }
+
     // Initializes the dialog box
     function onLoad()
     {
@@ -115,6 +146,9 @@
         document.getElementById("setHttpPort").value = gSettings["port"];
         document.getElementById("setEnableServer").checked = gSettings["enableHTTPServer"];
 
+        // Populate locale menulist
+        _populateLocale();
+
         document.getElementById("setCopyType").focus();
     }
 
@@ -185,6 +219,7 @@
         gSettings["spaceSize"]        = space_size;
         gSettings["port"]             = port;
         gSettings["enableHTTPServer"] = document.getElementById("setEnableServer").checked;
+        gSettings["locale"]           = document.getElementById("setUiLocale").value;
 
         // Indicate to caller changes were made
         window.arguments[1].changed = true;
@@ -242,14 +277,6 @@
       </columns>
       <rows>
         <row>
-          <label control="setEditMode" value="&editMode.title;"
-              accesskey="&editMode.accesskey;"/>
-          <radiogroup id="setEditMode">
-            <radio value="mathline" label="&editModeMathLine.label;" tooltiptext="&editModeMathLine.tooltip;"/>
-            <radio value="ukmaths" label="&editModeUKMaths.label;" tooltiptext="&editModeUKMaths.tooltip;"/>
-          </radiogroup>
-        </row>
-        <row>
           <label control="setDisplayType" value="&displayType.title;"
               accesskey="&displayType.accesskey;"/>
           <radiogroup id="setDisplayType">
@@ -383,6 +410,33 @@
     </grid>
   </groupbox>
 
+  <groupbox>
+    <caption label="&grpUiSettings.label;"/>
+    <grid flex="1">
+      <columns>
+        <column flex="0"/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row>
+          <label control="setEditMode" value="&editMode.title;"
+              accesskey="&editMode.accesskey;"/>
+          <radiogroup id="setEditMode">
+            <radio value="mathline" label="&editModeMathLine.label;" tooltiptext="&editModeMathLine.tooltip;"/>
+            <radio value="ukmaths" label="&editModeUKMaths.label;" tooltiptext="&editModeUKMaths.tooltip;"/>
+          </radiogroup>
+        </row>
+        <row>
+          <label control="setUiLocale" value="&uiLocale.title;"
+              accesskey="&uiLocale.accesskey;"/>
+          <hbox>
+            <menulist id="setUiLocale" tooltiptext="&uiLocale.tooltip;"/>
+          </hbox>
+        </row>
+      </rows>
+    </grid>
+  </groupbox>
+
 </dialog>
 
 

Modified: trunk/chrome/locale/en-US/mathcast.dtd
===================================================================
--- trunk/chrome/locale/en-US/mathcast.dtd	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/locale/en-US/mathcast.dtd	2014-09-22 13:13:05 UTC (rev 189)
@@ -7,6 +7,7 @@
 <!ENTITY grpDataSettings.label "Data Format">
 <!ENTITY grpEqSettings.label "Default Equation Properties">
 <!ENTITY grpHttpSettings.label "HTTP Server">
+<!ENTITY grpUiSettings.label "User Interface">
 
 <!ENTITY appVersion.label "Version MATHCAST_VERSION">
 <!ENTITY appCopyright.label "Copyright (C) Tom Chakam and Timothy Lee, 2004-2013.">
@@ -80,6 +81,10 @@
 <!ENTITY enableServer.label "Enable">
 <!ENTITY enableServer.accesskey "E">
 
+<!ENTITY uiLocale.title "Locale:">
+<!ENTITY uiLocale.accesskey "L">
+<!ENTITY uiLocale.tooltip "Language shown on the user interface">
+
 <!ENTITY menuFile.label "File">
 <!ENTITY menuFile.accesskey "F">
 <!ENTITY menuEdit.label "Edit">

Modified: trunk/chrome/locale/en-US/mathcast.properties
===================================================================
--- trunk/chrome/locale/en-US/mathcast.properties	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/locale/en-US/mathcast.properties	2014-09-22 13:13:05 UTC (rev 189)
@@ -20,6 +20,7 @@
 message.invalidFontSize=Font size must be between %S and %S
 message.invalidHttpPort=Port number must be between %S and %S
 message.invalidSpaceSize=Space size must be between %S and %S
+message.localeChanged=Please restart MathCast to show UI in new locale.
 message.opening=Opening %S
 message.redoing=Redoing changes
 message.undoing=Undoing changes
@@ -45,6 +46,7 @@
 title.invalidUrl=Invalid URL
 title.openMml=Open MathML File
 title.saveMml=Save MathML File
+title.systemDefault=System Default
 
 status.equationName=Name:  %S
 status.quickKeyOn=Quick keys are now on.  Press Ctrl+Q to switch.

Modified: trunk/chrome/locale/zh-TW/mathcast.dtd
===================================================================
--- trunk/chrome/locale/zh-TW/mathcast.dtd	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/locale/zh-TW/mathcast.dtd	2014-09-22 13:13:05 UTC (rev 189)
@@ -7,6 +7,7 @@
 <!ENTITY grpDataSettings.label "資料格式">
 <!ENTITY grpEqSettings.label "預設方程式屬性">
 <!ENTITY grpHttpSettings.label "HTTP 伺服器">
+<!ENTITY grpUiSettings.label "使用介面">
 
 <!ENTITY appVersion.label "MATHCAST_VERSION 版">
 <!ENTITY appCopyright.label "(C) 2004-2013 版權屬 Tom Chakam 及 Timothy Lee。">
@@ -50,14 +51,14 @@
 
 <!ENTITY editMode.title "編輯模式(T):">
 <!ENTITY editMode.accesskey "T">
-<!ENTITY editModeMathLine.label "Rapid Mathline">
+<!ENTITY editModeMathLine.label "快速數學欄">
 <!ENTITY editModeMathLine.tooltip "一個直接並有效率的方法，可快速開發數學方程式">
 <!ENTITY editModeUKMaths.label "英國數學點字">
 <!ENTITY editModeUKMaths.tooltip "由 BAUK 指定的數學點字標示法">
 
 <!ENTITY displayType.title "顯示方式(D)：">
 <!ENTITY displayType.accesskey "D">
-<!ENTITY displayTypeBlock.label "方樞">
+<!ENTITY displayTypeBlock.label "方塊">
 <!ENTITY displayTypeBlock.tooltip "方便把方程式置中於頁面內">
 <!ENTITY displayTypeInline.label "嵌入">
 <!ENTITY displayTypeInline.tooltip "方便把方程式嵌入段落中">
@@ -80,6 +81,10 @@
 <!ENTITY enableServer.label "啟用(E)">
 <!ENTITY enableServer.accesskey "E">
 
+<!ENTITY uiLocale.title "語系(L)：">
+<!ENTITY uiLocale.accesskey "L">
+<!ENTITY uiLocale.tooltip "使用介面所採用的語系">
+
 <!ENTITY menuFile.label "檔案(F)">
 <!ENTITY menuFile.accesskey "F">
 <!ENTITY menuEdit.label "編輯(E)">

Modified: trunk/chrome/locale/zh-TW/mathcast.properties
===================================================================
--- trunk/chrome/locale/zh-TW/mathcast.properties	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/chrome/locale/zh-TW/mathcast.properties	2014-09-22 13:13:05 UTC (rev 189)
@@ -20,6 +20,7 @@
 message.invalidFontSize=字型大小必須在 %S 與 %S 之內
 message.invalidHttpPort=連接埠必須在 %S 與 %S 之內
 message.invalidSpaceSize=空格大小必須在 %S 與 %S 之內
+message.localeChanged=請重新啟動 MathCast 以便能利用新語系顯示使用介面。
 message.opening=正在開啟 %S
 message.redoing=正在重做改動
 message.undoing=正在復原改動
@@ -45,6 +46,7 @@
 title.invalidUrl=無效的 URL
 title.openMml=開啟 MathML 檔
 title.saveMml=儲存 MathML 檔
+title.systemDefault=系統預設
 
 status.equationName=名稱：%S
 status.quickKeyOn=已啟用快速鍵。按 Ctrl+Q 來切換。

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2014-09-18 02:58:56 UTC (rev 188)
+++ trunk/win32/mathcast.nsi	2014-09-22 13:13:05 UTC (rev 189)
@@ -1,5 +1,5 @@
 !define APP_VER "0.93"
-!define APP_REL "2"
+!define APP_REL "beta1"
 !define APP_NAME "mathcast"
 !define APP_DESC "MathCast"
 !define APP_LINK "${APP_DESC}" 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[188] trunk/chrome/content/bindings/equationlist.xml

From: <tim...@us...> - 2014-09-18 02:59:00

Revision: 188
          http://sourceforge.net/p/mathcast/code/188
Author:   timothylee
Date:     2014-09-18 02:58:56 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
- Make sure the accessible name of each equation corresponds to its MathML

Modified Paths:
--------------
    trunk/chrome/content/bindings/equationlist.xml

Modified: trunk/chrome/content/bindings/equationlist.xml
===================================================================
--- trunk/chrome/content/bindings/equationlist.xml	2014-09-05 16:05:10 UTC (rev 187)
+++ trunk/chrome/content/bindings/equationlist.xml	2014-09-18 02:58:56 UTC (rev 188)
@@ -40,10 +40,14 @@
     <implementation>
 
       <!-- Label contains raw MathML -->
-      <field name="_label">new String()</field>
+      <field name="_label">null</field>
       <property name="label" readonly="true">
         <getter>
         <![CDATA[
+          // Update label from MathML content when not available
+          if (this._label === null)
+              this._label =
+                  (new XMLSerializer).serializeToString(this.firstChild);
           return this._label;
         ]]>
         </getter>
@@ -60,7 +64,9 @@
           while ((first = this.firstChild))
               this.removeChild(first);
           this.appendChild(mml);
-          this._label = (new XMLSerializer).serializeToString(mml);
+
+          // Force label to be refreshed upon access
+          this._label = null;
         ]]>
         </body>
       </method>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[187] trunk/win32/mathcast.nsi

From: <tim...@us...> - 2014-09-05 16:05:14

Revision: 187
          http://sourceforge.net/p/mathcast/code/187
Author:   timothylee
Date:     2014-09-05 16:05:10 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
- Bump release number

Modified Paths:
--------------
    trunk/win32/mathcast.nsi

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2014-09-05 16:04:28 UTC (rev 186)
+++ trunk/win32/mathcast.nsi	2014-09-05 16:05:10 UTC (rev 187)
@@ -1,5 +1,5 @@
 !define APP_VER "0.93"
-!define APP_REL "1"
+!define APP_REL "2"
 !define APP_NAME "mathcast"
 !define APP_DESC "MathCast"
 !define APP_LINK "${APP_DESC}" 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[186] trunk/win32/MathCast.exe

From: <tim...@us...> - 2014-09-05 16:04:35

Revision: 186
          http://sourceforge.net/p/mathcast/code/186
Author:   timothylee
Date:     2014-09-05 16:04:28 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
- Update MathCast.exe from XULRunner 32

Modified Paths:
--------------
    trunk/win32/MathCast.exe

Modified: trunk/win32/MathCast.exe
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[185] trunk/chrome

From: <tim...@us...> - 2014-09-03 02:18:53

Revision: 185
          http://sourceforge.net/p/mathcast/code/185
Author:   timothylee
Date:     2014-09-03 02:18:46 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
- Update libbrl2mml to fix crash
- Escape apostrophes when populating Math menu
- Fix dot operator code under UK Maths

Modified Paths:
--------------
    trunk/chrome/content/bindings/mathline.xml
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/content/lib32/libbrl2mml-1.dll
    trunk/chrome/content/lib32/libbrl2mml.so.1
    trunk/chrome/content/lib64/libbrl2mml.so.1
    trunk/chrome/locale/en-US/known.xml
    trunk/chrome/locale/zh-TW/known.xml

Modified: trunk/chrome/content/bindings/mathline.xml
===================================================================
--- trunk/chrome/content/bindings/mathline.xml	2014-09-02 14:46:59 UTC (rev 184)
+++ trunk/chrome/content/bindings/mathline.xml	2014-09-03 02:18:46 UTC (rev 185)
@@ -487,11 +487,12 @@
               var accesskey = String.fromCharCode((count < 10) ?
                       (count + 48) : (count + 55));
               var m = document.createElement("menuitem");
+              var sym = item.t.replace("'", "'+\"'\"+'");
               m.setAttribute("label", item.i + " (" + accesskey + ")");
 			  m.setAttribute("class", "menuitem-iconic");
               m.setAttribute("accesskey", accesskey);
               m.setAttribute("image", img);
-              m.setAttribute("oncommand", "doMathLineSymbol('" + item.t + "')");
+              m.setAttribute("oncommand", "doMathLineSymbol('" + sym + "')");
 
               // Setup hot-key
               for (var n = 0;  n < item.hk.length;  ++n)

Modified: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib32/libbrl2mml-1.dll
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib32/libbrl2mml.so.1
===================================================================
(Binary files differ)

Modified: trunk/chrome/content/lib64/libbrl2mml.so.1
===================================================================
(Binary files differ)

Modified: trunk/chrome/locale/en-US/known.xml
===================================================================
--- trunk/chrome/locale/en-US/known.xml	2014-09-02 14:46:59 UTC (rev 184)
+++ trunk/chrome/locale/en-US/known.xml	2014-09-03 02:18:46 UTC (rev 185)
@@ -1635,7 +1635,7 @@
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
-			<ukmaths>.'</ukmaths>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>

Modified: trunk/chrome/locale/zh-TW/known.xml
===================================================================
--- trunk/chrome/locale/zh-TW/known.xml	2014-09-02 14:46:59 UTC (rev 184)
+++ trunk/chrome/locale/zh-TW/known.xml	2014-09-03 02:18:46 UTC (rev 185)
@@ -1635,7 +1635,7 @@
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
-			<ukmaths>.'</ukmaths>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[184] trunk/win32/mathcast.nsi

From: <tim...@us...> - 2014-09-02 14:47:06

Revision: 184
          http://sourceforge.net/p/mathcast/code/184
Author:   timothylee
Date:     2014-09-02 14:46:59 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
- Exclude linux shared libraries from NSIS installer

Modified Paths:
--------------
    trunk/win32/mathcast.nsi

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2014-09-02 13:32:20 UTC (rev 183)
+++ trunk/win32/mathcast.nsi	2014-09-02 14:46:59 UTC (rev 184)
@@ -85,7 +85,7 @@
   File ..\application.ini
   File "${XUL_ZIP}"
   SetOutPath "$INSTDIR\chrome"
-  File /r /x ".svn" "..\chrome\*"
+  File /r /x ".svn" /x "*.so.1" "..\chrome\*"
   SetOutPath "$INSTDIR\defaults\preferences"
   File ..\defaults\preferences\prefs.js
   SetOutPath "$INSTDIR\examples"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[183] trunk/win32

From: <tim...@us...> - 2014-09-02 13:32:29

Revision: 183
          http://sourceforge.net/p/mathcast/code/183
Author:   timothylee
Date:     2014-09-02 13:32:20 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
- Move to XULRunner 32

Modified Paths:
--------------
    trunk/win32/mathcast.nsi

Added Paths:
-----------
    trunk/win32/xulrunner-32.0.en-US.win32.zip

Removed Paths:
-------------
    trunk/win32/xulrunner-18.0.2.en-US.win32.zip

Modified: trunk/win32/mathcast.nsi
===================================================================
--- trunk/win32/mathcast.nsi	2014-09-02 12:44:14 UTC (rev 182)
+++ trunk/win32/mathcast.nsi	2014-09-02 13:32:20 UTC (rev 183)
@@ -1,11 +1,11 @@
-!define APP_VER "0.92"
+!define APP_VER "0.93"
 !define APP_REL "1"
 !define APP_NAME "mathcast"
 !define APP_DESC "MathCast"
 !define APP_LINK "${APP_DESC}" 
 !define APP_DIR "${APP_DESC}" 
 !define APP_LICENCE "GPLv3.rtf"
-!define XUL_ZIP "xulrunner-18.0.2.en-US.win32.zip"
+!define XUL_ZIP "xulrunner-32.0.en-US.win32.zip"
 
 BrandingText "Tom Chakam and Timothy Lee"
 OutFile "${APP_NAME}-${APP_VER}-${APP_REL}.exe"

Deleted: trunk/win32/xulrunner-18.0.2.en-US.win32.zip
===================================================================
(Binary files differ)

Added: trunk/win32/xulrunner-32.0.en-US.win32.zip
===================================================================
(Binary files differ)

Index: trunk/win32/xulrunner-32.0.en-US.win32.zip
===================================================================
--- trunk/win32/xulrunner-32.0.en-US.win32.zip	2014-09-02 12:44:14 UTC (rev 182)
+++ trunk/win32/xulrunner-32.0.en-US.win32.zip	2014-09-02 13:32:20 UTC (rev 183)

Property changes on: trunk/win32/xulrunner-32.0.en-US.win32.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/zip
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[182] trunk/chrome/locale

From: <tim...@us...> - 2014-09-02 12:44:17

Revision: 182
          http://sourceforge.net/p/mathcast/code/182
Author:   timothylee
Date:     2014-09-02 12:44:14 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
- Add more menu items for UK Maths

Modified Paths:
--------------
    trunk/chrome/locale/en-US/known.xml
    trunk/chrome/locale/zh-TW/known.xml

Modified: trunk/chrome/locale/en-US/known.xml
===================================================================
--- trunk/chrome/locale/en-US/known.xml	2014-09-02 09:02:29 UTC (rev 181)
+++ trunk/chrome/locale/en-US/known.xml	2014-09-02 12:44:14 UTC (rev 182)
@@ -1635,7 +1635,7 @@
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
-			<ukmaths>;'</ukmaths>
+			<ukmaths>.'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>
@@ -1656,21 +1656,25 @@
 			<m>&#x00AF;</m>
 			<t>¯</t>
 			<i>stretched line</i>
+			<ukmaths>:</ukmaths>
 		</in>
 		<in>
 			<m>~</m>
 			<t>~</t>
 			<i>stretched tilde</i>
+			<ukmaths>^:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C6;</m>
 			<t>ˆ</t>
 			<i>stretched caret</i>
+			<ukmaths>@:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C7;</m>
 			<t>ˇ</t>
 			<i>stretched caron</i>
+			<ukmaths>@&gt;</ukmaths>
 		</in>
 		<in>
 			<m>&#x23DC;</m>
@@ -1724,23 +1728,27 @@
 			<t>⁻¹</t>
 			<sc>^⁻1</sc>
 			<i>-1 power</i>
+			<ukmaths>+;-1</ukmaths>
 		</in>
 		<in>
 			<t>¹</t>
 			<sc>^1</sc>
 			<i>1 power</i>
+			<ukmaths>+1</ukmaths>
 		</in>
 		<in>
 			<t>²</t>
 			<sc>^2</sc>
 			<i>squared</i>
 			<hk>Ctrl+2</hk>
+			<ukmaths>+2</ukmaths>
 		</in>
 		<in>
 			<t>³</t>
 			<sc>^3</sc>
 			<i>cubed</i>
 			<hk>Ctrl+3</hk>
+			<ukmaths>+3</ukmaths>
 		</in>
 	</group>
 	<group name='algebra'>
@@ -1758,6 +1766,7 @@
 			<i>vector</i>
 			<hk>Ctrl+-</hk>
 			<ti>x̅</ti>
+			<ukmaths>.3o</ukmaths>
 		</in>
 		<in>
 			<t>̇</t>
@@ -1765,6 +1774,7 @@
 			<i>dot derivative</i>
 			<hk>Ctrl+4</hk>
 			<ti>ẋ</ti>
+			<ukmaths>'</ukmaths>
 		</in>
 		<in>
 			<t>̈</t>
@@ -1772,6 +1782,7 @@
 			<i>two dots above</i>
 			<hk>Ctrl+5</hk>
 			<ti>ẍ</ti>
+			<ukmaths>-</ukmaths>
 		</in>
 		<in>
 			<t>̿̿</t>
@@ -1779,6 +1790,7 @@
 			<i>overline</i>
 			<hk>Ctrl+=</hk>
 			<ti>x̿</ti>
+			<ukmaths>:</ukmaths>
 		</in>
 		<in>
 			<t>̂</t>
@@ -1786,6 +1798,7 @@
 			<i>rooftop</i>
 			<hk>Ctrl+6</hk>
 			<ti>x̂</ti>
+			<ukmaths>@:</ukmaths>
 		</in>
 		<in>
 			<t>̃</t>
@@ -1793,6 +1806,7 @@
 			<i>tilde above</i>
 			<hk>Ctrl+`</hk>
 			<ti>x̃</ti>
+			<ukmaths>^:</ukmaths>
 		</in>
 		<in>
 			<t>̱</t>
@@ -1800,6 +1814,7 @@
 			<i>underline</i>
 			<hk>Ctrl+\</hk>
 			<ti>x̱</ti>
+			<ukmaths>*:</ukmaths>
 		</in>
 	</group>
 </shortcuts>
@@ -1811,41 +1826,49 @@
 			<m>log</m>
 			<t>log</t>
 			<i>logarithm</i>
+			<ukmaths>$l</ukmaths>
 		</in>
 		<in>
 			<m>ln</m>
 			<t>ln</t>
 			<i>natural logarithm</i>
+			<ukmaths>$ln</ukmaths>
 		</in>
 		<in>
 			<m>exp</m>
 			<t>exp</t>
 			<i>exponent</i>
+			<ukmaths>$exp</ukmaths>
 		</in>
 		<in>
 			<m>max</m>
 			<t>max</t>
 			<i>maximum</i>
+			<ukmaths>$max</ukmaths>
 		</in>
 		<in>
 			<m>min</m>
 			<t>min</t>
 			<i>minimum</i>
+			<ukmaths>$min</ukmaths>
 		</in>
 		<in>
 			<m>const</m>
 			<t>const</t>
 			<i>constant</i>
+			<ukmaths>$const</ukmaths>
 		</in>
 		<in>
 			<m>sign</m>
 			<t>sign</t>
 			<i>sign</i>
+			<ukmaths>$sign</ukmaths>
 		</in>
 		<in>
 			<m>dB</m>
 			<t>dB</t>
 			<i>decibel</i>
+			<ukmaths> ;d,b</ukmaths>
 		</in>		
 	</group>
 	<group name='trigonometry'>
@@ -1853,86 +1876,103 @@
 			<m>sin</m>
 			<t>sin</t>
 			<i>sine</i>
+			<ukmaths>$s</ukmaths>
 		</in>
 		<in>
 			<m>cos</m>
 			<t>cos</t>
 			<i>cosine</i>
+			<ukmaths>$c</ukmaths>
 		</in>
 		<in>
 			<m>tan</m>
 			<t>tan</t>
 			<i>tangent</i>
+			<ukmaths>$t</ukmaths>
 		</in>
 		<in>
 			<m>sec</m>
 			<t>sec</t>
 			<i>secant</i>
+			<ukmaths>$-</ukmaths>
 		</in>
 		<in>
 			<m>cosec</m>
 			<t>cosec</t>
 			<i>cosecant</i>
+			<i>$&lt;</i>
 		</in>
 		<in>
 			<m>cot</m>
 			<t>cot</t>
 			<i>cotangent</i>
+			<i>$\</i>
 		</in>
 		<in>
 			<m>arcsin</m>
 			<t>arcsin</t>
 			<i>arc-sine</i>
+			<ukmaths>$@s</ukmaths>
 		</in>
 		<in>
 			<m>arccos</m>
 			<t>arccos</t>
 			<i>arc-cosine</i>
+			<ukmaths>$@c</ukmaths>
 		</in>
 		<in>
 			<m>arctan</m>
 			<t>arctan</t>
 			<i>arc-tangent</i>
+			<ukmaths>$@t</ukmaths>
 		</in>
 		<in>
 			<m>arccot</m>
 			<t>arccot</t>
 			<i>arc-cotangent</i>
+			<ukmaths>$@\</ukmaths>
 		</in>
 		<in>
 			<m>sinh</m>
 			<t>sinh</t>
 			<i>hyperbolic sine</i>
+			<ukmaths>$hs</ukmaths>
 		</in>
 		<in>
 			<m>cosh</m>
 			<t>cosh</t>
 			<i>hyperbolic cosine</i>
+			<ukmaths>$hc</ukmaths>
 		</in>
 		<in>
 			<m>tanh</m>
 			<t>tanh</t>
 			<i>hyperbolic tangent</i>
+			<ukmaths>$ht</ukmaths>
 		</in>
 		<in>
 			<m>Arcsin</m>
 			<t>Arcsin</t>
 			<i>Arc-sine</i>
+			<ukmaths>$8s</ukmaths>
 		</in>
 		<in>
 			<m>Arccos</m>
 			<t>Arccos</t>
 			<i>Arc-cosine</i>
+			<ukmaths>$8c</ukmaths>
 		</in>
 		<in>
 			<m>Arctan</m>
 			<t>Arctan</t>
 			<i>Arc-tangent</i>
+			<ukmaths>$8t</ukmaths>
 		</in>
 		<in>
 			<m>rad</m>
 			<t>rad</t>
 			<i>radian</i>
+			<ukmaths> -</ukmaths>
 		</in>
 	</group>
 	<group name='linear algebra'>
@@ -1940,21 +1980,25 @@
 			<m>det</m>
 			<t>det</t>
 			<i>determinant</i>
+			<ukmaths>$det</ukmaths>
 		</in>
 		<in>
 			<m>rank</m>
 			<t>rank</t>
 			<i>rank</i>
+			<ukmaths>$rank</ukmaths>
 		</in>
 		<in>
 			<m>dim</m>
 			<t>dim</t>
 			<i>dimension</i>
+			<ukmaths>$dim</ukmaths>
 		</in>
 		<in>
 			<m>ker</m>
 			<t>ker</t>
 			<i>kernel</i>
+			<ukmaths>$ker</ukmaths>
 		</in>
 	</group>
 	<group name='complex'>
@@ -1962,31 +2006,37 @@
 			<m>conj</m>
 			<t>conj</t>
 			<i>conjugate</i>
+			<ukmaths>$conj</ukmaths>
 		</in>
 		<in>
 			<m>Re</m>
 			<t>Re</t>
 			<i>real part</i>
+			<ukmaths>$re</ukmaths>
 		</in>
 		<in>
 			<m>Im</m>
 			<t>Im</t>
 			<i>imaginary part</i>
+			<ukmaths>$im</ukmaths>
 		</in>
 		<in>
 			<m>abs</m>
 			<t>abs</t>
 			<i>absolute value</i>
+			<ukmaths>$abs</ukmaths>
 		</in>
 		<in>
 			<m>arg</m>
 			<t>arg</t>
 			<i>argument</i>
+			<ukmaths>$arg</ukmaths>
 		</in>
 		<in>
 			<m>angle</m>
 			<t>angle</t>
 			<i>angle</i>
+			<ukmaths>$angle</ukmaths>
 		</in>
 	</group>
 	<group name='calculus'>
@@ -1994,6 +2044,7 @@
 			<m>lim</m>
 			<t>lim</t>
 			<i>limit</i>
+			<ukmaths>$lim</ukmaths>
 		</in>
 	</group>
 	<group name='operators'>
@@ -2001,21 +2052,25 @@
 			<m>grad</m>
 			<t>grad</t>
 			<i>gradient</i>
+			<ukmaths>$g</ukmaths>
 		</in>
 		<in>
 			<m>div</m>
 			<t>div</t>
 			<i>divergence</i>
+			<ukmaths>$?</ukmaths>
 		</in>
 		<in>
 			<m>rot</m>
 			<t>rot</t>
 			<i>rotor</i>
+			<ukmaths>$rot</ukmaths>
 		</in>
 		<in>
 			<m>curl</m>
 			<t>curl</t>
 			<i>curl</i>
+			<ukmaths>$%</ukmaths>
 		</in>
 	</group>
 </functions>
@@ -2046,6 +2101,7 @@
 			<i>subscript</i>
 			<u>b◟x</u>
 			<hk>Ctrl+L</hk>
+			<ukmaths>*</ukmaths>
 		</in>
 		<in>
 			<mname>msup</mname>
@@ -2053,6 +2109,7 @@
 			<i>superscript</i>
 			<u>b^x</u>
 			<hk>Ctrl+H</hk>
+			<ukmaths>+</ukmaths>
 		</in>
 		<in>
 			<mname>msubsup</mname>
@@ -2067,6 +2124,7 @@
 			<i>underscript</i>
 			<u>b_x</u>
 			<hk>Ctrl+U</hk>
+			<ukmaths>*</ukmaths>
 		</in>
 		<in>
 			<mname>mover</mname>
@@ -2074,6 +2132,7 @@
 			<i>overscript</i>
 			<u>b‾x</u>
 			<hk>Ctrl+O</hk>
+			<ukmaths>+</ukmaths>
 		</in>
 		<in>
 			<mname>munderover</mname>
@@ -2095,6 +2154,7 @@
 			<i>square root</i>
 			<u>√x</u>
 			<hk>Ctrl+R</hk>
+			<ukmaths>%</ukmaths>
 		</in>
 		<in>
 			<mname>mroot</mname>
@@ -2102,6 +2162,7 @@
 			<i>n'th root (not just 4th)</i>
 			<u>n∜x</u>
 			<hk>Ctrl+T</hk>
+			<ukmaths>%</ukmaths>
 		</in>
 	</group>
 	<group name='arithmetics'>
@@ -2110,6 +2171,7 @@
 			<t>╱</t>
 			<i>over</i>
 			<u>a╱b</u>
+			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<mname>mfrac</mname>
@@ -2124,11 +2186,13 @@
 			<i>left parenthesis</i>
 			<remark>remember to close with ')'</remark>
 			<u>f(a+b)</u>
+			<ukmaths>&lt;</ukmaths>
 		</in>
 		<in>
 			<t>)</t>
 			<i>right parenthesis</i>
 			<u>f(a+b)</u>
+			<ukmaths>&gt;</ukmaths>
 		</in>
 		<in>
 			<t>‹</t>

Modified: trunk/chrome/locale/zh-TW/known.xml
===================================================================
--- trunk/chrome/locale/zh-TW/known.xml	2014-09-02 09:02:29 UTC (rev 181)
+++ trunk/chrome/locale/zh-TW/known.xml	2014-09-02 12:44:14 UTC (rev 182)
@@ -1635,7 +1635,7 @@
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
-			<ukmaths>;'</ukmaths>
+			<ukmaths>.'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>
@@ -1656,21 +1656,25 @@
 			<m>&#x00AF;</m>
 			<t>¯</t>
 			<i>stretched line</i>
+			<ukmaths>:</ukmaths>
 		</in>
 		<in>
 			<m>~</m>
 			<t>~</t>
 			<i>stretched tilde</i>
+			<ukmaths>^:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C6;</m>
 			<t>ˆ</t>
 			<i>stretched caret</i>
+			<ukmaths>@:</ukmaths>
 		</in>
 		<in>
 			<m>&#x02C7;</m>
 			<t>ˇ</t>
 			<i>stretched caron</i>
+			<ukmaths>@&gt;</ukmaths>
 		</in>
 		<in>
 			<m>&#x23DC;</m>
@@ -1724,23 +1728,27 @@
 			<t>⁻¹</t>
 			<sc>^⁻1</sc>
 			<i>-1 power</i>
+			<ukmaths>+;-1</ukmaths>
 		</in>
 		<in>
 			<t>¹</t>
 			<sc>^1</sc>
 			<i>1 power</i>
+			<ukmaths>+1</ukmaths>
 		</in>
 		<in>
 			<t>²</t>
 			<sc>^2</sc>
 			<i>squared</i>
 			<hk>Ctrl+2</hk>
+			<ukmaths>+2</ukmaths>
 		</in>
 		<in>
 			<t>³</t>
 			<sc>^3</sc>
 			<i>cubed</i>
 			<hk>Ctrl+3</hk>
+			<ukmaths>+3</ukmaths>
 		</in>
 	</group>
 	<group name='代數'>
@@ -1758,6 +1766,7 @@
 			<i>vector</i>
 			<hk>Ctrl+-</hk>
 			<ti>x̅</ti>
+			<ukmaths>.3o</ukmaths>
 		</in>
 		<in>
 			<t>̇</t>
@@ -1765,6 +1774,7 @@
 			<i>dot derivative</i>
 			<hk>Ctrl+4</hk>
 			<ti>ẋ</ti>
+			<ukmaths>'</ukmaths>
 		</in>
 		<in>
 			<t>̈</t>
@@ -1772,6 +1782,7 @@
 			<i>two dots above</i>
 			<hk>Ctrl+5</hk>
 			<ti>ẍ</ti>
+			<ukmaths>-</ukmaths>
 		</in>
 		<in>
 			<t>̿̿</t>
@@ -1779,6 +1790,7 @@
 			<i>overline</i>
 			<hk>Ctrl+=</hk>
 			<ti>x̿</ti>
+			<ukmaths>:</ukmaths>
 		</in>
 		<in>
 			<t>̂</t>
@@ -1786,6 +1798,7 @@
 			<i>rooftop</i>
 			<hk>Ctrl+6</hk>
 			<ti>x̂</ti>
+			<ukmaths>@:</ukmaths>
 		</in>
 		<in>
 			<t>̃</t>
@@ -1793,6 +1806,7 @@
 			<i>tilde above</i>
 			<hk>Ctrl+`</hk>
 			<ti>x̃</ti>
+			<ukmaths>^:</ukmaths>
 		</in>
 		<in>
 			<t>̱</t>
@@ -1800,6 +1814,7 @@
 			<i>underline</i>
 			<hk>Ctrl+\</hk>
 			<ti>x̱</ti>
+			<ukmaths>*:</ukmaths>
 		</in>
 	</group>
 </shortcuts>
@@ -1811,41 +1826,49 @@
 			<m>log</m>
 			<t>log</t>
 			<i>logarithm</i>
+			<ukmaths>$l</ukmaths>
 		</in>
 		<in>
 			<m>ln</m>
 			<t>ln</t>
 			<i>natural logarithm</i>
+			<ukmaths>$ln</ukmaths>
 		</in>
 		<in>
 			<m>exp</m>
 			<t>exp</t>
 			<i>exponent</i>
+			<ukmaths>$exp</ukmaths>
 		</in>
 		<in>
 			<m>max</m>
 			<t>max</t>
 			<i>maximum</i>
+			<ukmaths>$max</ukmaths>
 		</in>
 		<in>
 			<m>min</m>
 			<t>min</t>
 			<i>minimum</i>
+			<ukmaths>$min</ukmaths>
 		</in>
 		<in>
 			<m>const</m>
 			<t>const</t>
 			<i>constant</i>
+			<ukmaths>$const</ukmaths>
 		</in>
 		<in>
 			<m>sign</m>
 			<t>sign</t>
 			<i>sign</i>
+			<ukmaths>$sign</ukmaths>
 		</in>
 		<in>
 			<m>dB</m>
 			<t>dB</t>
 			<i>decibel</i>
+			<ukmaths> ;d,b</ukmaths>
 		</in>		
 	</group>
 	<group name='三角學'>
@@ -1853,86 +1876,103 @@
 			<m>sin</m>
 			<t>sin</t>
 			<i>sine</i>
+			<ukmaths>$s</ukmaths>
 		</in>
 		<in>
 			<m>cos</m>
 			<t>cos</t>
 			<i>cosine</i>
+			<ukmaths>$c</ukmaths>
 		</in>
 		<in>
 			<m>tan</m>
 			<t>tan</t>
 			<i>tangent</i>
+			<ukmaths>$t</ukmaths>
 		</in>
 		<in>
 			<m>sec</m>
 			<t>sec</t>
 			<i>secant</i>
+			<ukmaths>$-</ukmaths>
 		</in>
 		<in>
 			<m>cosec</m>
 			<t>cosec</t>
 			<i>cosecant</i>
+			<i>$&lt;</i>
 		</in>
 		<in>
 			<m>cot</m>
 			<t>cot</t>
 			<i>cotangent</i>
+			<i>$\</i>
 		</in>
 		<in>
 			<m>arcsin</m>
 			<t>arcsin</t>
 			<i>arc-sine</i>
+			<ukmaths>$@s</ukmaths>
 		</in>
 		<in>
 			<m>arccos</m>
 			<t>arccos</t>
 			<i>arc-cosine</i>
+			<ukmaths>$@c</ukmaths>
 		</in>
 		<in>
 			<m>arctan</m>
 			<t>arctan</t>
 			<i>arc-tangent</i>
+			<ukmaths>$@t</ukmaths>
 		</in>
 		<in>
 			<m>arccot</m>
 			<t>arccot</t>
 			<i>arc-cotangent</i>
+			<ukmaths>$@\</ukmaths>
 		</in>
 		<in>
 			<m>sinh</m>
 			<t>sinh</t>
 			<i>hyperbolic sine</i>
+			<ukmaths>$hs</ukmaths>
 		</in>
 		<in>
 			<m>cosh</m>
 			<t>cosh</t>
 			<i>hyperbolic cosine</i>
+			<ukmaths>$hc</ukmaths>
 		</in>
 		<in>
 			<m>tanh</m>
 			<t>tanh</t>
 			<i>hyperbolic tangent</i>
+			<ukmaths>$ht</ukmaths>
 		</in>
 		<in>
 			<m>Arcsin</m>
 			<t>Arcsin</t>
 			<i>Arc-sine</i>
+			<ukmaths>$8s</ukmaths>
 		</in>
 		<in>
 			<m>Arccos</m>
 			<t>Arccos</t>
 			<i>Arc-cosine</i>
+			<ukmaths>$8c</ukmaths>
 		</in>
 		<in>
 			<m>Arctan</m>
 			<t>Arctan</t>
 			<i>Arc-tangent</i>
+			<ukmaths>$8t</ukmaths>
 		</in>
 		<in>
 			<m>rad</m>
 			<t>rad</t>
 			<i>radian</i>
+			<ukmaths> -</ukmaths>
 		</in>
 	</group>
 	<group name='線性代數'>
@@ -1940,21 +1980,25 @@
 			<m>det</m>
 			<t>det</t>
 			<i>determinant</i>
+			<ukmaths>$det</ukmaths>
 		</in>
 		<in>
 			<m>rank</m>
 			<t>rank</t>
 			<i>rank</i>
+			<ukmaths>$rank</ukmaths>
 		</in>
 		<in>
 			<m>dim</m>
 			<t>dim</t>
 			<i>dimension</i>
+			<ukmaths>$dim</ukmaths>
 		</in>
 		<in>
 			<m>ker</m>
 			<t>ker</t>
 			<i>kernel</i>
+			<ukmaths>$ker</ukmaths>
 		</in>
 	</group>
 	<group name='複數'>
@@ -1962,31 +2006,37 @@
 			<m>conj</m>
 			<t>conj</t>
 			<i>conjugate</i>
+			<ukmaths>$conj</ukmaths>
 		</in>
 		<in>
 			<m>Re</m>
 			<t>Re</t>
 			<i>real part</i>
+			<ukmaths>$re</ukmaths>
 		</in>
 		<in>
 			<m>Im</m>
 			<t>Im</t>
 			<i>imaginary part</i>
+			<ukmaths>$im</ukmaths>
 		</in>
 		<in>
 			<m>abs</m>
 			<t>abs</t>
 			<i>absolute value</i>
+			<ukmaths>$abs</ukmaths>
 		</in>
 		<in>
 			<m>arg</m>
 			<t>arg</t>
 			<i>argument</i>
+			<ukmaths>$arg</ukmaths>
 		</in>
 		<in>
 			<m>angle</m>
 			<t>angle</t>
 			<i>angle</i>
+			<ukmaths>$angle</ukmaths>
 		</in>
 	</group>
 	<group name='微積分'>
@@ -1994,6 +2044,7 @@
 			<m>lim</m>
 			<t>lim</t>
 			<i>limit</i>
+			<ukmaths>$lim</ukmaths>
 		</in>
 	</group>
 	<group name='運算符號'>
@@ -2001,21 +2052,25 @@
 			<m>grad</m>
 			<t>grad</t>
 			<i>gradient</i>
+			<ukmaths>$g</ukmaths>
 		</in>
 		<in>
 			<m>div</m>
 			<t>div</t>
 			<i>divergence</i>
+			<ukmaths>$?</ukmaths>
 		</in>
 		<in>
 			<m>rot</m>
 			<t>rot</t>
 			<i>rotor</i>
+			<ukmaths>$rot</ukmaths>
 		</in>
 		<in>
 			<m>curl</m>
 			<t>curl</t>
 			<i>curl</i>
+			<ukmaths>$%</ukmaths>
 		</in>
 	</group>
 </functions>
@@ -2046,6 +2101,7 @@
 			<i>subscript</i>
 			<u>b◟x</u>
 			<hk>Ctrl+L</hk>
+			<ukmaths>*</ukmaths>
 		</in>
 		<in>
 			<mname>msup</mname>
@@ -2053,6 +2109,7 @@
 			<i>superscript</i>
 			<u>b^x</u>
 			<hk>Ctrl+H</hk>
+			<ukmaths>+</ukmaths>
 		</in>
 		<in>
 			<mname>msubsup</mname>
@@ -2067,6 +2124,7 @@
 			<i>underscript</i>
 			<u>b_x</u>
 			<hk>Ctrl+U</hk>
+			<ukmaths>*</ukmaths>
 		</in>
 		<in>
 			<mname>mover</mname>
@@ -2074,6 +2132,7 @@
 			<i>overscript</i>
 			<u>b‾x</u>
 			<hk>Ctrl+O</hk>
+			<ukmaths>+</ukmaths>
 		</in>
 		<in>
 			<mname>munderover</mname>
@@ -2095,6 +2154,7 @@
 			<i>square root</i>
 			<u>√x</u>
 			<hk>Ctrl+R</hk>
+			<ukmaths>%</ukmaths>
 		</in>
 		<in>
 			<mname>mroot</mname>
@@ -2102,6 +2162,7 @@
 			<i>n'th root (not just 4th)</i>
 			<u>n∜x</u>
 			<hk>Ctrl+T</hk>
+			<ukmaths>%</ukmaths>
 		</in>
 	</group>
 	<group name='算術'>
@@ -2110,6 +2171,7 @@
 			<t>╱</t>
 			<i>over</i>
 			<u>a╱b</u>
+			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<mname>mfrac</mname>
@@ -2124,11 +2186,13 @@
 			<i>left parenthesis</i>
 			<remark>remember to close with ')'</remark>
 			<u>f(a+b)</u>
+			<ukmaths>&lt;</ukmaths>
 		</in>
 		<in>
 			<t>)</t>
 			<i>right parenthesis</i>
 			<u>f(a+b)</u>
+			<ukmaths>&gt;</ukmaths>
 		</in>
 		<in>
 			<t>‹</t>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[181] trunk

From: <tim...@us...> - 2014-09-02 09:02:39

Revision: 181
          http://sourceforge.net/p/mathcast/code/181
Author:   timothylee
Date:     2014-09-02 09:02:29 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
- Addition of UK Maths editing mode

Modified Paths:
--------------
    trunk/chrome/content/bindings/mathline.xml
    trunk/chrome/content/commands.xul
    trunk/chrome/content/edit.js
    trunk/chrome/content/equation.js
    trunk/chrome/content/main.js
    trunk/chrome/content/mathcast.xul
    trunk/chrome/content/menu.xul
    trunk/chrome/content/settingsdialog.xul
    trunk/chrome/content/version.js
    trunk/chrome/locale/en-US/known.xml
    trunk/chrome/locale/en-US/mathcast.dtd
    trunk/chrome/locale/zh-TW/known.xml
    trunk/chrome/locale/zh-TW/mathcast.dtd
    trunk/chrome/skin/mathcast.css
    trunk/defaults/preferences/prefs.js

Added Paths:
-----------
    trunk/chrome/content/bindings/ukmaths.xml
    trunk/chrome/skin/ukmaths.css

Modified: trunk/chrome/content/bindings/mathline.xml
===================================================================
--- trunk/chrome/content/bindings/mathline.xml	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/bindings/mathline.xml	2014-09-02 09:02:29 UTC (rev 181)
@@ -26,7 +26,7 @@
     </resources>
 
     <content>
-      <xul:tabbox class="mathline-container" xbl:inherits="flex">
+      <xul:tabbox class="mathline-container" flex="1">
         <xul:stack class="mathline-desc">
           <xul:vbox pack="end">
             <xul:label anonid="desc"/>
@@ -315,7 +315,7 @@
                   o.setAttribute("label", c);
                   if      (c == "\"")  c = "\\\"";
                   else if (c == "'")   c = "\\'";
-                  o.setAttribute("oncommand", "doMathSymbol('" + c + "')");
+                  o.setAttribute("oncommand", "doMathLineSymbol('" + c + "')");
                   o.setAttribute("tooltiptext", this._charDescs[c]);
               }
               this._toolbar.appendChild(o);
@@ -491,7 +491,7 @@
 			  m.setAttribute("class", "menuitem-iconic");
               m.setAttribute("accesskey", accesskey);
               m.setAttribute("image", img);
-              m.setAttribute("oncommand", "doMathSymbol('" + item.t + "')");
+              m.setAttribute("oncommand", "doMathLineSymbol('" + item.t + "')");
 
               // Setup hot-key
               for (var n = 0;  n < item.hk.length;  ++n)

Added: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
(Binary files differ)

Index: trunk/chrome/content/bindings/ukmaths.xml
===================================================================
--- trunk/chrome/content/bindings/ukmaths.xml	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/bindings/ukmaths.xml	2014-09-02 09:02:29 UTC (rev 181)

Property changes on: trunk/chrome/content/bindings/ukmaths.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Modified: trunk/chrome/content/commands.xul
===================================================================
--- trunk/chrome/content/commands.xul	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/commands.xul	2014-09-02 09:02:29 UTC (rev 181)
@@ -88,7 +88,7 @@
     <key id="key_append" command="cmd_append" modifiers="accel" key="I"/>
     <key id="key_preview" command="cmd_preview" keycode="VK_F9"/>
 
-	<key id="key_addEq" command="cmd_addEq" key="+"/>
+	<key id="key_addEq" command="cmd_addEq" modifiers="shift" key="+"/>
     <key id="key_insertEq" command="cmd_insertEq" key="-"/>
     <key id="key_exportEq" command="cmd_exportEq" modifiers="accel" key="P"/>
     <key id="key_moveUp" command="cmd_moveUp" modifiers="accel" keycode="VK_UP"/>

Modified: trunk/chrome/content/edit.js
===================================================================
--- trunk/chrome/content/edit.js	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/edit.js	2014-09-02 09:02:29 UTC (rev 181)
@@ -15,6 +15,7 @@
 var gSettings = new Object();
 const gKnownSettings =
 {
+    "editMode":          gPref.PREF_STRING,
     "displayType":       gPref.PREF_STRING,
     "color":             gPref.PREF_STRING,
     "bgcolor":           gPref.PREF_STRING,

Modified: trunk/chrome/content/equation.js
===================================================================
--- trunk/chrome/content/equation.js	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/equation.js	2014-09-02 09:02:29 UTC (rev 181)
@@ -78,7 +78,7 @@
 
 
 // Inserts a maths symbol into the rapid mathline
-function doMathSymbol(symbol)
+function doMathLineSymbol(symbol)
 {
     var o = document.getElementById("mathline");
     if (!o.focused)  return;
@@ -86,9 +86,22 @@
 }
 
 
+// Inserts a maths symbol into the UK Maths pane
+function doUKMathsSymbol(symbol)
+{
+    var o = document.getElementById("ukmaths");
+    if (!o.focused)  return;
+    o.insertText(symbol);
+}
+
+
 // Edits currently selected item in equation list
 function doEditEquation()
 {
+    // Choose appropriate edit method
+    var prefix = gSettings["editMode"];
+    if (!prefix)  prefix = "mathline";
+
     // Obtain MathML from equation list
     var mml = document.getElementById("equationlist").getMathML();
     if (!mml)  return;
@@ -98,27 +111,27 @@
     eq_bcast.setAttribute("disabled", "true");
     eq_bcast.setAttribute("hidden", "true");
 
-    // Show Rapid Mathline
-    var math_bcast = document.getElementById("mathlineBroadcaster");
+    // Show edit pane
+    var math_bcast = document.getElementById(prefix + "Broadcaster");
     math_bcast.removeAttribute("disabled");
     math_bcast.removeAttribute("hidden");
 
-    // Put MathML into Rapid Mathline
-    var o = document.getElementById("mathline");
+    // Put MathML into edit pane
+    var o = document.getElementById(prefix);
     o.setMathML(mml);
     o.focusInput();
 }
 
 
 // Updates currently selected item in equation list
-function doUpdateEquation()
+function doUpdateEquation(prefix)
 {
-    // Obtain MathML from Rapid Mathline
-    var mml = document.getElementById("mathline").getMathML();
+    // Obtain MathML from edit pane
+    var mml = document.getElementById(prefix).getMathML();
     if (!mml)  return;
 
-    // Hide Rapid Mathline
-    var math_bcast = document.getElementById("mathlineBroadcaster");
+    // Hide edit pane
+    var math_bcast = document.getElementById(prefix + "Broadcaster");
     math_bcast.setAttribute("disabled", "true");
     math_bcast.setAttribute("hidden", "true");
 
@@ -135,10 +148,10 @@
 
 
 // Reverts all changes made in Rapid Mathline
-function doRevertEquation()
+function doRevertEquation(prefix)
 {
-    // Hide Rapid Mathline
-    var math_bcast = document.getElementById("mathlineBroadcaster");
+    // Hide edit pane
+    var math_bcast = document.getElementById(prefix + "Broadcaster");
     math_bcast.setAttribute("disabled", "true");
     math_bcast.setAttribute("hidden", "true");
 

Modified: trunk/chrome/content/main.js
===================================================================
--- trunk/chrome/content/main.js	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/main.js	2014-09-02 09:02:29 UTC (rev 181)
@@ -67,10 +67,12 @@
             break;
 
         case EDIT_SCREEN_INDEX:
+            var eq = document.getElementById("equationlist");
             var ml = document.getElementById("mathline");
-            var eq = document.getElementById("equationlist");
-            if (!eq.disabled)  eq.focus();
-            else               ml.focusInput();
+            var uk = document.getElementById("ukmaths");
+            if      (!eq.disabled)  eq.focus();
+            else if (!uk.disabled)  uk.focusInput();
+            else                    ml.focusInput();
             break;
 
         case BROWSER_SCREEN_INDEX:
@@ -224,7 +226,12 @@
     // Initialize Rapid Mathline key set and menu
     var mathline = document.getElementById("mathline");
     mathline.initialize();
-    mathline.populateMathMenu(document.getElementById("popupMath"));
+    mathline.populateMathMenu(document.getElementById("popupMathLine"));
+
+    // Initialize UK Maths key set and menu
+    var ukmaths = document.getElementById("ukmaths");
+    ukmaths.initialize();
+    ukmaths.populateMathMenu(document.getElementById("popupUKMaths"));
 }
 
 

Modified: trunk/chrome/content/mathcast.xul
===================================================================
--- trunk/chrome/content/mathcast.xul	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/mathcast.xul	2014-09-02 09:02:29 UTC (rev 181)
@@ -46,6 +46,7 @@
   <broadcasterset>
     <broadcaster id="equationListBroadcaster"/>
     <broadcaster id="mathlineBroadcaster" disabled="true" hidden="true"/>
+    <broadcaster id="ukmathsBroadcaster" disabled="true" hidden="true"/>
   </broadcasterset>
 
   <!-- Import commands and keys -->
@@ -148,7 +149,12 @@
       </stack>
       <mathline id="mathline" flex="0" disabled="true" hidden="true"
           observes="mathlineBroadcaster"
-           />
+          
+          />
+      <ukmaths id="ukmaths" flex="0" disabled="true" hidden="true"
+          observes="ukmathsBroadcaster"
+          
+          />
       <statusbar id="statusbar" flex="0" observes="equationListBroadcaster">
         <statusbarpanel id="statusbar-eq-name" label="" flex="1"/>
       </statusbar>

Modified: trunk/chrome/content/menu.xul
===================================================================
--- trunk/chrome/content/menu.xul	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/menu.xul	2014-09-02 09:02:29 UTC (rev 181)
@@ -128,6 +128,7 @@
     </menu>
     <menu label="&menuEquation.label;" accesskey="&menuEquation.accesskey;">
       <observes element="equationListBroadcaster" attribute="disabled"/>
+      <observes element="equationListBroadcaster" attribute="hidden"/>
       <menupopup id="popupEquation">
         <menuitem command="cmd_addEq" key="key_addEq" class="menuitem-iconic"
             label="&cmd_addEq.label;" accesskey="&cmd_addEq.accesskey;" 
@@ -329,9 +330,17 @@
     <menu label="&menuMath.label;" accesskey="&menuMath.accesskey;"
         disabled="true">
       <observes element="mathlineBroadcaster" attribute="disabled"/>
-      <menupopup id="popupMath">
+      <observes element="mathlineBroadcaster" attribute="hidden"/>
+      <menupopup id="popupMathLine">
       </menupopup>
     </menu>
+    <menu label="&menuMath.label;" accesskey="&menuMath.accesskey;"
+        disabled="true">
+      <observes element="ukmathsBroadcaster" attribute="disabled"/>
+      <observes element="ukmathsBroadcaster" attribute="hidden"/>
+      <menupopup id="popupUKMaths">
+      </menupopup>
+    </menu>
     <menu label="&menuHelp.label;" accesskey="&menuHelp.accesskey;">
       <menupopup>
         <menuitem command="cmd_help" key="key_help" class="menuitem-iconic"

Modified: trunk/chrome/content/settingsdialog.xul
===================================================================
--- trunk/chrome/content/settingsdialog.xul	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/settingsdialog.xul	2014-09-02 09:02:29 UTC (rev 181)
@@ -26,7 +26,7 @@
 
   <script>
   <![CDATA[
-	var gRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
+    var gRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
         .getService(Components.interfaces.nsIXULRuntime); 
     var gSettings = window.arguments[0];
     var gPrompt = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
@@ -38,8 +38,8 @@
         var o = document.getElementById(id);
         if (!o)  return;
         var i = o.getElementsByAttribute("value", value);
-        if (!i)  i = o.getElementsByAttribute("value", defValue);
-        if (i)  o.selectedItem = i[0];
+        if (!i.length)  i = o.getElementsByAttribute("value", defValue);
+        if (i.length)  o.selectedItem = i[0];
     }
 
     // Gets the value of the selected item in a radio group
@@ -84,16 +84,17 @@
         _setRadioGroup("setCopyType",       gSettings["copyType"],       "image");
         _setRadioGroup("setCharConvention", gSettings["charConvention"], "hex");
         _setRadioGroup("setDisplayType",    gSettings["displayType"],    "block");
-		
-		// if not windows, remove EMF
-		if (gRuntime.OS != "WINNT")
-		{
-			var o = document.getElementById("setCopyType");
-			if (!o)  return;
-			o.removeChild(o.lastChild);
-			o.removeChild(o.lastChild);
-		}
+        _setRadioGroup("setEditMode",       gSettings["editMode"],       "mathline");
 
+        // if not windows, remove EMF
+        if (gRuntime.OS != "WINNT")
+        {
+            var o = document.getElementById("setCopyType");
+            if (!o)  return;
+            o.removeChild(o.lastChild);
+            o.removeChild(o.lastChild);
+        }
+
         if (gSettings["size"] == "")
         {
             _setRadioGroup("setFontSize", "null");
@@ -177,6 +178,7 @@
         gSettings["copyType"]         = _getRadioGroup("setCopyType");
         gSettings["charConvention"]   = _getRadioGroup("setCharConvention");
         gSettings["displayType"]      = _getRadioGroup("setDisplayType");
+        gSettings["editMode"]         = _getRadioGroup("setEditMode");
         gSettings["size"]             = font_size;
         gSettings["color"]            = _getColorMenu("setMathColorFg");
         gSettings["bgcolor"]          = _getColorMenu("setMathColorBg");
@@ -214,8 +216,8 @@
           <radiogroup id="setCopyType">
             <radio value="image" label="&copyTypeImage.label;" tooltiptext="&copyTypeImage.tooltip;"/>
             <radio value="mathml" label="&copyTypeMathML.label;" tooltiptext="&copyTypeMathML.tooltip;"/>
-			<radio value="emfoffice" label="&copyTypeEMFOffice.label;" tooltiptext="&copyTypeEMFOffice.tooltip;"/>
-			<radio value="emfopenoffice" label="&copyTypeEMFOpenOffice.label;" tooltiptext="&copyTypeEMFOpenOffice.tooltip;"/>
+            <radio value="emfoffice" label="&copyTypeEMFOffice.label;" tooltiptext="&copyTypeEMFOffice.tooltip;"/>
+            <radio value="emfopenoffice" label="&copyTypeEMFOpenOffice.label;" tooltiptext="&copyTypeEMFOpenOffice.tooltip;"/>
           </radiogroup>
         </row>
         <row>
@@ -240,6 +242,14 @@
       </columns>
       <rows>
         <row>
+          <label control="setEditMode" value="&editMode.title;"
+              accesskey="&editMode.accesskey;"/>
+          <radiogroup id="setEditMode">
+            <radio value="mathline" label="&editModeMathLine.label;" tooltiptext="&editModeMathLine.tooltip;"/>
+            <radio value="ukmaths" label="&editModeUKMaths.label;" tooltiptext="&editModeUKMaths.tooltip;"/>
+          </radiogroup>
+        </row>
+        <row>
           <label control="setDisplayType" value="&displayType.title;"
               accesskey="&displayType.accesskey;"/>
           <radiogroup id="setDisplayType">

Modified: trunk/chrome/content/version.js
===================================================================
--- trunk/chrome/content/version.js	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/content/version.js	2014-09-02 09:02:29 UTC (rev 181)
@@ -8,7 +8,7 @@
 **********************************************************************/
 
 
-const MATHCAST_VERSION = "0.92";
+const MATHCAST_VERSION = "0.93";
 
 
 /* vim: set cindent tabstop=8 softtabstop=4 expandtab shiftwidth=4: */

Modified: trunk/chrome/locale/en-US/known.xml
===================================================================
--- trunk/chrome/locale/en-US/known.xml	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/locale/en-US/known.xml	2014-09-02 09:02:29 UTC (rev 181)
@@ -34,86 +34,103 @@
 			<m>&#x03B1;</m>
 			<t>α</t>
 			<i>alpha</i>
+			<ukmaths>.a</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B2;</m>
 			<t>β</t>
 			<i>beta</i>
+			<ukmaths>.b</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B3;</m>
 			<t>γ</t>
 			<i>gamma</i>
+			<ukmaths>.g</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B4;</m>
 			<t>δ</t>
 			<i>delta</i>
+			<ukmaths>.d</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B5;</m>
 			<t>ε</t>
 			<i>epsilon</i>
+			<ukmaths>.e</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B6;</m>
 			<t>ζ</t>
 			<i>zeta</i>
+			<ukmaths>.z</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B7;</m>
 			<t>η</t>
 			<i>eta</i>
+			<ukmaths>.:</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B8;</m>
 			<t>θ</t>
 			<i>theta</i>
+			<ukmaths>.?</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B9;</m>
 			<t>ι</t>
 			<i>iota</i>
+			<ukmaths>.i</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BA;</m>
 			<t>κ</t>
 			<i>kappa</i>
+			<ukmaths>.k</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BB;</m>
 			<t>λ</t>
 			<i>lambda</i>
+			<ukmaths>.l</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BC;</m>
 			<t>μ</t>
 			<i>mu</i>
+			<ukmaths>.m</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BD;</m>
 			<t>ν</t>
 			<i>nu</i>
+			<ukmaths>.n</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BE;</m>
 			<t>ξ</t>
 			<i>xi</i>
+			<ukmaths>.x</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BF;</m>
 			<t>ο</t>
 			<i>omicron</i>
+			<ukmaths>.o</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C0;</m>
 			<t>π</t>
 			<i>pi</i>
+			<ukmaths>.p</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C1;</m>
 			<t>ρ</t>
 			<i>rho</i>
+			<ukmaths>.r</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C2;</m>
@@ -124,36 +141,43 @@
 			<m>&#x03C3;</m>
 			<t>σ</t>
 			<i>sigma</i>
+			<ukmaths>.s</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C4;</m>
 			<t>τ</t>
 			<i>tau</i>
+			<ukmaths>.t</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C5;</m>
 			<t>υ</t>
 			<i>upsilon</i>
+			<ukmaths>.u</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C6;</m>
 			<t>φ</t>
 			<i>phi</i>
+			<ukmaths>.f</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C7;</m>
 			<t>χ</t>
 			<i>chi</i>
+			<ukmaths>.&amp;</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C8;</m>
 			<t>ψ</t>
 			<i>psi</i>
+			<ukmaths>.y</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C9;</m>
 			<t>ω</t>
 			<i>omega</i>
+			<ukmaths>.w</ukmaths>
 		</in>
 	</group>
 	<group name='large greek letters'>
@@ -161,121 +185,145 @@
 			<m>&#x0391;</m>
 			<t>Α</t>
 			<i>Alpha</i>
+			<ukmaths>_a</ukmaths>
 		</in>
 		<in>
 			<m>&#x0392;</m>
 			<t>Β</t>
 			<i>Beta</i>
+			<ukmaths>_b</ukmaths>
 		</in>
 		<in>
 			<m>&#x0393;</m>
 			<t>Γ</t>
 			<i>Gamma</i>
+			<ukmaths>_g</ukmaths>
 		</in>
 		<in>
 			<m>&#x0394;</m>
 			<t>Δ</t>
 			<i>Delta</i>
+			<ukmaths>_d</ukmaths>
 		</in>
 		<in>
 			<m>&#x0395;</m>
 			<t>Ε</t>
 			<i>Epsilon</i>
+			<ukmaths>_e</ukmaths>
 		</in>
 		<in>
 			<m>&#x0396;</m>
 			<t>Ζ</t>
 			<i>Zeta</i>
+			<ukmaths>_z</ukmaths>
 		</in>
 		<in>
 			<m>&#x0397;</m>
 			<t>Η</t>
 			<i>Eta</i>
+			<ukmaths>_:</ukmaths>
 		</in>
 		<in>
 			<m>&#x0398;</m>
 			<t>Θ</t>
 			<i>Theta</i>
+			<ukmaths>_?</ukmaths>
 		</in>
 		<in>
 			<m>&#x0399;</m>
 			<t>Ι</t>
 			<i>Iota</i>
+			<ukmaths>_i</ukmaths>
 		</in>
 		<in>
 			<m>&#x039A;</m>
 			<t>Κ</t>
 			<i>Kappa</i>
+			<ukmaths>_k</ukmaths>
 		</in>
 		<in>
 			<m>&#x039B;</m>
 			<t>Λ</t>
 			<i>Lambda</i>
+			<ukmaths>_l</ukmaths>
 		</in>
 		<in>
 			<m>&#x039C;</m>
 			<t>Μ</t>
 			<i>Mu</i>
+			<ukmaths>_m</ukmaths>
 		</in>
 		<in>
 			<m>&#x039D;</m>
 			<t>Ν</t>
 			<i>Nu</i>
+			<ukmaths>_n</ukmaths>
 		</in>
 		<in>
 			<m>&#x039E;</m>
 			<t>Ξ</t>
 			<i>Xi</i>
+			<ukmaths>_x</ukmaths>
 		</in>
 		<in>
 			<m>&#x039F;</m>
 			<t>Ο</t>
 			<i>Omicron</i>
+			<ukmaths>_o</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A0;</m>
 			<t>Π</t>
 			<i>Pi</i>
+			<ukmaths>_p</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A1;</m>
 			<t>Ρ</t>
 			<i>Rho</i>
+			<ukmaths>_r</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A3;</m>
 			<t>Σ</t>
 			<i>Sigma</i>
+			<ukmaths>_s</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A4;</m>
 			<t>Τ</t>
 			<i>Tau</i>
+			<ukmaths>_t</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A5;</m>
 			<t>Υ</t>
 			<i>Upsilon</i>
+			<ukmaths>_u</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A6;</m>
 			<t>Φ</t>
 			<i>Phi</i>
+			<ukmaths>_f</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A7;</m>
 			<t>Χ</t>
 			<i>Chi</i>
+			<ukmaths>_&amp;</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A8;</m>
 			<t>Ψ</t>
 			<i>Psi</i>
+			<ukmaths>_y</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A9;</m>
 			<t>Ω</t>
 			<i>Omega</i>
+			<ukmaths>_w</ukmaths>
 		</in>
 	</group>
 	<group name='special letters'>
@@ -283,6 +331,7 @@
 			<m>&#x221E;</m>
 			<t>∞</t>
 			<i>infinity</i>
+			<ukmaths>=</ukmaths>
 		</in>
 		<in>
 			<m>ℒ</m>
@@ -308,21 +357,25 @@
 			<m>℃</m>
 			<t>℃</t>
 			<i>degree celsius </i>
+			<ukmaths>0,c</ukmaths>
 		</in>
 		<in>
 			<m>℉</m>
 			<t>℉</t>
 			<i>degree fahrenheit</i>
+			<ukmaths>0,f</ukmaths>
 		</in>
 		<in>
 			<m>K</m>
 			<t>К</t>
 			<i>Kelvin</i>
+			<ukmaths> ;,k</ukmaths>
 		</in>
 		<in>
 			<m>Å</m>
 			<t>Å</t>
 			<i>Angstrom</i>
+			<ukmaths> ^a</ukmaths>
 		</in>
 		<in>
 			<m>℥</m>
@@ -333,6 +386,7 @@
 			<m>Ω</m>
 			<t>Ω</t>
 			<i>Ohm</i>
+			<ukmaths> _w</ukmaths>
 		</in>
 		<in>
 			<m>℧</m>
@@ -525,12 +579,14 @@
 			<t>+</t>
 			<sp/>
 			<i>plus</i>
+			<ukmaths> ;6</ukmaths>
 		</in>
 		<in>
 			<m>&#x2212;</m>
 			<t>−</t>
 			<sp/>
 			<i>minus</i>
+			<ukmaths> ;-</ukmaths>
 		</in>
 		<in>
 			<m>&#x207A;</m>
@@ -550,11 +606,13 @@
 			<m>&#x00B7;</m>
 			<t>·</t>
 			<i>dot</i>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>&#x00D7;</m>
 			<t>×</t>
 			<i>cross</i>
+			<ukmaths> ;8</ukmaths>
 		</in>
 		<in>
 			<m>&#x2062;</m>
@@ -575,23 +633,27 @@
 			<m>&#x2215;</m>
 			<t>∕</t>
 			<i>division slash</i>
+			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<m>&#x00F7;</m>
 			<t>÷</t>
 			<i>divided by</i>
+			<ukmaths> ;4</ukmaths>
 		</in>
 		<in>
 			<m>&#x00B1;</m>
 			<t>±</t>
 			<sp/>
 			<i>plus or minus</i>
+			<ukmaths> ;6-</ukmaths>
 		</in>
 		<in>
 			<m>&#x2213;</m>
 			<t>∓</t>
 			<sp/>
 			<i>minus or plus</i>
+			<ukmaths> ;-6</ukmaths>
 		</in>
 	</group>
 	<group name='equal signs'>
@@ -600,24 +662,28 @@
 			<t>=</t>
 			<sp/>
 			<i>equals to</i>
+			<ukmaths> ;7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2260;</m>
 			<t>≠</t>
 			<sp/>
 			<i>not equals to</i>
+			<ukmaths> "7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2261;</m>
 			<t>≡</t>
 			<sp/>
 			<i>identical to</i>
+			<ukmaths> 77</ukmaths>
 		</in>
 		<in>
 			<m>&#x221D;</m>
 			<t>∝</t>
 			<sp/>
 			<i>proportional to</i>
+			<ukmaths> 37</ukmaths>
 		</in>
 		<in>
 			<m>≟</m>
@@ -630,18 +696,21 @@
 			<t>≈</t>
 			<sp/>
 			<i>almost equal to</i>
+			<ukmaths> _7</ukmaths>
 		</in>
 		<in>
 			<m>≉</m>
 			<t>≉</t>
 			<sp/>
 			<i>not almost equal to</i>
+			<ukmaths> "_7</ukmaths>
 		</in>
 		<in>
 			<m>∼</m>
 			<t>∼</t>
 			<sp/>
 			<i>tilde</i>
+			<ukmaths>"-</ukmaths>
 		</in>
 		<in>
 			<m>≁</m>
@@ -660,18 +729,21 @@
 			<t>≃</t>
 			<sp/>
 			<i>asymptotically equal to</i>
+			<ukmaths> .7</ukmaths>
 		</in>
 		<in>
 			<m>≄</m>
 			<t>≄</t>
 			<sp/>
 			<i>not asymptotically equal to</i>
+			<ukmaths> ".7</ukmaths>
 		</in>
 		<in>
 			<m>≅</m>
 			<t>≅</t>
 			<sp/>
 			<i>approximately equal to</i>
+			<ukmaths> -7</ukmaths>
 		</in>
 		<in>
 			<m>≆</m>
@@ -684,6 +756,7 @@
 			<t>≇</t>
 			<sp/>
 			<i>not approximately and not equal to</i>
+			<ukmaths> "-7</ukmaths>
 		</in>
 		<in>
 			<m>≊</m>
@@ -750,6 +823,7 @@
 			<t>≔</t>
 			<sp>after</sp>
 			<i>colon equals</i>
+			<ukmaths> 3;7</ukmaths>
 		</in>
 		<in>
 			<m>≘</m>
@@ -780,6 +854,7 @@
 			<t>≜</t>
 			<sp/>
 			<i>delta equal to</i>
+			<ukmaths> ;;7</ukmaths>
 		</in>
 		<in>
 			<m>≝</m>
@@ -800,60 +875,70 @@
 			<t>&lt;</t>
 			<sp/>
 			<i>less than</i>
+			<ukmaths> [ </ukmaths>
 		</in>
 		<in>
 			<m>></m>
 			<t>></t>
 			<sp/>
 			<i>greater than</i>
+			<ukmaths> o </ukmaths>
 		</in>
 		<in>
 			<m>&#x2264;</m>
 			<t>≤</t>
 			<sp/>
 			<i>less than or equals to</i>
+			<ukmaths> [7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2265;</m>
 			<t>≥</t>
 			<sp/>
 			<i>greater than or equals to</i>
+			<ukmaths> o7</ukmaths>
 		</in>
 		<in>
 			<m>≪</m>
 			<t>≪</t>
 			<sp/>
 			<i>much less than</i>
+			<ukmaths> [[ </ukmaths>
 		</in>
 		<in>
 			<m>≫</m>
 			<t>≫</t>
 			<sp/>
 			<i>much greater than</i>
+			<ukmaths> oo </ukmaths>
 		</in>
 		<in>
 			<m>≮</m>
 			<t>≮</t>
 			<sp/>
 			<i>not less than</i>
+			<ukmaths> "[ </ukmaths>
 		</in>
 		<in>
 			<m>≯</m>
 			<t>≯</t>
 			<sp/>
 			<i>not greater than</i>
+			<ukmaths> "o </ukmaths>
 		</in>
 		<in>
 			<m>≰</m>
 			<t>≰</t>
 			<sp/>
 			<i>neither less than nor equal to</i>
+			<ukmaths> "[7</ukmaths>
 		</in>
 		<in>
 			<m>≱</m>
 			<t>≱</t>
 			<sp/>
 			<i>neither greater than nor equal to</i>
+			<ukmaths> "o7</ukmaths>
 		</in>
 		<in>
 			<m>≶</m>
@@ -885,31 +970,37 @@
 			<m>[</m>
 			<t>[</t>
 			<i>left bracket</i>
+			<ukmaths>(</ukmaths>
 		</in>
 		<in>
 			<m>]</m>
 			<t>]</t>
 			<i>right bracket</i>
+			<ukmaths>)</ukmaths>
 		</in>
 		<in>
 			<m>{</m>
 			<t>{</t>
 			<i>left curly brace</i>
+			<ukmaths>[</ukmaths>
 		</in>
 		<in>
 			<m>}</m>
 			<t>}</t>
 			<i>right curly brace</i>
+			<ukmaths>]</ukmaths>
 		</in>
 		<in>
 			<m>“</m>
 			<t>“</t>
 			<i>left quotes</i>
+			<ukmaths>8</ukmaths>
 		</in>
 		<in>
 			<m>”</m>
 			<t>”</t>
 			<i>right quotes</i>
+			<ukmaths>0 </ukmaths>
 		</in>
 		<in>
 			<m>'</m>
@@ -920,22 +1011,26 @@
 			<m>°</m>
 			<t>°</t>
 			<i>degree</i>
+			<ukmaths>0</ukmaths>
 		</in>
 		<in>
 			<m>:</m>
 			<t>:</t>
 			<i>colon</i>
+			<ukmaths>,3</ukmaths>
 		</in>
 		<in>
 			<m>;</m>
 			<t>;</t>
 			<i>semicolon</i>
+			<ukmaths>,2</ukmaths>
 		</in>
 		<in>
 			<m>&amp;</m>
 			<t>&amp;</t>
 			<sp/>
 			<i>amperstand</i>
+			<ukmaths>@&amp;</ukmaths>
 		</in>
 		<in>
 			<m>%</m>
@@ -951,6 +1046,7 @@
 			<m>#</m>
 			<t>#</t>
 			<i>number sign</i>
+			<ukmaths>_8</ukmaths>
 		</in>
 		<in>
 			<m>@</m>
@@ -971,17 +1067,20 @@
 			<m>,</m>
 			<t>,</t>
 			<i>comma</i>
+			<ukmaths>,1</ukmaths>
 		</in>
 		<in>
 			<m>.</m>
 			<t>.</t>
 			<sp>after</sp>
 			<i>period</i>
+			<ukmaths>,4</ukmaths>
 		</in>
 		<in>
 			<m>&#x2026;</m>
 			<t>…</t>
 			<i>three periods</i>
+			<ukmaths>'''</ukmaths>
 		</in>
 		<in>
 			<m>&#x2026;</m>
@@ -997,11 +1096,13 @@
 			<m>∴</m>
 			<t>∴</t>
 			<i>therefore</i>
+			<ukmaths> ,* </ukmaths>
 		</in>
 		<in>
 			<m>∵</m>
 			<t>∵</t>
 			<i>because</i>
+			<ukmaths> @/ </ukmaths>
 		</in>
 		<in>
 			<m>∷</m>
@@ -1032,6 +1133,7 @@
 			<m>∣</m>
 			<t>∣</t>
 			<i>divides</i>
+			<ukmaths>|</ukmaths>
 		</in>
 		<in>
 			<m>∤</m>
@@ -1042,11 +1144,13 @@
 			<m>⊢</m>
 			<t>⊢</t>
 			<i>right track</i>
+			<ukmaths> _1 </ukmaths>
 		</in>
 		<in>
 			<m>⊣</m>
 			<t>⊣</t>
 			<i>left track</i>
+			<ukmaths> "l </ukmaths>
 		</in>
 		<in>
 			<m>⊤</m>
@@ -1064,6 +1168,7 @@
 			<m>!</m>
 			<t>!</t>
 			<i>factorial</i>
+			<ukmaths>,6</ukmaths>
 		</in>
 		<in>
 			<m>‼</m>
@@ -1074,16 +1179,19 @@
 			<m>|</m>
 			<t>|</t>
 			<i>absolute value</i>
+			<ukmaths>_</ukmaths>
 		</in>
 		<in>
 			<m>&#x2211;</m>
 			<t>∑</t>
 			<i>sum</i>
+			<ukmaths>_s</ukmaths>
 		</in>
 		<in>
 			<m>&#x220F;</m>
 			<t>∏</t>
 			<i>product</i>
+			<ukmaths>_p</ukmaths>
 		</in>
 	</group>
 	<group name='geometry'>
@@ -1096,6 +1204,7 @@
 			<m>∠</m>
 			<t>∠</t>
 			<i>angle</i>
+			<ukmaths>_[</ukmaths>
 		</in>
 		<in>
 			<m>∡</m>
@@ -1116,11 +1225,13 @@
 			<m>∥</m>
 			<t>∥</t>
 			<i>parallel to</i>
+			<ukmaths>__</ukmaths>
 		</in>
 		<in>
 			<m>∦</m>
 			<t>∦</t>
 			<i>not parallel to</i>
+			<ukmaths> "__</ukmaths>
 		</in>
 		<in>
 			<m>⊿</m>
@@ -1133,16 +1244,19 @@
 			<m>′</m>
 			<t>′</t>
 			<i>prime</i>
+			<ukmaths>@9</ukmaths>
 		</in>
 		<in>
 			<m>″</m>
 			<t>″</t>
 			<i>double prime</i>
+			<ukmaths>@99</ukmaths>
 		</in>
 		<in>
 			<m>‴</m>
 			<t>‴</t>
 			<i>triple prime</i>
+			<ukmaths>@999</ukmaths>
 		</in>
 		<in>
 			<m>&#x2146;</m>
@@ -1158,28 +1272,33 @@
 			<m>&#x2202;</m>
 			<t>∂</t>
 			<i>partial differential</i>
+			<ukmaths>@d</ukmaths>
 		</in>
 		<in>
 			<m>&#x222B;</m>
 			<t>∫</t>
 			<i>integral</i>
+			<ukmaths>!</ukmaths>
 		</in>
 		<in>
 			<m>∬</m>
 			<t>∬</t>
 			<i>double integral</i>
 			<replace><![CDATA[ <mrow><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>			
+			<ukmaths>!!</ukmaths>
 		</in>
 		<in>
 			<m>∭</m>
 			<t>∭</t>
 			<i>triple integral</i>
 			<replace><![CDATA[ <mrow><mspace width="0.1em"/><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>
+			<ukmaths>!!!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222E;</m>
 			<t>∮</t>
 			<i>contour integral</i>
+			<ukmaths>@!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222F;</m>
@@ -1220,96 +1339,115 @@
 			<m>∀</m>
 			<t>∀</t>
 			<i>for all</i>
+			<ukmaths> \1</ukmaths>
 		</in>
 		<in>
 			<m>∃</m>
 			<t>∃</t>
 			<i>there exists</i>
+			<ukmaths> \5</ukmaths>
 		</in>
 		<in>
 			<m>∄</m>
 			<t>∄</t>
 			<i>there does not exist</i>
+			<ukmaths> \"5</ukmaths>
 		</in>
 		<in>
 			<m>∅</m>
 			<t>∅</t>
 			<i>empty set</i>
+			<ukmaths> \0</ukmaths>
 		</in>
 		<in>
 			<m>∈</m>
 			<t>∈</t>
 			<i>is element of</i>
+			<ukmaths> \9</ukmaths>
 		</in>
 		<in>
 			<m>∉</m>
 			<t>∉</t>
 			<i>is not element of</i>
+			<ukmaths> \"9</ukmaths>
 		</in>
 		<in>
 			<m>∩</m>
 			<t>∩</t>
 			<i>intersection</i>
+			<ukmaths> \8</ukmaths>
 		</in>
 		<in>
 			<m>∪</m>
 			<t>∪</t>
 			<i>union</i>
+			<ukmaths> \6</ukmaths>
 		</in>
 		<in>
 			<m>∖</m>
 			<t>∖</t>
 			<i>set minus</i>
+			<ukmaths> \*</ukmaths>
 		</in>
 		<in>
 			<m>∧</m>
 			<t>∧</t>
 			<i>logical and</i>
+			<ukmaths> ^8</ukmaths>
 		</in>
 		<in>
 			<m>∨</m>
 			<t>∨</t>
 			<i>logical or</i>
+			<ukmaths> ^6</ukmaths>
 		</in>
 		<in>
 			<m>⊂</m>
 			<t>⊂</t>
 			<i>subset of</i>
+			<ukmaths> \[</ukmaths>
 		</in>
 		<in>
 			<m>⊃</m>
 			<t>⊃</t>
 			<i>superset of</i>
+			<ukmaths> \o</ukmaths>
 		</in>
 		<in>
 			<m>⊄</m>
 			<t>⊄</t>
 			<i>not a subset of</i>
+			<ukmaths> \"[</ukmaths>
 		</in>
 		<in>
 			<m>⊅</m>
 			<t>⊅</t>
 			<i>not a superset of</i>
+			<ukmaths> \"o</ukmaths>
 		</in>
 		<in>
 			<m>⊆</m>
 			<t>⊆</t>
 			<i>subset of or equal to</i>
+			<ukmaths> \[7</ukmaths>
 		</in>
 		<in>
 			<m>⊇</m>
 			<t>⊇</t>
 			<i>superset of or equal to</i>
+			<ukmaths> \o7</ukmaths>
 		</in>
 		<in>
 			<m>⊈</m>
 			<t>⊈</t>
 			<i>neither a subset of nor equal to</i>
+			<ukmaths> \"[7</ukmaths>
 		</in>
 		<in>
 			<m>⊉</m>
 			<t>⊉</t>
 			<i>neither a superset of nor equal to</i>
+			<ukmaths> \"o7</ukmaths>
 		</in>
 		<in>
 			<m>⊌</m>
@@ -1360,11 +1498,13 @@
 			<m>⊕</m>
 			<t>⊕</t>
 			<i>circled plus</i>
+			<ukmaths>&lt;;6&gt;</ukmaths>
 		</in>
 		<in>
 			<m>⊖</m>
 			<t>⊖</t>
 			<i>circled minus</i>
+			<ukmaths>&lt;;-&gt;</ukmaths>
 		</in>
 	</group>
 
@@ -1373,26 +1513,31 @@
 			<m>&#x2192;</m>
 			<t>→</t>
 			<i>right arrow</i>
+			<ukmaths> 3o</ukmaths>
 		</in>
 		<in>
 			<m>&#x2190;</m>
 			<t>←</t>
 			<i>left arrow</i>
+			<ukmaths> [3</ukmaths>
 		</in>
 		<in>
 			<m>&#x2194;</m>
 			<t>↔</t>
 			<i>left-right arrow</i>
+			<ukmaths> [3o</ukmaths>
 		</in>
 		<in>
 			<m>↑</m>
 			<t>↑</t>
 			<i>up arrow</i>
+			<ukmaths> 3i</ukmaths>
 		</in>
 		<in>
 			<m>↓</m>
 			<t>↓</t>
 			<i>down arrow</i>
+			<ukmaths> 35</ukmaths>
 		</in>
 		<in>
 			<m>↕</m>
@@ -1424,16 +1569,19 @@
 			<m>⇒</m>
 			<t>⇒</t>
 			<i>right double arrow</i>
+			<ukmaths> \3o</ukmaths>
 		</in>
 		<in>
 			<m>⇐</m>
 			<t>⇐</t>
 			<i>left double arrow</i>
+			<ukmaths> \[3</ukmaths>
 		</in>
 		<in>
 			<m>⇔</m>
 			<t>⇔</t>
 			<i>right-left double arrow</i>
+			<ukmaths> \[3o</ukmaths>
 		</in>
 
 		<in>
@@ -1459,11 +1607,13 @@
 			<t>∇</t>
 			<i>nabla/del/grad</i>
 			<hk>Ctrl+N</hk>
+			<ukmaths>_0</ukmaths>
 		</in>
 		<in>
 			<t>∇²</t>
 			<sc>∇²</sc>
 			<i>laplacian</i>
+			<ukmaths>_0+2</ukmaths>
 		</in>
 		<in>
 			<m>⋄</m>
@@ -1479,21 +1629,25 @@
 			<m>∘</m>
 			<t>∘</t>
 			<i>ring</i>
+			<ukmaths> \7</ukmaths>
 		</in>
 		<in>
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>
 			<t>⋆</t>
 			<i>star operator</i>
+			<ukmaths> \=</ukmaths>
 		</in>
 		<in>
 			<m>□</m>
 			<t>□</t>
 			<i>square</i>
+			<ukmaths>$q</ukmaths>
 		</in>
 	</group>
 

Modified: trunk/chrome/locale/en-US/mathcast.dtd
===================================================================
--- trunk/chrome/locale/en-US/mathcast.dtd	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/locale/en-US/mathcast.dtd	2014-09-02 09:02:29 UTC (rev 181)
@@ -48,6 +48,13 @@
 <!ENTITY charConventionUnicode.label "Unicode">
 <!ENTITY charConventionUnicode.tooltip "Uses Unicode characters (eg: ε)">
 
+<!ENTITY editMode.title "Edit mode:">
+<!ENTITY editMode.accesskey "T">
+<!ENTITY editModeMathLine.label "Rapid Mathline">
+<!ENTITY editModeMathLine.tooltip "An intuitive and effective method for rapid development of mathematical equations">
+<!ENTITY editModeUKMaths.label "UK Maths Braille">
+<!ENTITY editModeUKMaths.tooltip "Braille mathematics notation specifed by BAUK">
+
 <!ENTITY displayType.title "Display type:">
 <!ENTITY displayType.accesskey "D">
 <!ENTITY displayTypeBlock.label "Block">

Modified: trunk/chrome/locale/zh-TW/known.xml
===================================================================
--- trunk/chrome/locale/zh-TW/known.xml	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/locale/zh-TW/known.xml	2014-09-02 09:02:29 UTC (rev 181)
@@ -34,86 +34,103 @@
 			<m>&#x03B1;</m>
 			<t>α</t>
 			<i>alpha</i>
+			<ukmaths>.a</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B2;</m>
 			<t>β</t>
 			<i>beta</i>
+			<ukmaths>.b</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B3;</m>
 			<t>γ</t>
 			<i>gamma</i>
+			<ukmaths>.g</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B4;</m>
 			<t>δ</t>
 			<i>delta</i>
+			<ukmaths>.d</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B5;</m>
 			<t>ε</t>
 			<i>epsilon</i>
+			<ukmaths>.e</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B6;</m>
 			<t>ζ</t>
 			<i>zeta</i>
+			<ukmaths>.z</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B7;</m>
 			<t>η</t>
 			<i>eta</i>
+			<ukmaths>.:</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B8;</m>
 			<t>θ</t>
 			<i>theta</i>
+			<ukmaths>.?</ukmaths>
 		</in>
 		<in>
 			<m>&#x03B9;</m>
 			<t>ι</t>
 			<i>iota</i>
+			<ukmaths>.i</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BA;</m>
 			<t>κ</t>
 			<i>kappa</i>
+			<ukmaths>.k</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BB;</m>
 			<t>λ</t>
 			<i>lambda</i>
+			<ukmaths>.l</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BC;</m>
 			<t>μ</t>
 			<i>mu</i>
+			<ukmaths>.m</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BD;</m>
 			<t>ν</t>
 			<i>nu</i>
+			<ukmaths>.n</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BE;</m>
 			<t>ξ</t>
 			<i>xi</i>
+			<ukmaths>.x</ukmaths>
 		</in>
 		<in>
 			<m>&#x03BF;</m>
 			<t>ο</t>
 			<i>omicron</i>
+			<ukmaths>.o</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C0;</m>
 			<t>π</t>
 			<i>pi</i>
+			<ukmaths>.p</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C1;</m>
 			<t>ρ</t>
 			<i>rho</i>
+			<ukmaths>.r</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C2;</m>
@@ -124,36 +141,43 @@
 			<m>&#x03C3;</m>
 			<t>σ</t>
 			<i>sigma</i>
+			<ukmaths>.s</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C4;</m>
 			<t>τ</t>
 			<i>tau</i>
+			<ukmaths>.t</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C5;</m>
 			<t>υ</t>
 			<i>upsilon</i>
+			<ukmaths>.u</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C6;</m>
 			<t>φ</t>
 			<i>phi</i>
+			<ukmaths>.f</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C7;</m>
 			<t>χ</t>
 			<i>chi</i>
+			<ukmaths>.&amp;</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C8;</m>
 			<t>ψ</t>
 			<i>psi</i>
+			<ukmaths>.y</ukmaths>
 		</in>
 		<in>
 			<m>&#x03C9;</m>
 			<t>ω</t>
 			<i>omega</i>
+			<ukmaths>.w</ukmaths>
 		</in>
 	</group>
 	<group name='大楷希臘字母'>
@@ -161,121 +185,145 @@
 			<m>&#x0391;</m>
 			<t>Α</t>
 			<i>Alpha</i>
+			<ukmaths>_a</ukmaths>
 		</in>
 		<in>
 			<m>&#x0392;</m>
 			<t>Β</t>
 			<i>Beta</i>
+			<ukmaths>_b</ukmaths>
 		</in>
 		<in>
 			<m>&#x0393;</m>
 			<t>Γ</t>
 			<i>Gamma</i>
+			<ukmaths>_g</ukmaths>
 		</in>
 		<in>
 			<m>&#x0394;</m>
 			<t>Δ</t>
 			<i>Delta</i>
+			<ukmaths>_d</ukmaths>
 		</in>
 		<in>
 			<m>&#x0395;</m>
 			<t>Ε</t>
 			<i>Epsilon</i>
+			<ukmaths>_e</ukmaths>
 		</in>
 		<in>
 			<m>&#x0396;</m>
 			<t>Ζ</t>
 			<i>Zeta</i>
+			<ukmaths>_z</ukmaths>
 		</in>
 		<in>
 			<m>&#x0397;</m>
 			<t>Η</t>
 			<i>Eta</i>
+			<ukmaths>_:</ukmaths>
 		</in>
 		<in>
 			<m>&#x0398;</m>
 			<t>Θ</t>
 			<i>Theta</i>
+			<ukmaths>_?</ukmaths>
 		</in>
 		<in>
 			<m>&#x0399;</m>
 			<t>Ι</t>
 			<i>Iota</i>
+			<ukmaths>_i</ukmaths>
 		</in>
 		<in>
 			<m>&#x039A;</m>
 			<t>Κ</t>
 			<i>Kappa</i>
+			<ukmaths>_k</ukmaths>
 		</in>
 		<in>
 			<m>&#x039B;</m>
 			<t>Λ</t>
 			<i>Lambda</i>
+			<ukmaths>_l</ukmaths>
 		</in>
 		<in>
 			<m>&#x039C;</m>
 			<t>Μ</t>
 			<i>Mu</i>
+			<ukmaths>_m</ukmaths>
 		</in>
 		<in>
 			<m>&#x039D;</m>
 			<t>Ν</t>
 			<i>Nu</i>
+			<ukmaths>_n</ukmaths>
 		</in>
 		<in>
 			<m>&#x039E;</m>
 			<t>Ξ</t>
 			<i>Xi</i>
+			<ukmaths>_x</ukmaths>
 		</in>
 		<in>
 			<m>&#x039F;</m>
 			<t>Ο</t>
 			<i>Omicron</i>
+			<ukmaths>_o</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A0;</m>
 			<t>Π</t>
 			<i>Pi</i>
+			<ukmaths>_p</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A1;</m>
 			<t>Ρ</t>
 			<i>Rho</i>
+			<ukmaths>_r</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A3;</m>
 			<t>Σ</t>
 			<i>Sigma</i>
+			<ukmaths>_s</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A4;</m>
 			<t>Τ</t>
 			<i>Tau</i>
+			<ukmaths>_t</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A5;</m>
 			<t>Υ</t>
 			<i>Upsilon</i>
+			<ukmaths>_u</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A6;</m>
 			<t>Φ</t>
 			<i>Phi</i>
+			<ukmaths>_f</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A7;</m>
 			<t>Χ</t>
 			<i>Chi</i>
+			<ukmaths>_&amp;</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A8;</m>
 			<t>Ψ</t>
 			<i>Psi</i>
+			<ukmaths>_y</ukmaths>
 		</in>
 		<in>
 			<m>&#x03A9;</m>
 			<t>Ω</t>
 			<i>Omega</i>
+			<ukmaths>_w</ukmaths>
 		</in>
 	</group>
 	<group name='特別字母'>
@@ -283,6 +331,7 @@
 			<m>&#x221E;</m>
 			<t>∞</t>
 			<i>infinity</i>
+			<ukmaths>=</ukmaths>
 		</in>
 		<in>
 			<m>ℒ</m>
@@ -308,21 +357,25 @@
 			<m>℃</m>
 			<t>℃</t>
 			<i>degree celsius </i>
+			<ukmaths>0,c</ukmaths>
 		</in>
 		<in>
 			<m>℉</m>
 			<t>℉</t>
 			<i>degree fahrenheit</i>
+			<ukmaths>0,f</ukmaths>
 		</in>
 		<in>
 			<m>K</m>
 			<t>К</t>
 			<i>Kelvin</i>
+			<ukmaths> ;,k</ukmaths>
 		</in>
 		<in>
 			<m>Å</m>
 			<t>Å</t>
 			<i>Angstrom</i>
+			<ukmaths> ^a</ukmaths>
 		</in>
 		<in>
 			<m>℥</m>
@@ -333,6 +386,7 @@
 			<m>Ω</m>
 			<t>Ω</t>
 			<i>Ohm</i>
+			<ukmaths> _w</ukmaths>
 		</in>
 		<in>
 			<m>℧</m>
@@ -525,12 +579,14 @@
 			<t>+</t>
 			<sp/>
 			<i>plus</i>
+			<ukmaths> ;6</ukmaths>
 		</in>
 		<in>
 			<m>&#x2212;</m>
 			<t>−</t>
 			<sp/>
 			<i>minus</i>
+			<ukmaths> ;-</ukmaths>
 		</in>
 		<in>
 			<m>&#x207A;</m>
@@ -550,11 +606,13 @@
 			<m>&#x00B7;</m>
 			<t>·</t>
 			<i>dot</i>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>&#x00D7;</m>
 			<t>×</t>
 			<i>cross</i>
+			<ukmaths> ;8</ukmaths>
 		</in>
 		<in>
 			<m>&#x2062;</m>
@@ -575,23 +633,27 @@
 			<m>&#x2215;</m>
 			<t>∕</t>
 			<i>division slash</i>
+			<ukmaths>_/</ukmaths>
 		</in>
 		<in>
 			<m>&#x00F7;</m>
 			<t>÷</t>
 			<i>divided by</i>
+			<ukmaths> ;4</ukmaths>
 		</in>
 		<in>
 			<m>&#x00B1;</m>
 			<t>±</t>
 			<sp/>
 			<i>plus or minus</i>
+			<ukmaths> ;6-</ukmaths>
 		</in>
 		<in>
 			<m>&#x2213;</m>
 			<t>∓</t>
 			<sp/>
 			<i>minus or plus</i>
+			<ukmaths> ;-6</ukmaths>
 		</in>
 	</group>
 	<group name='等於符號'>
@@ -600,24 +662,28 @@
 			<t>=</t>
 			<sp/>
 			<i>equals to</i>
+			<ukmaths> ;7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2260;</m>
 			<t>≠</t>
 			<sp/>
 			<i>not equals to</i>
+			<ukmaths> "7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2261;</m>
 			<t>≡</t>
 			<sp/>
 			<i>identical to</i>
+			<ukmaths> 77</ukmaths>
 		</in>
 		<in>
 			<m>&#x221D;</m>
 			<t>∝</t>
 			<sp/>
 			<i>proportional to</i>
+			<ukmaths> 37</ukmaths>
 		</in>
 		<in>
 			<m>≟</m>
@@ -630,18 +696,21 @@
 			<t>≈</t>
 			<sp/>
 			<i>almost equal to</i>
+			<ukmaths> _7</ukmaths>
 		</in>
 		<in>
 			<m>≉</m>
 			<t>≉</t>
 			<sp/>
 			<i>not almost equal to</i>
+			<ukmaths> "_7</ukmaths>
 		</in>
 		<in>
 			<m>∼</m>
 			<t>∼</t>
 			<sp/>
 			<i>tilde</i>
+			<ukmaths>"-</ukmaths>
 		</in>
 		<in>
 			<m>≁</m>
@@ -660,18 +729,21 @@
 			<t>≃</t>
 			<sp/>
 			<i>asymptotically equal to</i>
+			<ukmaths> .7</ukmaths>
 		</in>
 		<in>
 			<m>≄</m>
 			<t>≄</t>
 			<sp/>
 			<i>not asymptotically equal to</i>
+			<ukmaths> ".7</ukmaths>
 		</in>
 		<in>
 			<m>≅</m>
 			<t>≅</t>
 			<sp/>
 			<i>approximately equal to</i>
+			<ukmaths> -7</ukmaths>
 		</in>
 		<in>
 			<m>≆</m>
@@ -684,6 +756,7 @@
 			<t>≇</t>
 			<sp/>
 			<i>not approximately and not equal to</i>
+			<ukmaths> "-7</ukmaths>
 		</in>
 		<in>
 			<m>≊</m>
@@ -750,6 +823,7 @@
 			<t>≔</t>
 			<sp>after</sp>
 			<i>colon equals</i>
+			<ukmaths> 3;7</ukmaths>
 		</in>
 		<in>
 			<m>≘</m>
@@ -780,6 +854,7 @@
 			<t>≜</t>
 			<sp/>
 			<i>delta equal to</i>
+			<ukmaths> ;;7</ukmaths>
 		</in>
 		<in>
 			<m>≝</m>
@@ -800,60 +875,70 @@
 			<t>&lt;</t>
 			<sp/>
 			<i>less than</i>
+			<ukmaths> [ </ukmaths>
 		</in>
 		<in>
 			<m>></m>
 			<t>></t>
 			<sp/>
 			<i>greater than</i>
+			<ukmaths> o </ukmaths>
 		</in>
 		<in>
 			<m>&#x2264;</m>
 			<t>≤</t>
 			<sp/>
 			<i>less than or equals to</i>
+			<ukmaths> [7</ukmaths>
 		</in>
 		<in>
 			<m>&#x2265;</m>
 			<t>≥</t>
 			<sp/>
 			<i>greater than or equals to</i>
+			<ukmaths> o7</ukmaths>
 		</in>
 		<in>
 			<m>≪</m>
 			<t>≪</t>
 			<sp/>
 			<i>much less than</i>
+			<ukmaths> [[ </ukmaths>
 		</in>
 		<in>
 			<m>≫</m>
 			<t>≫</t>
 			<sp/>
 			<i>much greater than</i>
+			<ukmaths> oo </ukmaths>
 		</in>
 		<in>
 			<m>≮</m>
 			<t>≮</t>
 			<sp/>
 			<i>not less than</i>
+			<ukmaths> "[ </ukmaths>
 		</in>
 		<in>
 			<m>≯</m>
 			<t>≯</t>
 			<sp/>
 			<i>not greater than</i>
+			<ukmaths> "o </ukmaths>
 		</in>
 		<in>
 			<m>≰</m>
 			<t>≰</t>
 			<sp/>
 			<i>neither less than nor equal to</i>
+			<ukmaths> "[7</ukmaths>
 		</in>
 		<in>
 			<m>≱</m>
 			<t>≱</t>
 			<sp/>
 			<i>neither greater than nor equal to</i>
+			<ukmaths> "o7</ukmaths>
 		</in>
 		<in>
 			<m>≶</m>
@@ -885,31 +970,37 @@
 			<m>[</m>
 			<t>[</t>
 			<i>left bracket</i>
+			<ukmaths>(</ukmaths>
 		</in>
 		<in>
 			<m>]</m>
 			<t>]</t>
 			<i>right bracket</i>
+			<ukmaths>)</ukmaths>
 		</in>
 		<in>
 			<m>{</m>
 			<t>{</t>
 			<i>left curly brace</i>
+			<ukmaths>[</ukmaths>
 		</in>
 		<in>
 			<m>}</m>
 			<t>}</t>
 			<i>right curly brace</i>
+			<ukmaths>]</ukmaths>
 		</in>
 		<in>
 			<m>“</m>
 			<t>“</t>
 			<i>left quotes</i>
+			<ukmaths>8</ukmaths>
 		</in>
 		<in>
 			<m>”</m>
 			<t>”</t>
 			<i>right quotes</i>
+			<ukmaths>0 </ukmaths>
 		</in>
 		<in>
 			<m>'</m>
@@ -920,22 +1011,26 @@
 			<m>°</m>
 			<t>°</t>
 			<i>degree</i>
+			<ukmaths>0</ukmaths>
 		</in>
 		<in>
 			<m>:</m>
 			<t>:</t>
 			<i>colon</i>
+			<ukmaths>,3</ukmaths>
 		</in>
 		<in>
 			<m>;</m>
 			<t>;</t>
 			<i>semicolon</i>
+			<ukmaths>,2</ukmaths>
 		</in>
 		<in>
 			<m>&amp;</m>
 			<t>&amp;</t>
 			<sp/>
 			<i>amperstand</i>
+			<ukmaths>@&amp;</ukmaths>
 		</in>
 		<in>
 			<m>%</m>
@@ -951,6 +1046,7 @@
 			<m>#</m>
 			<t>#</t>
 			<i>number sign</i>
+			<ukmaths>_8</ukmaths>
 		</in>
 		<in>
 			<m>@</m>
@@ -971,17 +1067,20 @@
 			<m>,</m>
 			<t>,</t>
 			<i>comma</i>
+			<ukmaths>,1</ukmaths>
 		</in>
 		<in>
 			<m>.</m>
 			<t>.</t>
 			<sp>after</sp>
 			<i>period</i>
+			<ukmaths>,4</ukmaths>
 		</in>
 		<in>
 			<m>&#x2026;</m>
 			<t>…</t>
 			<i>three periods</i>
+			<ukmaths>'''</ukmaths>
 		</in>
 		<in>
 			<m>&#x2026;</m>
@@ -997,11 +1096,13 @@
 			<m>∴</m>
 			<t>∴</t>
 			<i>therefore</i>
+			<ukmaths> ,* </ukmaths>
 		</in>
 		<in>
 			<m>∵</m>
 			<t>∵</t>
 			<i>because</i>
+			<ukmaths> @/ </ukmaths>
 		</in>
 		<in>
 			<m>∷</m>
@@ -1032,6 +1133,7 @@
 			<m>∣</m>
 			<t>∣</t>
 			<i>divides</i>
+			<ukmaths>|</ukmaths>
 		</in>
 		<in>
 			<m>∤</m>
@@ -1042,11 +1144,13 @@
 			<m>⊢</m>
 			<t>⊢</t>
 			<i>right track</i>
+			<ukmaths> _1 </ukmaths>
 		</in>
 		<in>
 			<m>⊣</m>
 			<t>⊣</t>
 			<i>left track</i>
+			<ukmaths> "l </ukmaths>
 		</in>
 		<in>
 			<m>⊤</m>
@@ -1064,6 +1168,7 @@
 			<m>!</m>
 			<t>!</t>
 			<i>factorial</i>
+			<ukmaths>,6</ukmaths>
 		</in>
 		<in>
 			<m>‼</m>
@@ -1074,16 +1179,19 @@
 			<m>|</m>
 			<t>|</t>
 			<i>absolute value</i>
+			<ukmaths>_</ukmaths>
 		</in>
 		<in>
 			<m>&#x2211;</m>
 			<t>∑</t>
 			<i>sum</i>
+			<ukmaths>_s</ukmaths>
 		</in>
 		<in>
 			<m>&#x220F;</m>
 			<t>∏</t>
 			<i>product</i>
+			<ukmaths>_p</ukmaths>
 		</in>
 	</group>
 	<group name='幾何'>
@@ -1096,6 +1204,7 @@
 			<m>∠</m>
 			<t>∠</t>
 			<i>angle</i>
+			<ukmaths>_[</ukmaths>
 		</in>
 		<in>
 			<m>∡</m>
@@ -1116,11 +1225,13 @@
 			<m>∥</m>
 			<t>∥</t>
 			<i>parallel to</i>
+			<ukmaths>__</ukmaths>
 		</in>
 		<in>
 			<m>∦</m>
 			<t>∦</t>
 			<i>not parallel to</i>
+			<ukmaths> "__</ukmaths>
 		</in>
 		<in>
 			<m>⊿</m>
@@ -1133,16 +1244,19 @@
 			<m>′</m>
 			<t>′</t>
 			<i>prime</i>
+			<ukmaths>@9</ukmaths>
 		</in>
 		<in>
 			<m>″</m>
 			<t>″</t>
 			<i>double prime</i>
+			<ukmaths>@99</ukmaths>
 		</in>
 		<in>
 			<m>‴</m>
 			<t>‴</t>
 			<i>triple prime</i>
+			<ukmaths>@999</ukmaths>
 		</in>
 		<in>
 			<m>&#x2146;</m>
@@ -1158,28 +1272,33 @@
 			<m>&#x2202;</m>
 			<t>∂</t>
 			<i>partial differential</i>
+			<ukmaths>@d</ukmaths>
 		</in>
 		<in>
 			<m>&#x222B;</m>
 			<t>∫</t>
 			<i>integral</i>
+			<ukmaths>!</ukmaths>
 		</in>
 		<in>
 			<m>∬</m>
 			<t>∬</t>
 			<i>double integral</i>
 			<replace><![CDATA[ <mrow><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>			
+			<ukmaths>!!</ukmaths>
 		</in>
 		<in>
 			<m>∭</m>
 			<t>∭</t>
 			<i>triple integral</i>
 			<replace><![CDATA[ <mrow><mspace width="0.1em"/><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mpadded width="-0.5em"><mo>∫</mo></mpadded><mspace width="0.3em"/></mrow> ]]></replace>
+			<ukmaths>!!!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222E;</m>
 			<t>∮</t>
 			<i>contour integral</i>
+			<ukmaths>@!</ukmaths>
 		</in>
 		<in>
 			<m>&#x222F;</m>
@@ -1220,96 +1339,115 @@
 			<m>∀</m>
 			<t>∀</t>
 			<i>for all</i>
+			<ukmaths> \1</ukmaths>
 		</in>
 		<in>
 			<m>∃</m>
 			<t>∃</t>
 			<i>there exists</i>
+			<ukmaths> \5</ukmaths>
 		</in>
 		<in>
 			<m>∄</m>
 			<t>∄</t>
 			<i>there does not exist</i>
+			<ukmaths> \"5</ukmaths>
 		</in>
 		<in>
 			<m>∅</m>
 			<t>∅</t>
 			<i>empty set</i>
+			<ukmaths> \0</ukmaths>
 		</in>
 		<in>
 			<m>∈</m>
 			<t>∈</t>
 			<i>is element of</i>
+			<ukmaths> \9</ukmaths>
 		</in>
 		<in>
 			<m>∉</m>
 			<t>∉</t>
 			<i>is not element of</i>
+			<ukmaths> \"9</ukmaths>
 		</in>
 		<in>
 			<m>∩</m>
 			<t>∩</t>
 			<i>intersection</i>
+			<ukmaths> \8</ukmaths>
 		</in>
 		<in>
 			<m>∪</m>
 			<t>∪</t>
 			<i>union</i>
+			<ukmaths> \6</ukmaths>
 		</in>
 		<in>
 			<m>∖</m>
 			<t>∖</t>
 			<i>set minus</i>
+			<ukmaths> \*</ukmaths>
 		</in>
 		<in>
 			<m>∧</m>
 			<t>∧</t>
 			<i>logical and</i>
+			<ukmaths> ^8</ukmaths>
 		</in>
 		<in>
 			<m>∨</m>
 			<t>∨</t>
 			<i>logical or</i>
+			<ukmaths> ^6</ukmaths>
 		</in>
 		<in>
 			<m>⊂</m>
 			<t>⊂</t>
 			<i>subset of</i>
+			<ukmaths> \[</ukmaths>
 		</in>
 		<in>
 			<m>⊃</m>
 			<t>⊃</t>
 			<i>superset of</i>
+			<ukmaths> \o</ukmaths>
 		</in>
 		<in>
 			<m>⊄</m>
 			<t>⊄</t>
 			<i>not a subset of</i>
+			<ukmaths> \"[</ukmaths>
 		</in>
 		<in>
 			<m>⊅</m>
 			<t>⊅</t>
 			<i>not a superset of</i>
+			<ukmaths> \"o</ukmaths>
 		</in>
 		<in>
 			<m>⊆</m>
 			<t>⊆</t>
 			<i>subset of or equal to</i>
+			<ukmaths> \[7</ukmaths>
 		</in>
 		<in>
 			<m>⊇</m>
 			<t>⊇</t>
 			<i>superset of or equal to</i>
+			<ukmaths> \o7</ukmaths>
 		</in>
 		<in>
 			<m>⊈</m>
 			<t>⊈</t>
 			<i>neither a subset of nor equal to</i>
+			<ukmaths> \"[7</ukmaths>
 		</in>
 		<in>
 			<m>⊉</m>
 			<t>⊉</t>
 			<i>neither a superset of nor equal to</i>
+			<ukmaths> \"o7</ukmaths>
 		</in>
 		<in>
 			<m>⊌</m>
@@ -1360,11 +1498,13 @@
 			<m>⊕</m>
 			<t>⊕</t>
 			<i>circled plus</i>
+			<ukmaths>&lt;;6&gt;</ukmaths>
 		</in>
 		<in>
 			<m>⊖</m>
 			<t>⊖</t>
 			<i>circled minus</i>
+			<ukmaths>&lt;;-&gt;</ukmaths>
 		</in>
 	</group>
 
@@ -1373,26 +1513,31 @@
 			<m>&#x2192;</m>
 			<t>→</t>
 			<i>right arrow</i>
+			<ukmaths> 3o</ukmaths>
 		</in>
 		<in>
 			<m>&#x2190;</m>
 			<t>←</t>
 			<i>left arrow</i>
+			<ukmaths> [3</ukmaths>
 		</in>
 		<in>
 			<m>&#x2194;</m>
 			<t>↔</t>
 			<i>left-right arrow</i>
+			<ukmaths> [3o</ukmaths>
 		</in>
 		<in>
 			<m>↑</m>
 			<t>↑</t>
 			<i>up arrow</i>
+			<ukmaths> 3i</ukmaths>
 		</in>
 		<in>
 			<m>↓</m>
 			<t>↓</t>
 			<i>down arrow</i>
+			<ukmaths> 35</ukmaths>
 		</in>
 		<in>
 			<m>↕</m>
@@ -1424,16 +1569,19 @@
 			<m>⇒</m>
 			<t>⇒</t>
 			<i>right double arrow</i>
+			<ukmaths> \3o</ukmaths>
 		</in>
 		<in>
 			<m>⇐</m>
 			<t>⇐</t>
 			<i>left double arrow</i>
+			<ukmaths> \[3</ukmaths>
 		</in>
 		<in>
 			<m>⇔</m>
 			<t>⇔</t>
 			<i>right-left double arrow</i>
+			<ukmaths> \[3o</ukmaths>
 		</in>
 
 		<in>
@@ -1459,11 +1607,13 @@
 			<t>∇</t>
 			<i>nabla/del/grad</i>
 			<hk>Ctrl+N</hk>
+			<ukmaths>_0</ukmaths>
 		</in>
 		<in>
 			<t>∇²</t>
 			<sc>∇²</sc>
 			<i>laplacian</i>
+			<ukmaths>_0+2</ukmaths>
 		</in>
 		<in>
 			<m>⋄</m>
@@ -1479,21 +1629,25 @@
 			<m>∘</m>
 			<t>∘</t>
 			<i>ring</i>
+			<ukmaths> \7</ukmaths>
 		</in>
 		<in>
 			<m>&#x22C5;</m>
 			<t>⋅</t>
 			<i>dot operator</i>
+			<ukmaths>;'</ukmaths>
 		</in>
 		<in>
 			<m>⋆</m>
 			<t>⋆</t>
 			<i>star operator</i>
+			<ukmaths> \=</ukmaths>
 		</in>
 		<in>
 			<m>□</m>
 			<t>□</t>
 			<i>square</i>
+			<ukmaths>$q</ukmaths>
 		</in>
 	</group>
 

Modified: trunk/chrome/locale/zh-TW/mathcast.dtd
===================================================================
--- trunk/chrome/locale/zh-TW/mathcast.dtd	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/locale/zh-TW/mathcast.dtd	2014-09-02 09:02:29 UTC (rev 181)
@@ -48,6 +48,13 @@
 <!ENTITY charConventionUnicode.label "Unicode">
 <!ENTITY charConventionUnicode.tooltip "採用 Unicode 字符（例：ε）">
 
+<!ENTITY editMode.title "編輯模式(T):">
+<!ENTITY editMode.accesskey "T">
+<!ENTITY editModeMathLine.label "Rapid Mathline">
+<!ENTITY editModeMathLine.tooltip "一個直接並有效率的方法，可快速開發數學方程式">
+<!ENTITY editModeUKMaths.label "英國數學點字">
+<!ENTITY editModeUKMaths.tooltip "由 BAUK 指定的數學點字標示法">
+
 <!ENTITY displayType.title "顯示方式(D)：">
 <!ENTITY displayType.accesskey "D">
 <!ENTITY displayTypeBlock.label "方樞">

Modified: trunk/chrome/skin/mathcast.css
===================================================================
--- trunk/chrome/skin/mathcast.css	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/chrome/skin/mathcast.css	2014-09-02 09:02:29 UTC (rev 181)
@@ -15,6 +15,7 @@
 /* XBL bindings */
 flatbutton { -moz-binding:url("chrome://mathcast/content/bindings/flatbutton.xml#flatbutton"); }
 mathline { -moz-binding:url("chrome://mathcast/content/bindings/mathline.xml#mathline"); }
+ukmaths { -moz-binding:url("chrome://mathcast/content/bindings/ukmaths.xml#ukmaths"); }
 richlistitem.equation { -moz-binding:url("chrome://mathcast/content/bindings/equationlist.xml#equation"); }
 richlistbox.equationlist { -moz-binding:url("chrome://mathcast/content/bindings/equationlist.xml#equationlist"); }
 
@@ -40,6 +41,7 @@
 #bkgEdit { /*background:url("chrome://mathcast/skin/editor.png"); */background-repeat:no-repeat; background-color:rgb(255,255,255); }
 #toolbarEquation { -moz-appearance:none; }
 #toolbarEquation > toolbarbutton { -moz-appearance:toolbarbutton; }
+#toolbarEquation > toolbarbutton[disabled="true"] { opacity:0.1; }
 #equationlist-intro { font-size:16px; }
 #equationlist-intro > label { padding-top:16px; }
 #equationlist-title { font-size:24px; }

Added: trunk/chrome/skin/ukmaths.css
===================================================================
--- trunk/chrome/skin/ukmaths.css	                        (rev 0)
+++ trunk/chrome/skin/ukmaths.css	2014-09-02 09:02:29 UTC (rev 181)
@@ -0,0 +1,6 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+ukmaths { -moz-appearance:toolbox; }
+.ukmaths-textarea { font-size:200%; font-weight:bold; }
+.ukmaths-ok { list-style-image:url("chrome://mathcast/skin/icon16/ok.png"); }
+.ukmaths-cancel { list-style-image:url("chrome://mathcast/skin/icon16/cancel.png"); }

Modified: trunk/defaults/preferences/prefs.js
===================================================================
--- trunk/defaults/preferences/prefs.js	2014-09-01 02:35:42 UTC (rev 180)
+++ trunk/defaults/preferences/prefs.js	2014-09-02 09:02:29 UTC (rev 181)
@@ -1,6 +1,8 @@
 pref("toolkit.defaultChromeURI", "chrome://mathcast/content/mathcast.xul");
 pref("browser.xul.error_pages.enabled", true);
+pref("intl.locale.matchOS", true);
 
+pref("mathcast.editMode", "mathline");
 pref("mathcast.displayType", "block");
 pref("mathcast.color", "");
 pref("mathcast.bgcolor", "");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[180] trunk/chrome/content

From: <tim...@us...> - 2014-09-01 02:35:45

Revision: 180
          http://sourceforge.net/p/mathcast/code/180
Author:   timothylee
Date:     2014-09-01 02:35:42 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
- Ensure the equation name in always shown on status bar
- Use MutationObserver in favour of deprecated Mutation Events

Modified Paths:
--------------
    trunk/chrome/content/bindings/equationlist.xml
    trunk/chrome/content/file.js

Modified: trunk/chrome/content/bindings/equationlist.xml
===================================================================
--- trunk/chrome/content/bindings/equationlist.xml	2014-09-01 01:03:05 UTC (rev 179)
+++ trunk/chrome/content/bindings/equationlist.xml	2014-09-01 02:35:42 UTC (rev 180)
@@ -40,7 +40,7 @@
     <implementation>
 
       <!-- Label contains raw MathML -->
-      <field name="_label"/>
+      <field name="_label">new String()</field>
       <property name="label" readonly="true">
         <getter>
         <![CDATA[
@@ -119,24 +119,6 @@
       ]]>
       </handler>
 
-      <handler event="DOMSubtreeModified">
-      <![CDATA[
-        // Update the index of all richlistitems
-        var idx = 0;
-        for (var child = this.firstChild;  child;  child = child.nextSibling)
-        {
-            if (child.nodeName != "richlistitem")  continue;
-            var mml = child.firstChild;
-            var name = "";
-            if (mml && mml.hasAttribute("id"))
-                name = mml.getAttribute("id");
-            child.setAttribute("tooltiptext", name);
-            child.setAttribute("index", idx);
-            ++idx;
-        }
-      ]]>
-      </handler>
-
     </handlers>
 
     <implementation implements="nsIXBLAccessible">
@@ -300,6 +282,9 @@
       ]]>
       </field>
 
+      <!-- Observer for child list modification -->
+      <field name="_mutationObserver"/>
+
       <property name="selectedIndices" readonly="true">
         <!-- Setter purposely not implemented; the getter returns an
              array selected index sorted in increasing order -->
@@ -319,11 +304,18 @@
       <![CDATA[
         this.selType = "multiple";
         window.controllers.insertControllerAt(0, this._controller);
+
+        // Observe changes in rich item list
+        var _outer = this;
+        this._mutationObserver = new MutationObserver(
+            function(mutations) { _outer._onChildListModified(); })
+        this._mutationObserver.observe(this, {childList:true, subtree:true});
       ]]>
       </constructor>
 
       <destructor>
       <![CDATA[
+        this._mutationObserver.disconnect();
         window.controllers.removeControllerAt(this._controller);
       ]]>
       </destructor>
@@ -345,6 +337,27 @@
         </body>
       </method>
 
+      <method name="_onChildListModified">
+        <parameter name="mutations"/>
+        <body>
+        <![CDATA[
+          // Update the index of all richlistitems
+          var idx = 0;
+          for (var child = this.firstChild;  child;  child = child.nextSibling)
+          {
+              if (child.nodeName != "richlistitem")  continue;
+              var mml = child.firstChild;
+              var name = "";
+              if (mml && mml.hasAttribute("id"))
+                  name = mml.getAttribute("id");
+              child.setAttribute("tooltiptext", name);
+              child.setAttribute("index", idx);
+              ++idx;
+          }
+        ]]>
+        </body>
+      </method>
+
       <method name="_wrapInHTML">
         <parameter name="content"/>
         <body>
@@ -1291,6 +1304,9 @@
         <parameter name="list"/>
         <body>
         <![CDATA[
+          // Clear existing selection
+          this.clearSelection();
+
           // Remove all equations before insertion
           for (var n = this.itemCount;  n--;  )  this.removeItemAt(n);
           this._insertListAt(list, 0, false);

Modified: trunk/chrome/content/file.js
===================================================================
--- trunk/chrome/content/file.js	2014-09-01 01:03:05 UTC (rev 179)
+++ trunk/chrome/content/file.js	2014-09-01 02:35:42 UTC (rev 180)
@@ -99,12 +99,11 @@
 {
     var panel = document.getElementById("statusbar-eq-name");
     if (!panel)  return;
+    var label = "";
     var eq = document.getElementById("equationlist");
-    if (!eq)  return;
-    if (eq.selectedItems.length > 1)
-        panel.label = "";
-    else
-        panel.label = eq.getName();
+    if (eq && (eq.selectedItems.length == 1))
+        label = eq.getName();
+    panel.label = label;
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[179] trunk/chrome/content

From: <tim...@us...> - 2014-09-01 01:03:07

Revision: 179
          http://sourceforge.net/p/mathcast/code/179
Author:   timothylee
Date:     2014-09-01 01:03:05 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
- Added libbrl2mml for win32 and linux to support braille conversion

Modified Paths:
--------------
    trunk/chrome/content/main.js
    trunk/chrome/content/mathcast.xul

Added Paths:
-----------
    trunk/chrome/content/brl2mml.js
    trunk/chrome/content/lib32/
    trunk/chrome/content/lib32/libbrl2mml-1.dll
    trunk/chrome/content/lib32/libbrl2mml.so.1
    trunk/chrome/content/lib64/
    trunk/chrome/content/lib64/libbrl2mml.so.1

Added: trunk/chrome/content/brl2mml.js
===================================================================
--- trunk/chrome/content/brl2mml.js	                        (rev 0)
+++ trunk/chrome/content/brl2mml.js	2014-09-01 01:03:05 UTC (rev 179)
@@ -0,0 +1,78 @@
+/**********************************************************************
+*
+*  Filename:    brl2mml.js
+*  Description: Maths braille script file for MathCast.
+*  Version:     $Revision: $
+*  Date:        $Date: $
+*
+**********************************************************************/
+
+
+var brl2mml_free = null;
+var brl2mml_convert = null;
+
+
+Components.utils.import("resource://gre/modules/ctypes.jsm");
+
+
+// Converts between braille and MathML
+function convertBraille(mode, data)
+{
+    if (!brl2mml_convert)  return '';
+    var ret = brl2mml_convert(mode, data, null);
+    if (ret.isNull())  return '';
+    var str = ret.readStringReplaceMalformed();
+    brl2mml_free(ret);
+    return str;
+}
+
+
+// Initializes libbrl2mml by loading shared library
+function initBrl2mml()
+{
+    var cr = Components.classes['@mozilla.org/chrome/chrome-registry;1']
+        .getService(Components.interfaces.nsIChromeRegistry);
+    var io = Components.classes['@mozilla.org/network/io-service;1']
+        .getService(Components.interfaces.nsIIOService);
+
+    // Determine names of shared library 
+    var libs;
+    if (gRuntime.OS == "WINNT")
+        libs = ['lib32/libbrl2mml-1.dll', 'lib64/libbrl2mml-1.dll'];
+    else
+        libs = ['lib32/libbrl2mml.so.1', 'lib64/libbrl2mml.so.1'];
+
+    for (var n = 0;  n < libs.length;  ++n)
+    {
+        // Attempt to load library
+        var url = "chrome://mathcast/content/" + libs[n];
+        var uri = io.newURI(decodeURI(url), 'UTF-8', null);
+        try
+        {
+            uri = cr.convertChromeURL(uri);
+            var file = uri.QueryInterface(
+                    Components.interfaces.nsIFileURL).file;
+            var lib = ctypes.open(file.path);
+        }
+        catch (e)
+        {
+            continue;
+        }
+
+        // Declare the functions
+        brl2mml_free = lib.declare("brl2mml_free",
+                ctypes.default_abi,
+                ctypes.void_t,          // return void
+                ctypes.char.ptr);       // param void* ptr
+        brl2mml_convert = lib.declare("brl2mml_convert",
+                ctypes.default_abi,
+                ctypes.char.ptr,        // return char*
+                ctypes.char.ptr,        // param const char* mode
+                ctypes.char.ptr,        // param const char* data
+                ctypes.int.ptr);        // param int* used
+        break;
+    }
+}
+
+
+/* vim: set cindent tabstop=8 softtabstop=4 expandtab shiftwidth=4: */

Added: trunk/chrome/content/lib32/libbrl2mml-1.dll
===================================================================
(Binary files differ)

Index: trunk/chrome/content/lib32/libbrl2mml-1.dll
===================================================================
--- trunk/chrome/content/lib32/libbrl2mml-1.dll	2014-08-28 12:38:01 UTC (rev 178)
+++ trunk/chrome/content/lib32/libbrl2mml-1.dll	2014-09-01 01:03:05 UTC (rev 179)

Property changes on: trunk/chrome/content/lib32/libbrl2mml-1.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-dosexec
\ No newline at end of property
Added: trunk/chrome/content/lib32/libbrl2mml.so.1
===================================================================
(Binary files differ)

Index: trunk/chrome/content/lib32/libbrl2mml.so.1
===================================================================
--- trunk/chrome/content/lib32/libbrl2mml.so.1	2014-08-28 12:38:01 UTC (rev 178)
+++ trunk/chrome/content/lib32/libbrl2mml.so.1	2014-09-01 01:03:05 UTC (rev 179)

Property changes on: trunk/chrome/content/lib32/libbrl2mml.so.1
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/x-sharedlib
\ No newline at end of property
Added: trunk/chrome/content/lib64/libbrl2mml.so.1
===================================================================
(Binary files differ)

Index: trunk/chrome/content/lib64/libbrl2mml.so.1
===================================================================
--- trunk/chrome/content/lib64/libbrl2mml.so.1	2014-08-28 12:38:01 UTC (rev 178)
+++ trunk/chrome/content/lib64/libbrl2mml.so.1	2014-09-01 01:03:05 UTC (rev 179)

Property changes on: trunk/chrome/content/lib64/libbrl2mml.so.1
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/x-sharedlib
\ No newline at end of property
Modified: trunk/chrome/content/main.js
===================================================================
--- trunk/chrome/content/main.js	2014-08-28 12:38:01 UTC (rev 178)
+++ trunk/chrome/content/main.js	2014-09-01 01:03:05 UTC (rev 179)
@@ -168,6 +168,9 @@
         item.setAttribute("hidden", "true");
     }
 
+    // Initialize libbrl2mml
+    initBrl2mml();
+
     // Restrict URL loader
     var loader = document.getElementById("iframeLoader");
     loader.webNavigation.allowAuth = true;

Modified: trunk/chrome/content/mathcast.xul
===================================================================
--- trunk/chrome/content/mathcast.xul	2014-08-28 12:38:01 UTC (rev 178)
+++ trunk/chrome/content/mathcast.xul	2014-09-01 01:03:05 UTC (rev 179)
@@ -35,6 +35,7 @@
   <script src="chrome://mathcast/content/equation.js"/>
   <script src="chrome://mathcast/content/help.js"/>
   <script src="chrome://mathcast/content/httpd.js"/>
+  <script src="chrome://mathcast/content/brl2mml.js"/>
 
   <stringbundleset id="mainStrings">
     <stringbundle id="bundleMathcast" src="chrome://mathcast/locale/mathcast.properties"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mathcast-checkin] SF.net SVN: mathcast:[178] trunk/chrome/content/bindings/flatbutton.xml

From: <tim...@us...> - 2014-08-28 12:38:11

Revision: 178
          http://sourceforge.net/p/mathcast/code/178
Author:   timothylee
Date:     2014-08-28 12:38:01 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
- Fix bugs in <flatbutton> code

Modified Paths:
--------------
    trunk/chrome/content/bindings/flatbutton.xml

Modified: trunk/chrome/content/bindings/flatbutton.xml
===================================================================
--- trunk/chrome/content/bindings/flatbutton.xml	2013-03-18 20:08:48 UTC (rev 177)
+++ trunk/chrome/content/bindings/flatbutton.xml	2014-08-28 12:38:01 UTC (rev 178)
@@ -26,7 +26,7 @@
         <xul:box class="flatbutton-content"
             xbl:inherits="dir,align,pack,orient"
             align="center" pack="center" flex="1">
-          <xul:image xbl:inherits="image=src,validate,src"/>
+          <xul:image xbl:inherits="src=image,validate,src"/>
           <xul:label class="flatbutton-label"
               xbl:inherits="value=label,accesskey,crop" flex="1"/>
         </xul:box>
@@ -72,9 +72,8 @@
 
       <field name="_cmdId">
       <![CDATA[
-        var body = document.getAnonymousElementByAttribute(this,
-            "anonid", "body");
-        this._cmdId = body.getAttribute("cmd");
+        document.getAnonymousElementByAttribute(this, "anonid", "body")
+            .getAttribute("cmd");
       ]]>
       </field>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

2012	Jan	Feb	Mar	Apr	May	Jun (29)	Jul (11)	Aug (4)	Sep (2)	Oct	Nov	Dec
2013	Jan (6)	Feb (38)	Mar (30)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep (12)	Oct	Nov (4)	Dec
2015	Jan	Feb (6)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec