X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Fmathml_editor%2Fsrc%2FCMathMLFactoryXSLT.cc;h=8884520308d2b24edef48811edf5749a5a87b238;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=21f0450e9da1cbbabeb9dda2c2e701cb78547894;hpb=d195deff022235dcb39cc4d5865f5bd3c8d3ca07;p=helm.git

diff --git a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
index 21f0450e9..888452030 100644
--- a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
+++ b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
@@ -1,33 +1,35 @@
-/* Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
- *                    2003, Paolo Marinelli <pmarinel@cs.unibo.it>.
- *
- * This file is part of EdiTeX, an editor of mathematical
- * expressions based on TeX syntax
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
  * 
- * EdiTeX is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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.
  *
- * EdiTeX is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with EdiTeX; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- * 
- * For details, see the EdiTeX World-Wide-Web page,
- * http://helm.cs.unibo.it/editex, or send a mail to
- * <luca.padovani@cs.unibo.it>
+ * 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 "dom.hh"
 #include "TNode.hh"
+#include "ALogger.hh"
 #include "TDocument.hh"
 #include "CMathMLFactoryXSLT.hh"
 #include "AMathMLConsumer.hh"
+#include <cassert>
 
 CMathMLFactoryXSLT::CMathMLFactoryXSLT(ALogger& l, const DOMX::XSLTStylesheet& s)
   : AMathMLFactory(l), style(s)
@@ -37,6 +39,7 @@ CMathMLFactoryXSLT::CMathMLFactoryXSLT(ALogger& l, const DOMX::XSLTStylesheet& s
   result = di.createDocument(MATHML_NS_URI, "m:math", dt);
 }
 
+#if 1
 void
 CMathMLFactoryXSLT::documentModified(TDocument& doc)
 {
@@ -47,23 +50,72 @@ CMathMLFactoryXSLT::documentModified(TDocument& doc)
 				       DOM::GdomeString("'" + std::string(dirty["id"]) + "'")));
   DOM::Document res = style.apply(doc.document(), dirtyId);
   assert(res);
-  style.save(doc.document(), stdout);
-
-  DOM::Element root = res.get_documentElement();
-  assert(root);
+  //style.save(doc.document(), stdout);
 
-  if (result.get_documentElement().hasAttribute("xref"))
+  if (DOM::Element wrapper = res.get_documentElement())
     {
-      bool ok = subst(result.get_documentElement(), root.getAttribute("xref"), result.importNode(root, true));
-      assert(ok);
+      if (DOM::Element root = wrapper.get_firstChild())
+	if (DOM::Element oldRoot = result.get_documentElement().get_firstChild())
+	  {
+	    bool ok = subst(oldRoot, root.getAttribute("xref"), result.importNode(root, true));
+	    assert(ok);
+	    doc.clearDirty();
+	  }
+	else
+	  {
+	    result.get_documentElement().appendChild(result.importNode(root, true));
+	  }
     }
   else
-    result.replaceChild(result.importNode(root, true), result.get_documentElement());
+    {
+      // Something wrong happened while applying the stylesheet.
+      DOM::Element root = result.get_documentElement();
+      DOM::Node p = root.get_firstChild();
+      while (p) {
+	DOM::Node next = p.get_nextSibling();
+	root.removeChild(p);
+	p = next;
+      }
+      logger.error("The stylesheet produced an empty document");
+    }
+
+  //style.save(result, stdout);
+}
+#else
+void
+CMathMLFactoryXSLT::documentModified(TDocument& doc)
+{
+  DOM::Document res = style.apply(doc.document());
+  assert(res);
 
-  style.save(result, stdout);
+  if (DOM::Element root = res.get_documentElement())
+    {
+      DOM::Element newRoot = root.get_firstChild();
+      assert(newRoot);
 
-  doc.clearDirty();
+      if (DOM::Element oldSubRoot = result.get_documentElement().get_firstChild())
+        {
+	  result.get_documentElement().replaceChild(result.importNode(newRoot, true), oldSubRoot);
+        }
+      else
+	{
+	  result.get_documentElement().appendChild(result.importNode(newRoot, true));
+	}
+    }
+  else
+    {
+      // Something wrong happened while applying the stylesheet.
+      DOM::Element root = result.get_documentElement();
+      DOM::Node p = root.get_firstChild();
+      while (p) {
+	DOM::Node next = p.get_nextSibling();
+	root.removeChild(p);
+	p = next;
+      }
+      logger.error("The stylesheet produced an empty document");
+    }
 }
+#endif
 
 bool
 CMathMLFactoryXSLT::subst(const DOM::Element& e1, const DOM::GdomeString& id, const DOM::Element& e2)