Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r078ffcc5cce6214e179857ace04486fa04a7e3a2 -r662e144da0df02dfacd0f157c29bc12012cab224
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 078ffcc5cce6214e179857ace04486fa04a7e3a2)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -652,5 +652,14 @@
 authoring.fla.liveedit.readonly.remove.child.error =The activity can not be removed. It has read-only child activities.
 authoring.fla.liveedit.readonly.remove.transition.error =The transition can not be removed. It is read-only.
 
+ckeditor.math.greek =Greek
+ckeditor.math.uppercase =uppercase
+ckeditor.math.misc =misc
+ckeditor.math.binary =binary
+ckeditor.math.large =large
+ckeditor.math.relations =relations
+ckeditor.math.negatedrelations =negated<br />relations
+ckeditor.math.arrows =arrows
+ckeditor.math.combining =combining
 
 #======= End labels: Exported 438 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
===================================================================
diff -u -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf -r662e144da0df02dfacd0f157c29bc12012cab224
--- lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java	(.../JlatexmathServlet.java)	(revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java	(.../JlatexmathServlet.java)	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -18,9 +18,9 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt 
  * **************************************************************** 
- */  
- 
-/* $Id$ */  
+ */
+
+/* $Id$ */
 package org.lamsfoundation.lams.web;
 
 import java.awt.AlphaComposite;
@@ -37,7 +37,9 @@
 import javax.swing.JLabel;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.scilab.forge.jlatexmath.ParseException;
 import org.scilab.forge.jlatexmath.TeXConstants;
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.scilab.forge.jlatexmath.TeXIcon;
@@ -49,46 +51,65 @@
  * @web:servlet-mapping url-pattern="/servlet/jlatexmath"
  */
 public class JlatexmathServlet extends HttpServlet {
-    
+
+    private static Logger log = Logger.getLogger(JlatexmathServlet.class);
+
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-	
+
 	String formulaParam = request.getParameter("formula");
 	if (StringUtils.isBlank(formulaParam)) {
 	    return;
 	}
-	
+
 	Integer fontSize = WebUtil.readIntParam(request, "fontSize", true);
 	if (fontSize == null) {
 	    fontSize = 20;
 	}
-	
-	TeXFormula formula = new TeXFormula(formulaParam);
-	TeXIcon icon = formula.new TeXIconBuilder().setStyle(TeXConstants.STYLE_DISPLAY)
-		.setSize(fontSize)
-		.setWidth(TeXConstants.UNIT_PIXEL, 256f, TeXConstants.ALIGN_CENTER)
-		.setIsMaxWidth(true).setInterLineSpacing(TeXConstants.UNIT_PIXEL, 20f)
-		.build();
-	
-//	TeXFormula fomule = new TeXFormula(formula);
-//	TeXIcon ti = fomule.createTeXIcon(TeXConstants.STYLE_DISPLAY, 40);
-	BufferedImage b = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
-//	Color transparent = new Color(0, true);
-//	((Graphics2D)b.getGraphics()).setBackground(transparent);
-//	b.getGraphics().clearRect(0, 0, icon.getIconWidth(), icon.getIconHeight());
-	
-	((Graphics2D)b.getGraphics()).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F));
+
+	TeXFormula formula = null;
+	try {
+	    formula = new TeXFormula(formulaParam);
+	} catch (ParseException e) {
+	    // don't throw a full-blown exception whenever an user makes a mistake in the formula
+	    if (JlatexmathServlet.log.isTraceEnabled()) {
+		JlatexmathServlet.log.trace(e.getMessage());
+	    }
+	    return;
+	}
+
+	TeXIcon icon = formula.new TeXIconBuilder().setStyle(TeXConstants.STYLE_DISPLAY).setSize(fontSize)
+		.setWidth(TeXConstants.UNIT_PIXEL, 256f, TeXConstants.ALIGN_CENTER).setIsMaxWidth(true)
+		.setInterLineSpacing(TeXConstants.UNIT_PIXEL, 20f).build();
+
+	BufferedImage b = null;
+	// TeXFormula fomule = new TeXFormula(formula);
+	// TeXIcon ti = fomule.createTeXIcon(TeXConstants.STYLE_DISPLAY, 40);
+	try {
+	    b = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
+	} catch (IllegalArgumentException e) {
+	    // don't throw a full-blown exception whenever an user makes a mistake in the formula
+	    if (JlatexmathServlet.log.isTraceEnabled()) {
+		JlatexmathServlet.log.trace(e.getMessage());
+	    }
+	    return;
+	}
+	// Color transparent = new Color(0, true);
+	// ((Graphics2D)b.getGraphics()).setBackground(transparent);
+	// b.getGraphics().clearRect(0, 0, icon.getIconWidth(), icon.getIconHeight());
+
+	((Graphics2D) b.getGraphics()).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F));
 	icon.paintIcon(new JLabel(), b.getGraphics(), 0, 0);
