[Mathcast-checkin] SF.net SVN: mathcast:[181] trunk
Brought to you by:
timothylee,
tom_chekam
|
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="©TypeImage.label;" tooltiptext="©TypeImage.tooltip;"/>
<radio value="mathml" label="©TypeMathML.label;" tooltiptext="©TypeMathML.tooltip;"/>
- <radio value="emfoffice" label="©TypeEMFOffice.label;" tooltiptext="©TypeEMFOffice.tooltip;"/>
- <radio value="emfopenoffice" label="©TypeEMFOpenOffice.label;" tooltiptext="©TypeEMFOpenOffice.tooltip;"/>
+ <radio value="emfoffice" label="©TypeEMFOffice.label;" tooltiptext="©TypeEMFOffice.tooltip;"/>
+ <radio value="emfopenoffice" label="©TypeEMFOpenOffice.label;" tooltiptext="©TypeEMFOpenOffice.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>α</m>
<t>α</t>
<i>alpha</i>
+ <ukmaths>.a</ukmaths>
</in>
<in>
<m>β</m>
<t>β</t>
<i>beta</i>
+ <ukmaths>.b</ukmaths>
</in>
<in>
<m>γ</m>
<t>γ</t>
<i>gamma</i>
+ <ukmaths>.g</ukmaths>
</in>
<in>
<m>δ</m>
<t>δ</t>
<i>delta</i>
+ <ukmaths>.d</ukmaths>
</in>
<in>
<m>ε</m>
<t>ε</t>
<i>epsilon</i>
+ <ukmaths>.e</ukmaths>
</in>
<in>
<m>ζ</m>
<t>ζ</t>
<i>zeta</i>
+ <ukmaths>.z</ukmaths>
</in>
<in>
<m>η</m>
<t>η</t>
<i>eta</i>
+ <ukmaths>.:</ukmaths>
</in>
<in>
<m>θ</m>
<t>θ</t>
<i>theta</i>
+ <ukmaths>.?</ukmaths>
</in>
<in>
<m>ι</m>
<t>ι</t>
<i>iota</i>
+ <ukmaths>.i</ukmaths>
</in>
<in>
<m>κ</m>
<t>κ</t>
<i>kappa</i>
+ <ukmaths>.k</ukmaths>
</in>
<in>
<m>λ</m>
<t>λ</t>
<i>lambda</i>
+ <ukmaths>.l</ukmaths>
</in>
<in>
<m>μ</m>
<t>μ</t>
<i>mu</i>
+ <ukmaths>.m</ukmaths>
</in>
<in>
<m>ν</m>
<t>ν</t>
<i>nu</i>
+ <ukmaths>.n</ukmaths>
</in>
<in>
<m>ξ</m>
<t>ξ</t>
<i>xi</i>
+ <ukmaths>.x</ukmaths>
</in>
<in>
<m>ο</m>
<t>ο</t>
<i>omicron</i>
+ <ukmaths>.o</ukmaths>
</in>
<in>
<m>π</m>
<t>π</t>
<i>pi</i>
+ <ukmaths>.p</ukmaths>
</in>
<in>
<m>ρ</m>
<t>ρ</t>
<i>rho</i>
+ <ukmaths>.r</ukmaths>
</in>
<in>
<m>ς</m>
@@ -124,36 +141,43 @@
<m>σ</m>
<t>σ</t>
<i>sigma</i>
+ <ukmaths>.s</ukmaths>
</in>
<in>
<m>τ</m>
<t>τ</t>
<i>tau</i>
+ <ukmaths>.t</ukmaths>
</in>
<in>
<m>υ</m>
<t>υ</t>
<i>upsilon</i>
+ <ukmaths>.u</ukmaths>
</in>
<in>
<m>φ</m>
<t>φ</t>
<i>phi</i>
+ <ukmaths>.f</ukmaths>
</in>
<in>
<m>χ</m>
<t>χ</t>
<i>chi</i>
+ <ukmaths>.&</ukmaths>
</in>
<in>
<m>ψ</m>
<t>ψ</t>
<i>psi</i>
+ <ukmaths>.y</ukmaths>
</in>
<in>
<m>ω</m>
<t>ω</t>
<i>omega</i>
+ <ukmaths>.w</ukmaths>
</in>
</group>
<group name='large greek letters'>
@@ -161,121 +185,145 @@
<m>Α</m>
<t>Α</t>
<i>Alpha</i>
+ <ukmaths>_a</ukmaths>
</in>
<in>
<m>Β</m>
<t>Β</t>
<i>Beta</i>
+ <ukmaths>_b</ukmaths>
</in>
<in>
<m>Γ</m>
<t>Γ</t>
<i>Gamma</i>
+ <ukmaths>_g</ukmaths>
</in>
<in>
<m>Δ</m>
<t>Δ</t>
<i>Delta</i>
+ <ukmaths>_d</ukmaths>
</in>
<in>
<m>Ε</m>
<t>Ε</t>
<i>Epsilon</i>
+ <ukmaths>_e</ukmaths>
</in>
<in>
<m>Ζ</m>
<t>Ζ</t>
<i>Zeta</i>
+ <ukmaths>_z</ukmaths>
</in>
<in>
<m>Η</m>
<t>Η</t>
<i>Eta</i>
+ <ukmaths>_:</ukmaths>
</in>
<in>
<m>Θ</m>
<t>Θ</t>
<i>Theta</i>
+ <ukmaths>_?</ukmaths>
</in>
<in>
<m>Ι</m>
<t>Ι</t>
<i>Iota</i>
+ <ukmaths>_i</ukmaths>
</in>
<in>
<m>Κ</m>
<t>Κ</t>
<i>Kappa</i>
+ <ukmaths>_k</ukmaths>
</in>
<in>
<m>Λ</m>
<t>Λ</t>
<i>Lambda</i>
+ <ukmaths>_l</ukmaths>
</in>
<in>
<m>Μ</m>
<t>Μ</t>
<i>Mu</i>
+ <ukmaths>_m</ukmaths>
</in>
<in>
<m>Ν</m>
<t>Ν</t>
<i>Nu</i>
+ <ukmaths>_n</ukmaths>
</in>
<in>
<m>Ξ</m>
<t>Ξ</t>
<i>Xi</i>
+ <ukmaths>_x</ukmaths>
</in>
<in>
<m>Ο</m>
<t>Ο</t>
<i>Omicron</i>
+ <ukmaths>_o</ukmaths>
</in>
<in>
<m>Π</m>
<t>Π</t>
<i>Pi</i>
+ <ukmaths>_p</ukmaths>
</in>
<in>
<m>Ρ</m>
<t>Ρ</t>
<i>Rho</i>
+ <ukmaths>_r</ukmaths>
</in>
<in>
<m>Σ</m>
<t>Σ</t>
<i>Sigma</i>
+ <ukmaths>_s</ukmaths>
</in>
<in>
<m>Τ</m>
<t>Τ</t>
<i>Tau</i>
+ <ukmaths>_t</ukmaths>
</in>
<in>
<m>Υ</m>
<t>Υ</t>
<i>Upsilon</i>
+ <ukmaths>_u</ukmaths>
</in>
<in>
<m>Φ</m>
<t>Φ</t>
<i>Phi</i>
+ <ukmaths>_f</ukmaths>
</in>
<in>
<m>Χ</m>
<t>Χ</t>
<i>Chi</i>
+ <ukmaths>_&</ukmaths>
</in>
<in>
<m>Ψ</m>
<t>Ψ</t>
<i>Psi</i>
+ <ukmaths>_y</ukmaths>
</in>
<in>
<m>Ω</m>
<t>Ω</t>
<i>Omega</i>
+ <ukmaths>_w</ukmaths>
</in>
</group>
<group name='special letters'>
@@ -283,6 +331,7 @@
<m>∞</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>K</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>−</m>
<t>−</t>
<sp/>
<i>minus</i>
+ <ukmaths> ;-</ukmaths>
</in>
<in>
<m>⁺</m>
@@ -550,11 +606,13 @@
<m>·</m>
<t>·</t>
<i>dot</i>
+ <ukmaths>;'</ukmaths>
</in>
<in>
<m>×</m>
<t>×</t>
<i>cross</i>
+ <ukmaths> ;8</ukmaths>
</in>
<in>
<m>⁢</m>
@@ -575,23 +633,27 @@
<m>∕</m>
<t>∕</t>
<i>division slash</i>
+ <ukmaths>_/</ukmaths>
</in>
<in>
<m>÷</m>
<t>÷</t>
<i>divided by</i>
+ <ukmaths> ;4</ukmaths>
</in>
<in>
<m>±</m>
<t>±</t>
<sp/>
<i>plus or minus</i>
+ <ukmaths> ;6-</ukmaths>
</in>
<in>
<m>∓</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>≠</m>
<t>≠</t>
<sp/>
<i>not equals to</i>
+ <ukmaths> "7</ukmaths>
</in>
<in>
<m>≡</m>
<t>≡</t>
<sp/>
<i>identical to</i>
+ <ukmaths> 77</ukmaths>
</in>
<in>
<m>∝</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><</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>≤</m>
<t>≤</t>
<sp/>
<i>less than or equals to</i>
+ <ukmaths> [7</ukmaths>
</in>
<in>
<m>≥</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>&</m>
<t>&</t>
<sp/>
<i>amperstand</i>
+ <ukmaths>@&</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>…</m>
<t>…</t>
<i>three periods</i>
+ <ukmaths>'''</ukmaths>
</in>
<in>
<m>…</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>∑</m>
<t>∑</t>
<i>sum</i>
+ <ukmaths>_s</ukmaths>
</in>
<in>
<m>∏</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>ⅆ</m>
@@ -1158,28 +1272,33 @@
<m>∂</m>
<t>∂</t>
<i>partial differential</i>
+ <ukmaths>@d</ukmaths>
</in>
<in>
<m>∫</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>∮</m>
<t>∮</t>
<i>contour integral</i>
+ <ukmaths>@!</ukmaths>
</in>
<in>
<m>∯</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><;6></ukmaths>
</in>
<in>
<m>⊖</m>
<t>⊖</t>
<i>circled minus</i>
+ <ukmaths><;-></ukmaths>
</in>
</group>
@@ -1373,26 +1513,31 @@
<m>→</m>
<t>→</t>
<i>right arrow</i>
+ <ukmaths> 3o</ukmaths>
</in>
<in>
<m>←</m>
<t>←</t>
<i>left arrow</i>
+ <ukmaths> [3</ukmaths>
</in>
<in>
<m>↔</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>⋅</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>α</m>
<t>α</t>
<i>alpha</i>
+ <ukmaths>.a</ukmaths>
</in>
<in>
<m>β</m>
<t>β</t>
<i>beta</i>
+ <ukmaths>.b</ukmaths>
</in>
<in>
<m>γ</m>
<t>γ</t>
<i>gamma</i>
+ <ukmaths>.g</ukmaths>
</in>
<in>
<m>δ</m>
<t>δ</t>
<i>delta</i>
+ <ukmaths>.d</ukmaths>
</in>
<in>
<m>ε</m>
<t>ε</t>
<i>epsilon</i>
+ <ukmaths>.e</ukmaths>
</in>
<in>
<m>ζ</m>
<t>ζ</t>
<i>zeta</i>
+ <ukmaths>.z</ukmaths>
</in>
<in>
<m>η</m>
<t>η</t>
<i>eta</i>
+ <ukmaths>.:</ukmaths>
</in>
<in>
<m>θ</m>
<t>θ</t>
<i>theta</i>
+ <ukmaths>.?</ukmaths>
</in>
<in>
<m>ι</m>
<t>ι</t>
<i>iota</i>
+ <ukmaths>.i</ukmaths>
</in>
<in>
<m>κ</m>
<t>κ</t>
<i>kappa</i>
+ <ukmaths>.k</ukmaths>
</in>
<in>
<m>λ</m>
<t>λ</t>
<i>lambda</i>
+ <ukmaths>.l</ukmaths>
</in>
<in>
<m>μ</m>
<t>μ</t>
<i>mu</i>
+ <ukmaths>.m</ukmaths>
</in>
<in>
<m>ν</m>
<t>ν</t>
<i>nu</i>
+ <ukmaths>.n</ukmaths>
</in>
<in>
<m>ξ</m>
<t>ξ</t>
<i>xi</i>
+ <ukmaths>.x</ukmaths>
</in>
<in>
<m>ο</m>
<t>ο</t>
<i>omicron</i>
+ <ukmaths>.o</ukmaths>
</in>
<in>
<m>π</m>
<t>π</t>
<i>pi</i>
+ <ukmaths>.p</ukmaths>
</in>
<in>
<m>ρ</m>
<t>ρ</t>
<i>rho</i>
+ <ukmaths>.r</ukmaths>
</in>
<in>
<m>ς</m>
@@ -124,36 +141,43 @@
<m>σ</m>
<t>σ</t>
<i>sigma</i>
+ <ukmaths>.s</ukmaths>
</in>
<in>
<m>τ</m>
<t>τ</t>
<i>tau</i>
+ <ukmaths>.t</ukmaths>
</in>
<in>
<m>υ</m>
<t>υ</t>
<i>upsilon</i>
+ <ukmaths>.u</ukmaths>
</in>
<in>
<m>φ</m>
<t>φ</t>
<i>phi</i>
+ <ukmaths>.f</ukmaths>
</in>
<in>
<m>χ</m>
<t>χ</t>
<i>chi</i>
+ <ukmaths>.&</ukmaths>
</in>
<in>
<m>ψ</m>
<t>ψ</t>
<i>psi</i>
+ <ukmaths>.y</ukmaths>
</in>
<in>
<m>ω</m>
<t>ω</t>
<i>omega</i>
+ <ukmaths>.w</ukmaths>
</in>
</group>
<group name='大楷希臘字母'>
@@ -161,121 +185,145 @@
<m>Α</m>
<t>Α</t>
<i>Alpha</i>
+ <ukmaths>_a</ukmaths>
</in>
<in>
<m>Β</m>
<t>Β</t>
<i>Beta</i>
+ <ukmaths>_b</ukmaths>
</in>
<in>
<m>Γ</m>
<t>Γ</t>
<i>Gamma</i>
+ <ukmaths>_g</ukmaths>
</in>
<in>
<m>Δ</m>
<t>Δ</t>
<i>Delta</i>
+ <ukmaths>_d</ukmaths>
</in>
<in>
<m>Ε</m>
<t>Ε</t>
<i>Epsilon</i>
+ <ukmaths>_e</ukmaths>
</in>
<in>
<m>Ζ</m>
<t>Ζ</t>
<i>Zeta</i>
+ <ukmaths>_z</ukmaths>
</in>
<in>
<m>Η</m>
<t>Η</t>
<i>Eta</i>
+ <ukmaths>_:</ukmaths>
</in>
<in>
<m>Θ</m>
<t>Θ</t>
<i>Theta</i>
+ <ukmaths>_?</ukmaths>
</in>
<in>
<m>Ι</m>
<t>Ι</t>
<i>Iota</i>
+ <ukmaths>_i</ukmaths>
</in>
<in>
<m>Κ</m>
<t>Κ</t>
<i>Kappa</i>
+ <ukmaths>_k</ukmaths>
</in>
<in>
<m>Λ</m>
<t>Λ</t>
<i>Lambda</i>
+ <ukmaths>_l</ukmaths>
</in>
<in>
<m>Μ</m>
<t>Μ</t>
<i>Mu</i>
+ <ukmaths>_m</ukmaths>
</in>
<in>
<m>Ν</m>
<t>Ν</t>
<i>Nu</i>
+ <ukmaths>_n</ukmaths>
</in>
<in>
<m>Ξ</m>
<t>Ξ</t>
<i>Xi</i>
+ <ukmaths>_x</ukmaths>
</in>
<in>
<m>Ο</m>
<t>Ο</t>
<i>Omicron</i>
+ <ukmaths>_o</ukmaths>
</in>
<in>
<m>Π</m>
<t>Π</t>
<i>Pi</i>
+ <ukmaths>_p</ukmaths>
</in>
<in>
<m>Ρ</m>
<t>Ρ</t>
<i>Rho</i>
+ <ukmaths>_r</ukmaths>
</in>
<in>
<m>Σ</m>
<t>Σ</t>
<i>Sigma</i>
+ <ukmaths>_s</ukmaths>
</in>
<in>
<m>Τ</m>
<t>Τ</t>
<i>Tau</i>
+ <ukmaths>_t</ukmaths>
</in>
<in>
<m>Υ</m>
<t>Υ</t>
<i>Upsilon</i>
+ <ukmaths>_u</ukmaths>
</in>
<in>
<m>Φ</m>
<t>Φ</t>
<i>Phi</i>
+ <ukmaths>_f</ukmaths>
</in>
<in>
<m>Χ</m>
<t>Χ</t>
<i>Chi</i>
+ <ukmaths>_&</ukmaths>
</in>
<in>
<m>Ψ</m>
<t>Ψ</t>
<i>Psi</i>
+ <ukmaths>_y</ukmaths>
</in>
<in>
<m>Ω</m>
<t>Ω</t>
<i>Omega</i>
+ <ukmaths>_w</ukmaths>
</in>
</group>
<group name='特別字母'>
@@ -283,6 +331,7 @@
<m>∞</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>K</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>−</m>
<t>−</t>
<sp/>
<i>minus</i>
+ <ukmaths> ;-</ukmaths>
</in>
<in>
<m>⁺</m>
@@ -550,11 +606,13 @@
<m>·</m>
<t>·</t>
<i>dot</i>
+ <ukmaths>;'</ukmaths>
</in>
<in>
<m>×</m>
<t>×</t>
<i>cross</i>
+ <ukmaths> ;8</ukmaths>
</in>
<in>
<m>⁢</m>
@@ -575,23 +633,27 @@
<m>∕</m>
<t>∕</t>
<i>division slash</i>
+ <ukmaths>_/</ukmaths>
</in>
<in>
<m>÷</m>
<t>÷</t>
<i>divided by</i>
+ <ukmaths> ;4</ukmaths>
</in>
<in>
<m>±</m>
<t>±</t>
<sp/>
<i>plus or minus</i>
+ <ukmaths> ;6-</ukmaths>
</in>
<in>
<m>∓</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>≠</m>
<t>≠</t>
<sp/>
<i>not equals to</i>
+ <ukmaths> "7</ukmaths>
</in>
<in>
<m>≡</m>
<t>≡</t>
<sp/>
<i>identical to</i>
+ <ukmaths> 77</ukmaths>
</in>
<in>
<m>∝</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><</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>≤</m>
<t>≤</t>
<sp/>
<i>less than or equals to</i>
+ <ukmaths> [7</ukmaths>
</in>
<in>
<m>≥</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>&</m>
<t>&</t>
<sp/>
<i>amperstand</i>
+ <ukmaths>@&</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>…</m>
<t>…</t>
<i>three periods</i>
+ <ukmaths>'''</ukmaths>
</in>
<in>
<m>…</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>∑</m>
<t>∑</t>
<i>sum</i>
+ <ukmaths>_s</ukmaths>
</in>
<in>
<m>∏</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>ⅆ</m>
@@ -1158,28 +1272,33 @@
<m>∂</m>
<t>∂</t>
<i>partial differential</i>
+ <ukmaths>@d</ukmaths>
</in>
<in>
<m>∫</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>∮</m>
<t>∮</t>
<i>contour integral</i>
+ <ukmaths>@!</ukmaths>
</in>
<in>
<m>∯</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><;6></ukmaths>
</in>
<in>
<m>⊖</m>
<t>⊖</t>
<i>circled minus</i>
+ <ukmaths><;-></ukmaths>
</in>
</group>
@@ -1373,26 +1513,31 @@
<m>→</m>
<t>→</t>
<i>right arrow</i>
+ <ukmaths> 3o</ukmaths>
</in>
<in>
<m>←</m>
<t>←</t>
<i>left arrow</i>
+ <ukmaths> [3</ukmaths>
</in>
<in>
<m>↔</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>⋅</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.
|