--- loncom/html/res/adm/pages/reactionresponse/reaction_editor.html	2004/07/02 09:33:30	1.7
+++ loncom/html/res/adm/pages/reactionresponse/reaction_editor.html	2006/11/20 20:33:30	1.11
@@ -1,7 +1,7 @@
 <!-- Chemical reaction editor developed by Guy Ashkenazi, guy@fh.huji.ac.il-->
 
 <!--
- $Id: reaction_editor.html,v 1.7 2004/07/02 09:33:30 albertel Exp $
+ $Id: reaction_editor.html,v 1.11 2006/11/20 20:33:30 albertel Exp $
 
  Copyright Michigan State University Board of Trustees
 
@@ -35,15 +35,7 @@ var reaction;
 var field
 </script>
 <!-- parsed by LON-CAPA to get the correct symbol for the arrow -->
-<display>
-return '<script type="text/javascript">
-          var rightarrow=\''.&xmlparse('<m>$\rightarrow$</m>').'\';
-	  var reaction=\''.&EXT('query.reaction').'\';
-	  var field=\''.&EXT('query.field').'\';
-	  var id=\''.&EXT('query.id').'\';
-        </script>';
-</display>
-<script language="JavaScript">
+<script type="text/javascript">
 
 var level;
 var reactants;
@@ -135,17 +127,15 @@ function to_html(string) {
     reaction += html_component(reactants[i]);
     reaction += " + ";
   }
-  if (i < reactants.length)
-    reaction += html_component(reactants[i]);
+  reaction += html_component(reactants[i]);
 
   if (products.length > 0) {
-    reaction += "+rightarrow+";
+    reaction += " "+rightarrow+" ";
     for (i = 0; i < products.length-1; i++) {
       reaction += html_component(products[i]);
       reaction += " + ";
     }
-    if (i < products.length)
-      reaction += html_component(products[i]);
+    reaction += html_component(products[i]);
   }
 
   return reaction;
@@ -154,12 +144,12 @@ function to_html(string) {
 function html_component(string) {
   var reactant = "";
   var i = 0;
-  level = 0;
+  level = -1;
 
-  for (;string.substring(i,i+1) == ' ';i++)
-    ;
-  for (;isDigit(string.substring(i,i+1));i++)
-    reactant += string.substring(i,i+1);
+  var hydrate = string.split('.');
+  if (hydrate.length > 1) 
+    return html_component(hydrate[0]) + "&middot;" + html_component(hydrate[1]);
+      
   for (;i < string.length;i++)
     reactant +=  html_char(string.substring(i,i+1));
 
@@ -167,6 +157,14 @@ function html_component(string) {
 }
 
 function html_char(chr) {
+  if (level == -1) { // stoichiometric coefficient
+    if (isDigit(chr) || chr == '/')
+      return chr;
+    if (chr == ' ')
+      return "";
+    else
+      level = 0;
+  }
   if (level == 0) { // baseline
     if (isDigit(chr))
       return chr.sub();
@@ -174,19 +172,25 @@ function html_char(chr) {
       level = 1;
       return "";
     }
-    if (chr == '+') // baseline or superscript
+    if (chr == '+') // baseline or superscript?
       return "?";
     if (chr == ' ')
       return "";
+    if (chr == '(' || chr == '|') // coefficient
+      level = -1;
     return chr;
   }
   if (level == 1) { // superscript
     if (isDigit(chr))
       return chr.sup();
-    if (chr == '+' || chr == '-') {
+    if (chr == '+') {
       level = 0;
       return chr.sup();
     }
+    if (chr == '-') {
+      level = 0;
+      return "<sup>&minus;</sup>";
+    } 
     if (chr == ' ') {
       level = 0;
       return "";
@@ -251,6 +255,15 @@ function getCookie(document,name) {
 </head>
 
 <body bgcolor="#ffffff" onLoad = "javascript:setup();">
+<display>
+return '<script type="text/javascript">
+          var rightarrow=\''.&xmlparse('<m>$\rightarrow$</m>').'\';
+	  var reaction=\''.&EXT('query.reaction').'\';
+	  var field=\''.&EXT('query.field').'\';
+	  var id=\''.&EXT('query.id').'\';
+        </script>';
+</display>
+
 <center>
 <hr />
 <form name="form">
