debian release 0.0.4-2:

[helm.git] / helm / DEVEL / mathml_editor / src / TPushParser.cc

diff --git a/helm/DEVEL/mathml_editor/src/TPushParser.cc b/helm/DEVEL/mathml_editor/src/TPushParser.cc
index ad439908c66a036dd5d0767901ace9c8ba39b477..863ca7bb06e4e1bfb2e956036605e31ee76b7a87 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TPushParser.cc
+++ b/helm/DEVEL/mathml_editor/src/TPushParser.cc
@@ -1,3 +1,27 @@
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
+ * 
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
+ */
 
 #include "ALogger.hh"
 #include "TPushParser.hh"
@@ -36,12 +60,21 @@ TPushParser::reset()
   if (factory) factory->documentModified(doc);
 }
 
-std::string
-TPushParser::PRIME() const
+TNode
+TPushParser::PRIME()
 {
   const TDictionary::Entry entry = dictionary.find("prime");
-  if (entry.cls == TDictionary::OPERATOR) return entry.value;
-  else return "?";
+  if (entry.cls == TDictionary::OPERATOR)
+    {
+      TNode op = doc.createO(entry.value, nextId++);
+      op["name"] = "prime";
+      return op;
+    }
+  else
+    {
+      TNode op = doc.createO("?", nextId++);
+      return op;
+    }
 }
 
 bool
@@ -433,7 +466,7 @@ bool
 TPushParser::isPrimes(const TNode& node) const
 {
   assert(node);
-  return node.isG() && node.last() && node.last().is("o") && node.last()["val"] == PRIME();
+  return node.isG() && node.last() && node.last().is("o") && node.last()["name"] == "prime";
 }
 
 bool
@@ -445,14 +478,14 @@ TPushParser::do_apostrophe()
        {
          if (prev.isSp() && prev[1] && isPrimes(prev[1]))
            {
-             prev[1].append(doc.createO(PRIME(), nextId++));
+             prev[1].append(PRIME());
              return true;
            }
          else if (prev.isSb() && prev[0] &&
                   prev[0].isSp() && prev[0][1] &&
                   isPrimes(prev[0][1]))
            {
-             prev[0][1].append(doc.createO(PRIME(), nextId++));
+             prev[0][1].append(PRIME());
              return true;
            }
          else
@@ -462,7 +495,7 @@ TPushParser::do_apostrophe()
              prev.replace(elem);
              elem.append(prev);
              elem.append(g);
-             g.append(doc.createO(PRIME(), nextId++));
+             g.append(PRIME());
              return true;
            }
        }