-	
+
 	response.setContentType("image/png");
 	OutputStream out = response.getOutputStream();
 	ImageIO.write(b, "png", out);
 	out.close();
     }
 
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-	    IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+	    throws ServletException, IOException {
 	doGet(request, response);
     }
 }
Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.css
===================================================================
diff -u
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.css	(revision 0)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.css	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -0,0 +1,44 @@
+#formulaButtonsTable { 
+    border-spacing: 0;
+    border-collapse: collapse;
+    margin-bottom: 10px;
+}
+
+#formulaButtonsTable td {
+	padding: 6px 0 3px 0;
+	border-bottom: 1px solid gray;
+}
+
+#formulaButtonsTable th {
+	font-size: 14px;
+	font-weight: normal;
+	padding-right: 15px;
+	border-bottom: 1px solid gray;
+}
+
+#formulaButtonsTable tbody tr:last-child td, #formulaButtonsTable tbody tr:last-child th {
+	border-bottom: none;
+}
+
+#formulaButtonsTable button {
+	width: 30px;
+	height: 25px;
+	margin: 0 0 4px 0;
+	background: none;
+	background-color: #EEEEEE;
+	color: black;
+	font-size : 14px;
+	font-weight: normal;
+}
+
+#formulaButtonsTable button:hover {
+	background-color: #DDDDDD;
+}
+
+#formulaButtonsTable button span {
+	padding: 2px 3px 3px 3px !important;
+}
+
+#formulaButtonsTable button.formulaButtonShifted span {
+	padding-top: 0px !important;
+}
\ No newline at end of file
Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.js
===================================================================
diff -u
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.js	(revision 0)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.js	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -0,0 +1,16 @@
+function insertFormula(text) {
+	var textarea = $('#latex-formula').focus(), 
+		cursorPos = textarea.prop('selectionStart'),
+		v = textarea.val(),
+		textBefore = v.substring(0, cursorPos),
+		textAfter = v.substring(cursorPos, v.length);
+    textarea.val(textBefore + text + textAfter);
+    cursorPos = cursorPos + text.length;
+    textarea.prop('selectionEnd', cursorPos);
+    textarea.prop('selectionStart', cursorPos);
+    formulaTextareaChanged();
+}
+
+$(document).ready(function(){
+	$('#formulaButtonsTable button').button();
+});
\ No newline at end of file
Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp
===================================================================
diff -u
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp	(revision 0)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -0,0 +1,254 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<table id="formulaButtonsTable">
+	<tr>
+		<th><fmt:message key="ckeditor.math.greek"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\alpha ')"   title="alpha">α</button>
+			<button onclick="javascript:insertFormula('\\beta ')"    title="beta">β</button>
+			<button onclick="javascript:insertFormula('\\gamma ')" 	 title="gamma">γ</button>
+			<button onclick="javascript:insertFormula('\\delta ')"   title="delta">δ</button>
+			<button onclick="javascript:insertFormula('\\epsilon ')" title="epsilon">ε</button>
+			<button onclick="javascript:insertFormula('\\zeta ')"    title="zeta">ζ</button>
+			<button onclick="javascript:insertFormula('\\eta ')"     title="eta">η</button>
+			<button onclick="javascript:insertFormula('\\theta ')"   title="theta">θ</button>
+			<button onclick="javascript:insertFormula('\\iota ')"    title="iota">ι</button>
+			<button onclick="javascript:insertFormula('\\kappa ')"   title="kappa">κ</button>
+			<button onclick="javascript:insertFormula('\\lambda ')"  title="lambda">λ</button>
+			<button onclick="javascript:insertFormula('\\mu ')"      title="mu">μ</button>
+			<button onclick="javascript:insertFormula('\\nu ')"      title="nu">ν</button>
+			<button onclick="javascript:insertFormula('\\xi ')"      title="xi">ξ</button>
+			<button onclick="javascript:insertFormula('\\pi ')"      title="pi">π</button>
+			<button onclick="javascript:insertFormula('\\rho ')" 	 title="rho">ρ</button>
+			<button onclick="javascript:insertFormula('\\sigma ')"   title="sigma">σ</button>
+			<button onclick="javascript:insertFormula('\\tau ')"     title="tau">τ</button>
+			<button onclick="javascript:insertFormula('\\upsilon ')" title="upsilon">υ</button>
+			<button onclick="javascript:insertFormula('\\phi ')"     title="phi">φ</button>
+			<button onclick="javascript:insertFormula('\\chi ')"     title="chi">χ</button>
+			<button onclick="javascript:insertFormula('\\psi ')"     title="psi">ψ</button>
+			<button onclick="javascript:insertFormula('\\omega ')"   title="omega">ω</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.uppercase"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\Alpha ')"   title="Alpha">Α</button>
+			<button onclick="javascript:insertFormula('\\Beta ')"    title="Beta">Β</button>
+			<button onclick="javascript:insertFormula('\\Gamma ')" 	 title="Gamma">Γ</button>
+			<button onclick="javascript:insertFormula('\\Delta ')"   title="Delta">Δ</button>
+			<button onclick="javascript:insertFormula('\\Epsilon ')" title="Epsilon">Ε</button>
+			<button onclick="javascript:insertFormula('\\Zeta ')"    title="Zeta">Ζ</button>
+			<button onclick="javascript:insertFormula('\\Eta ')"     title="Eta">Η</button>
+			<button onclick="javascript:insertFormula('\\Theta ')"   title="Theta">Θ</button>
+			<button onclick="javascript:insertFormula('\\Iota ')"    title="Iota">Ι</button>
+			<button onclick="javascript:insertFormula('\\Kappa ')"   title="Kappa">Κ</button>
+			<button onclick="javascript:insertFormula('\\Lambda ')"  title="Lambda">Λ</button>
+			<button onclick="javascript:insertFormula('\\Mu ')"      title="Mu">Μ</button>
+			<button onclick="javascript:insertFormula('\\Nu ')"      title="Nu">Ν</button>
+			<button onclick="javascript:insertFormula('\\Xi ')"      title="Xi">Ξ</button>
+			<button onclick="javascript:insertFormula('\\Pi ')"      title="Pi">Π</button>
+			<button onclick="javascript:insertFormula('\\Rho ')" 	 title="Rho">Ρ</button>
+			<button onclick="javascript:insertFormula('\\Sigma ')"   title="Sigma">Σ</button>
+			<button onclick="javascript:insertFormula('\\Tau ')"     title="Tau">Τ</button>
+			<button onclick="javascript:insertFormula('\\Upsilon ')" title="Upsilon">Υ</button>
+			<button onclick="javascript:insertFormula('\\Phi ')"     title="Phi">Φ</button>
+			<button onclick="javascript:insertFormula('\\Chi ')"     title="Chi">Χ</button>
+			<button onclick="javascript:insertFormula('\\Psi ')"     title="Psi">Ψ</button>
+			<button onclick="javascript:insertFormula('\\Omega ')"   title="Omega">Ω</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.misc"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\aleph ')"   title="aleph" class="formulaButtonShifted">ℵ</button>
+			<button onclick="javascript:insertFormula('\\hbar ')"   title="hbar" class="formulaButtonShifted">ℏ</button>
+			<button onclick="javascript:insertFormula('\\ell ')"   title="ell">ℓ</button>
+			<button onclick="javascript:insertFormula('\\wp ')"   title="wp" class="formulaButtonShifted">℘</button>
+			<button onclick="javascript:insertFormula('\\Re ')"   title="Re" class="formulaButtonShifted">ℜ</button>
+			<button onclick="javascript:insertFormula('\\Im ')"   title="Im" class="formulaButtonShifted">ℑ</button>
+			<button onclick="javascript:insertFormula('\\partial ')"   title="partial">∂</button>
+			<button onclick="javascript:insertFormula('\\infty ')"   title="infty" class="formulaButtonShifted">∞</button>
+			<button onclick="javascript:insertFormula('\\prime ')"   title="prime">′</button>
+			<button onclick="javascript:insertFormula('\\emptyset ')"   title="emptyset">∅</button>
+			<button onclick="javascript:insertFormula('\\nabla ')"   title="nabla">∇</button>
+			<button onclick="javascript:insertFormula('\\surd ')"   title="surd">√</button>
+			<button onclick="javascript:insertFormula('\\top ')"   title="top" class="formulaButtonShifted">⊤</button>
+			<button onclick="javascript:insertFormula('\\bot ')"   title="bot" class="formulaButtonShifted">⊥</button>
+			<button onclick="javascript:insertFormula('\\| ')"   title="|" class="formulaButtonShifted">∥</button>
+			<button onclick="javascript:insertFormula('\\angle ')"   title="angle" class="formulaButtonShifted">∠</button>
+			<button onclick="javascript:insertFormula('\\triangle ')"   title="triangle" class="formulaButtonShifted">△</button>
+			<button onclick="javascript:insertFormula('\\backslash ')"   title="backslash">\</button>
+			<button onclick="javascript:insertFormula('\\forall ')"   title="forall" class="formulaButtonShifted">∀</button>
+			<button onclick="javascript:insertFormula('\\exists ')"   title="exists" class="formulaButtonShifted">∃</button>
+			<button onclick="javascript:insertFormula('\\neg ')"   title="neg" class="formulaButtonShifted">¬</button>
+			<button onclick="javascript:insertFormula('\\flat ')"   title="flat" class="formulaButtonShifted">♭</button>
+			<button onclick="javascript:insertFormula('\\natural ')"   title="natural" class="formulaButtonShifted">♮</button>
+			<button onclick="javascript:insertFormula('\\sharp ')"   title="sharp">♯</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.large"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\sum ')"   title="sum">∑</button>
+			<button onclick="javascript:insertFormula('\\prod ')"   title="prod">∏</button>
+			<button onclick="javascript:insertFormula('\\coprod ')"   title="coprod" class="formulaButtonShifted">∐</button>
+			<button onclick="javascript:insertFormula('\\int ')"   title="int">∫</button>
+			<button onclick="javascript:insertFormula('\\oint ')"   title="oint" class="formulaButtonShifted">∮</button>
+			<button onclick="javascript:insertFormula('\\bigcap ')"   title="bigcap" class="formulaButtonShifted">⋂</button>
+			<button onclick="javascript:insertFormula('\\bigcup ')"   title="bigcup" class="formulaButtonShifted">⋃</button>
+			<button onclick="javascript:insertFormula('\\bigsqcup ')"   title="bigsqcup" class="formulaButtonShifted">⊔</button>
+			<button onclick="javascript:insertFormula('\\bigcirc ')"   title="bigcirc" class="formulaButtonShifted">◯</button>
+			<button onclick="javascript:insertFormula('\\bigvee ')"   title="bigvee" class="formulaButtonShifted">⋁</button>
+			<button onclick="javascript:insertFormula('\\bigwedge ')"   title="bigwedge" class="formulaButtonShifted">⋀</button>
+			<button onclick="javascript:insertFormula('\\bigtriangleup ')"   title="bigtriangleup" class="formulaButtonShifted">△</button>
+			<button onclick="javascript:insertFormula('\\bigtriangledown ')"   title="bigtriangledown" class="formulaButtonShifted">▽</button>
+			<button onclick="javascript:insertFormula('\\bigodot ')"   title="bigodot" class="formulaButtonShifted">⊙</button>
+			<button onclick="javascript:insertFormula('\\bigotimes ')"   title="bigotimes" class="formulaButtonShifted">⊗</button>
+			<button onclick="javascript:insertFormula('\\bigoplus ')"   title="bigoplus" class="formulaButtonShifted">⊕</button>
+			<button onclick="javascript:insertFormula('\\biguplus ')"   title="biguplus" class="formulaButtonShifted">⊎</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.binary"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\pm ')"   title="pm">±</button>
+			<button onclick="javascript:insertFormula('\\mp ')"   title="mp" class="formulaButtonShifted">∓</button>
+			<button onclick="javascript:insertFormula('\\setminus ')"   title="setminus" class="formulaButtonShifted">∖</button>
+			<button onclick="javascript:insertFormula('\\cdot ')"   title="cdot" class="formulaButtonShifted">⋅</button>
+			<button onclick="javascript:insertFormula('\\times ')"   title="times" class="formulaButtonShifted">×</button>
+			<button onclick="javascript:insertFormula('\\ast ')"   title="ast" class="formulaButtonShifted">∗</button>
+			<button onclick="javascript:insertFormula('\\star ')"   title="star" class="formulaButtonShifted">⋆</button>
+			<button onclick="javascript:insertFormula('\\diamond ')"   title="diamond" class="formulaButtonShifted">⋄</button>
+			<button onclick="javascript:insertFormula('\\circ ')"   title="circ" class="formulaButtonShifted">∘</button>
+			<button onclick="javascript:insertFormula('\\bullet ')"   title="bullet">∙</button>
+			<button onclick="javascript:insertFormula('\\div ')"   title="div">÷</button>
+			<button onclick="javascript:insertFormula('\\cap ')"   title="cap">∩</button>
+			<button onclick="javascript:insertFormula('\\cup ')"   title="cup" class="formulaButtonShifted">∪</button>
+			<button onclick="javascript:insertFormula('\\uplus ')"   title="uplus" class="formulaButtonShifted">⊎</button>
+			<button onclick="javascript:insertFormula('\\sqcap ')"   title="sqcap" class="formulaButtonShifted">⊓</button>
+			<button onclick="javascript:insertFormula('\\sqcup ')"   title="sqcup" class="formulaButtonShifted">⊔</button>
+			<button onclick="javascript:insertFormula('\\triangleleft ')"   title="triangleleft" class="formulaButtonShifted">◁</button>
+			<button onclick="javascript:insertFormula('\\triangleright ')"   title="triangleright" class="formulaButtonShifted">▷</button>
+			<button onclick="javascript:insertFormula('\\wr ')"   title="wr" class="formulaButtonShifted">≀</button>
+			<button onclick="javascript:insertFormula('\\vee ')"   title="vee" class="formulaButtonShifted">∨</button>
+			<button onclick="javascript:insertFormula('\\wedge ')"   title="wedge" class="formulaButtonShifted">∧</button>
+			<button onclick="javascript:insertFormula('\\oplus ')"   title="oplus" class="formulaButtonShifted">⊕</button>
+			<button onclick="javascript:insertFormula('\\ominus ')"   title="ominus" class="formulaButtonShifted">⊖</button>
+			<button onclick="javascript:insertFormula('\\otimes ')"   title="otimes" class="formulaButtonShifted">⊗</button>
+			<button onclick="javascript:insertFormula('\\oslash ')"   title="oslash" class="formulaButtonShifted">⊘</button>
+			<button onclick="javascript:insertFormula('\\odot ')"   title="odot" class="formulaButtonShifted">⊙</button>
+			<button onclick="javascript:insertFormula('\\dagger ')"   title="dagger">†</button>
+			<button onclick="javascript:insertFormula('\\ddagger ')"   title="ddagger">‡</button>
+			<button onclick="javascript:insertFormula('\\amalg ')"   title="amalg" class="formulaButtonShifted">∐</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.relations"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\leq ')" title="leq">≤</button>
+			<button onclick="javascript:insertFormula('\\geq ')" title="geq">≥</button>
+			<button onclick="javascript:insertFormula('\\prec ')" title="prec" class="formulaButtonShifted">≺</button>
+			<button onclick="javascript:insertFormula('\\succ ')" title="succ" class="formulaButtonShifted">≻</button>
+			<button onclick="javascript:insertFormula('\\preceq ')" title="preceq" class="formulaButtonShifted">≼</button>
+			<button onclick="javascript:insertFormula('\\succeq ')" title="succeq" class="formulaButtonShifted">≽</button>
+			<button onclick="javascript:insertFormula('\\ll ')" title="ll" class="formulaButtonShifted">≪</button>
+			<button onclick="javascript:insertFormula('\\gg ')" title="gg" class="formulaButtonShifted">≫</button>
+			<button onclick="javascript:insertFormula('\\equiv ')" title="equiv" class="formulaButtonShifted">≡</button>
+			<button onclick="javascript:insertFormula('\\sim ')" title="sim" class="formulaButtonShifted">∼</button>
+			<button onclick="javascript:insertFormula('\\simeq ')" title="simeq" class="formulaButtonShifted">≃</button>
+			<button onclick="javascript:insertFormula('\\asymp ')" title="asymp" class="formulaButtonShifted">≍</button>
+			<button onclick="javascript:insertFormula('\\approx ')" title="approx" class="formulaButtonShifted">≈</button>
+			<button onclick="javascript:insertFormula('\\cong ')" title="cong" class="formulaButtonShifted">≅</button>
+			<button onclick="javascript:insertFormula('\\doteq ')" title="doteq" class="formulaButtonShifted">≐</button>
+			<button onclick="javascript:insertFormula('\\subset ')" title="subset" class="formulaButtonShifted">⊂</button>
+			<button onclick="javascript:insertFormula('\\supset ')" title="supset" class="formulaButtonShifted">⊃</button>
+			<button onclick="javascript:insertFormula('\\subseteq ')" title="subseteq" class="formulaButtonShifted">⊆</button>
+			<button onclick="javascript:insertFormula('\\supseteq ')" title="supseteq" class="formulaButtonShifted">⊇</button>
+			<button onclick="javascript:insertFormula('\\sqsubseteq ')" title="sqsubseteq" class="formulaButtonShifted">⊑</button>
+			<button onclick="javascript:insertFormula('\\sqsubseteq ')" title="sqsubseteq" class="formulaButtonShifted">⊒</button>
+			<button onclick="javascript:insertFormula('\\in ')" title="in" class="formulaButtonShifted">∈</button>
+			<button onclick="javascript:insertFormula('\\ni ')" title="ni" class="formulaButtonShifted">∋</button>
+			<button onclick="javascript:insertFormula('\\vdash ')" title="vdash" class="formulaButtonShifted">⊢</button>
+			<button onclick="javascript:insertFormula('\\dashv ')" title="dashv" class="formulaButtonShifted">⊣</button>
+			<button onclick="javascript:insertFormula('\\perp ')" title="perp" class="formulaButtonShifted">⊥</button>
+			<button onclick="javascript:insertFormula('\\models ')" title="models" class="formulaButtonShifted">⊨</button>
+			<button onclick="javascript:insertFormula('\\mid ')" title="mid" class="formulaButtonShifted">∣</button>
+			<button onclick="javascript:insertFormula('\\parallel ')" title="parallel" class="formulaButtonShifted">∥</button>
+			<button onclick="javascript:insertFormula('\\bowtie ')" title="bowtie" class="formulaButtonShifted">⋈</button>
+			<button onclick="javascript:insertFormula('\\propto ')" title="propto" class="formulaButtonShifted">∝</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.negatedrelations"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\nless ')" title="nless" class="formulaButtonShifted">≮</button>
+			<button onclick="javascript:insertFormula('\\ngtr ')" title="ngtr" class="formulaButtonShifted">≯</button>
+			<button onclick="javascript:insertFormula('\\not\\leq ')" title="notleq" class="formulaButtonShifted">≰</button>
+			<button onclick="javascript:insertFormula('\\not\\geq ')" title="notgeq" class="formulaButtonShifted">≱</button>
+			<button onclick="javascript:insertFormula('\\not\\prec ')" title="notprec" class="formulaButtonShifted">⊀</button>
+			<button onclick="javascript:insertFormula('\\not\\succ ')" title="notsucc" class="formulaButtonShifted">⊁</button>
+			<button onclick="javascript:insertFormula('\\not\\preceq ')" title="notpreceq" class="formulaButtonShifted">⋠</button>
+			<button onclick="javascript:insertFormula('\\not\\succeq ')" title="not\\succeq" class="formulaButtonShifted">⋡</button>
+			<button onclick="javascript:insertFormula('\\neq ')" title="neq" class="formulaButtonShifted">≠</button>
+			<button onclick="javascript:insertFormula('\\not\\equiv ')" title="notequiv" class="formulaButtonShifted">≢</button>
+			<button onclick="javascript:insertFormula('\\not\\sim ')" title="notsim" class="formulaButtonShifted">≁</button>
+			<button onclick="javascript:insertFormula('\\not\\simeq ')" title="notsimeq" class="formulaButtonShifted">≄</button>
+			<button onclick="javascript:insertFormula('\\not\\approx ')" title="notapprox" class="formulaButtonShifted">≉</button>
+			<button onclick="javascript:insertFormula('\\not\\cong ')" title="notcong" class="formulaButtonShifted">≇</button>
+			<button onclick="javascript:insertFormula('\\not\\asymp ')" title="notasymp" class="formulaButtonShifted">≭</button>
+			<button onclick="javascript:insertFormula('\\not\\subset ')" title="notsubset" class="formulaButtonShifted">⊄</button>
+			<button onclick="javascript:insertFormula('\\not\\supset ')" title="notsupset" class="formulaButtonShifted">⊅</button>
+			<button onclick="javascript:insertFormula('\\not\\subseteq ')" title="notsubseteq" class="formulaButtonShifted">⊈</button>
+			<button onclick="javascript:insertFormula('\\not\\supseteq ')" title="notsupseteq" class="formulaButtonShifted">⊉</button>
+			<button onclick="javascript:insertFormula('\\not\\sqsubseteq ')" title="notsqsubseteq" class="formulaButtonShifted">⋢</button>
+			<button onclick="javascript:insertFormula('\\not\\sqsupseteq ')" title="notsqsupseteq" class="formulaButtonShifted">⋣</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.arrows"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\leftarrow ')" title="leftarrow" class="formulaButtonShifted">←</button>
+			<button onclick="javascript:insertFormula('\\rightarrow ')" title="rightarrow" class="formulaButtonShifted">→</button>
+			<button onclick="javascript:insertFormula('\\Leftarrow ')" title="Leftarrow" class="formulaButtonShifted">⇐</button>
+			<button onclick="javascript:insertFormula('\\Rightarrow ')" title="Rightarrow" class="formulaButtonShifted">⇒</button>
+			<button onclick="javascript:insertFormula('\\hookleftarrow ')" title="hookleftarrow" class="formulaButtonShifted">↩</button>
+			<button onclick="javascript:insertFormula('\\hookrightarrow ')" title="hookrightarrow" class="formulaButtonShifted">↪</button>
+			<button onclick="javascript:insertFormula('\\leftharpoonup ')" title="leftharpoonup" class="formulaButtonShifted">↼</button>
+			<button onclick="javascript:insertFormula('\\rightharpoonup ')" title="rightharpoonup" class="formulaButtonShifted">⇀</button>
+			<button onclick="javascript:insertFormula('\\leftharpoondown ')" title="leftharpoondown" class="formulaButtonShifted">↽</button>
+			<button onclick="javascript:insertFormula('\\rightharpoondown ')" title="rightharpoondown" class="formulaButtonShifted">⇁</button>
+			<button onclick="javascript:insertFormula('\\leftrightarrow ')" title="leftrightarrow" class="formulaButtonShifted">↔</button>
+			<button onclick="javascript:insertFormula('\\Leftrightarrow ')" title="Leftrightarrow" class="formulaButtonShifted">⇔</button>
+			<button onclick="javascript:insertFormula('\\rightleftharpoons ')" title="rightleftharpoons" class="formulaButtonShifted">⇌</button>
+			<button onclick="javascript:insertFormula('\\uparrow ')" title="uparrow" class="formulaButtonShifted">↑</button>
+			<button onclick="javascript:insertFormula('\\downarrow ')" title="downarrow" class="formulaButtonShifted">↓</button>
+			<button onclick="javascript:insertFormula('\\Uparrow ')" title="Uparrow" class="formulaButtonShifted">⇑</button>
+			<button onclick="javascript:insertFormula('\\Downarrow ')" title="Downarrow" class="formulaButtonShifted">⇓</button>
+			<button onclick="javascript:insertFormula('\\updownarrow ')" title="updownarrow" class="formulaButtonShifted">↕</button>
+			<button onclick="javascript:insertFormula('\\Updownarrow ')" title="Updownarrow" class="formulaButtonShifted">⇕</button>
+			<button onclick="javascript:insertFormula('\\nearrow ')" title="nearrow" class="formulaButtonShifted">↗</button>
+			<button onclick="javascript:insertFormula('\\searrow ')" title="searrow" class="formulaButtonShifted">↘</button>
+			<button onclick="javascript:insertFormula('\\swarrow ')" title="swarrow" class="formulaButtonShifted">↙</button>
+			<button onclick="javascript:insertFormula('\\nwarrow ')" title="nwarrow" class="formulaButtonShifted">↖</button>
+		</td>
+	</tr>
+	<tr>
+		<th><fmt:message key="ckeditor.math.combining"/></th>
+		<td>
+			<button onclick="javascript:insertFormula('\\' ')">◌́ </button>
+			<button onclick="javascript:insertFormula('\\` ')">◌̀ </button>
+			<button onclick="javascript:insertFormula('\\^ ')">◌̂ </button>
+			<button onclick="javascript:insertFormula('\\\" ')">◌̈ </button>
+			<button onclick="javascript:insertFormula('\\~ ')">◌̃ </button>
+			<button onclick="javascript:insertFormula('\\= ')">◌̄ </button>
+			<button onclick="javascript:insertFormula('\\. ')">◌̇ </button>
+			<button onclick="javascript:insertFormula('\\u ')">◌̆ </button>
+			<button onclick="javascript:insertFormula('\\v ')">◌̌ </button>
+			<button onclick="javascript:insertFormula('\\H ')">◌̋ </button>
+			<button onclick="javascript:insertFormula('\\t ')">◌͡ </button>
+			<button onclick="javascript:insertFormula('\\c ')">◌̧ </button>
+			<button onclick="javascript:insertFormula('\\d ')">◌̣ </button>
+			<button onclick="javascript:insertFormula('\\b ')">◌̱ </button>
+			<button onclick="javascript:insertFormula('\\not ')">◌̸ </button>
+		</td>
+	</tr>
+</table>
\ No newline at end of file
Index: lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
===================================================================
diff -u -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf -r662e144da0df02dfacd0f157c29bc12012cab224
--- lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp	(.../jlatexmath.jsp)	(revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf)
+++ lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp	(.../jlatexmath.jsp)	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -14,6 +14,13 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta content="noindex, nofollow" name="robots">
+	
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="buttons.css" type="text/css" media="screen" />
+	
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="buttons.js"></script>
 	<script language="javascript">
 	var CKEDITOR = window.parent.CKEDITOR;
 	var thisDialog = CKEDITOR.dialog.getCurrent();
