[Qtitools-commits] SF.net SVN: qtitools:[2438] Mathqurate/trunk/mathqurate

[<lo...@us...>]

Revision: 2438
          http://qtitools.svn.sourceforge.net/qtitools/?rev=2438&view=rev
Author:   loccy
Date:     2010-04-09 08:00:17 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
MQ: Migrating to latest version of SnuggleTex - thanks to Dave Mc for the patch.

Modified Paths:
--------------
    Mathqurate/trunk/mathqurate/pom.xml
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java

Modified: Mathqurate/trunk/mathqurate/pom.xml
===================================================================
--- Mathqurate/trunk/mathqurate/pom.xml	2010-04-08 16:40:06 UTC (rev 2437)
+++ Mathqurate/trunk/mathqurate/pom.xml	2010-04-09 08:00:17 UTC (rev 2438)
@@ -388,23 +388,23 @@
 		<!-- snuggle -->
 		<dependency>
 			<groupId>org.qtitools.mathassess</groupId>
-			<artifactId>MathAssessTools</artifactId>
-			<version>1.1-RELEASE</version>
+			<artifactId>MathAssessTools-Authoring</artifactId>
+			<version>1.3.0</version>
 		</dependency>
 	    <dependency>
 	      <groupId>uk.ac.ed.ph.snuggletex</groupId>
 	      <artifactId>snuggletex-core</artifactId>
-	      <version>1.1.0</version>
+	      <version>1.2.1</version>
 	    </dependency>
 		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>saxon9</artifactId>
-			<version>9.1.0.6</version>
+			<version>9.1.0.8</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>saxon9-dom</artifactId>
-			<version>9.1.0.6</version>
+			<version>9.1.0.8</version>
 		</dependency>		
 		<!-- mathqurate -->
 		<dependency>

Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java	2010-04-08 16:40:06 UTC (rev 2437)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SnuggleTeXView.java	2010-04-09 08:00:17 UTC (rev 2438)
@@ -64,16 +64,16 @@
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.qtitools.mathassess.tools.authoring.AuthoringGlobals;
+import org.qtitools.mathassess.tools.authoring.MathAssessPackageDefinitions;
 import org.qtitools.mathqurate.controller.DefaultController;
 import org.qtitools.mathqurate.model.MQMath;
 import org.w3._1998.math.mathml.MathType;
 
-import uk.ac.ed.ph.snuggletex.DOMOutputOptions;
 import uk.ac.ed.ph.snuggletex.InputError;
 import uk.ac.ed.ph.snuggletex.SnuggleEngine;
 import uk.ac.ed.ph.snuggletex.SnuggleInput;
 import uk.ac.ed.ph.snuggletex.SnuggleSession;
+import uk.ac.ed.ph.snuggletex.XMLStringOutputOptions;
 import uk.ac.ed.ph.snuggletex.utilities.MessageFormatter;
 
 /**
@@ -165,7 +165,7 @@
 	private SnuggleSession session1 = null;
 	
 	/** The options. */
-	private DOMOutputOptions options = null;
+	private XMLStringOutputOptions options = null;
 	
 	/** The math helper. */
 	private MQMath mathHelper;
@@ -194,12 +194,11 @@
 		
 		engine = new SnuggleEngine();
 
-		options = new DOMOutputOptions();
+		options = new XMLStringOutputOptions();
 		options.setMathMLPrefix("m");
 		options.setPrefixingMathML(true);
-		options.setAddingMathAnnotations(true);
-		engine.registerDefinitions(AuthoringGlobals.getSnuggleTeXDefinitionMap());
-		
+		options.setAddingMathSourceAnnotations(true);
+		MathAssessPackageDefinitions.addMathAssessSupport(engine);
 	}
 
 	/* (non-Javadoc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.