@@ -113,56 +120,52 @@
 </head>
 
 <body>
-
+	<%@ include file="buttons.jsp" %>
+	
 	<table cellspacing="5" cellpadding="0" width="100%" border="0">
-
 	   <tr>
-		  <td width="100%">
+		  <td>
 		      <span id="JlatexmathLatexFormula"></span>
 		  </td>
+		  <td style="text-align: right;">
+	  		<span id="JlatexmathFontSize"></span>
+          	<select id="font-size" onChange="formulaTextareaChanged()">
+          		<option>8</option>
+          		<option>9</option>
+          		<option>10</option>
+          		<option>11</option>
+          		<option>12</option>
+          		<option>14</option>
+          		<option>16</option>
+          		<option>18</option>
+          		<option selected="selected">20</option>
+          		<option>22</option>
+          		<option>24</option>
+          		<option>26</option>
+          		<option>28</option>
+          		<option>36</option>
+          		<option>48</option>
+          		<option>72</option>
+          	</select>
+	      </td>
 	  </tr>
 	  
 	  <tr>
-          <td style="vertical-align: top; width: 75%">
+          <td style="vertical-align: top; width: 75%" colspan="2">
           	<textarea id="latex-formula" style="width: 100%" rows="4" cols="50" 
           		onkeyup="formulaTextareaChanged()" 
           		onChange="formulaTextareaChanged()"
           		onpaste="formulaTextareaChanged()"
           		oncut="formulaTextareaChanged()"></textarea>
 		  </td>
 	   </tr>
-	   
-		<tr>
-			<td>
-	       		<span id="JlatexmathFontSize"></span>
-	          	<select id="font-size" onChange="formulaTextareaChanged()">
-	          		<option>8</option>
-	          		<option>9</option>
-	          		<option>10</option>
-	          		<option>11</option>
-	          		<option>12</option>
-	          		<option>14</option>
-	          		<option>16</option>
-	          		<option>18</option>
-	          		<option selected="selected">20</option>
-	          		<option>22</option>
-	          		<option>24</option>
-	          		<option>26</option>
-	          		<option>28</option>
-	          		<option>36</option>
-	          		<option>48</option>
-	          		<option>72</option>
-	          	</select>
-	       </td>
-		</tr>
 
 		<tr>
 			<td>
-	       	   <img id="preview" src="" alt="">
+	       	   <img id="preview" src="" alt="" colspan="2">
 			</td>
 		</tr>
-
 	</table>
 
 </body>
-</html>
+</html>
\ No newline at end of file
Index: lams_central/web/ckeditor/plugins/jlatexmath/plugin.js
===================================================================
diff -u -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf -r662e144da0df02dfacd0f157c29bc12012cab224
--- lams_central/web/ckeditor/plugins/jlatexmath/plugin.js	(.../plugin.js)	(revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf)
+++ lams_central/web/ckeditor/plugins/jlatexmath/plugin.js	(.../plugin.js)	(revision 662e144da0df02dfacd0f157c29bc12012cab224)
@@ -1,23 +1,23 @@
 /* 
  *   CKEditior plugin.js for JLaTeXMath.
  *  ------------
- */
-CKEDITOR.plugins.add('jlatexmath', {
-	requires : ['iframedialog'],
-	lang : [ 'en' ],
-	init : function(editor) {
-	             var pluginPath = CKEDITOR.plugins.getPath('jlatexmath');
-	             
-	             editor.ui.addButton(
-	                'Jlatexmath',
+ */
+CKEDITOR.plugins.add('jlatexmath', {
+	requires : ['iframedialog'],
+	lang : [ 'en' ],
+	init : function(editor) {
+	             var pluginPath = CKEDITOR.plugins.getPath('jlatexmath');
+	             
+	             editor.ui.addButton(
+	                'Jlatexmath',
 	                {
-	                	label   : editor.lang.jlatexmath.JlatexmathBtn,
-		                command : 'Jlatexmath',
-		                icon    : pluginPath + 'icons/mathjax.png',
-		                title   : editor.lang.jlatexmath.JlatexmathTooltip
-	                }
-	             );
-
+	                	label   : editor.lang.jlatexmath.JlatexmathBtn,
+		                command : 'Jlatexmath',
+		                icon    : pluginPath + 'icons/mathjax.png',
+		                title   : editor.lang.jlatexmath.JlatexmathTooltip
+	                }
+	             );
+
 	             editor.addCommand(
 	            	'Jlatexmath', 
 	                 {
@@ -26,13 +26,13 @@
 	                  	}
 	                 }
 	             );
-	             
-	             CKEDITOR.dialog.addIframe(
-	            	'Jlatexmath',
-	            	editor.lang.jlatexmath.DlgJlatexmathTitle,
-	                pluginPath + 'jlatexmath.jsp',
-	                450,
-	                260
+	             
+	             CKEDITOR.dialog.addIframe(
+	            	'Jlatexmath',
+	            	editor.lang.jlatexmath.DlgJlatexmathTitle,
+	                pluginPath + 'jlatexmath.jsp',
+	                1050,
+	                635
 	             );
 	             
 	 			editor.on( 
@@ -54,6 +54,6 @@
 	 				null, 
 	 				1
 	 			);
-
-	}
+
+	}
 });
\ No newline at end of file