From: Richard Heck <rgheck@comcast.net>
Date: Thu, 12 May 2011 13:32:19 +0000 (+0000)
Subject: Make sure we do not crash here in release mode.
X-Git-Tag: 2.0.1~311
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8b9cf6dbfea3a4cd03c649e04a83a73d86d31744;p=features.git

Make sure we do not crash here in release mode.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38721 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index 90937619bf..2a00e1c573 100644
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -22,6 +22,7 @@
 #include "MetricsInfo.h"
 #include "TextPainter.h"
 
+#include "support/lassert.h"
 #include "frontends/Painter.h"
 
 using namespace std;
@@ -366,23 +367,32 @@ bool InsetMathFrac::extraBraces() const
 }
 
 
-// FIXME This will crash on unitone and is wrong in other cases.
 void InsetMathFrac::maple(MapleStream & os) const
 {
+	if (nargs() != 2) {
+		// Someone who knows about maple should fix this.
+		LASSERT(false, return);
+	}
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-// FIXME This will crash on unitone and is wrong in other cases.
 void InsetMathFrac::mathematica(MathematicaStream & os) const
 {
+	if (nargs() != 2) {
+		// Someone who knows about mathematica should fix this.
+		LASSERT(false, return);
+	}
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-// FIXME This will crash on unitone and is wrong in other cases.
 void InsetMathFrac::octave(OctaveStream & os) const
 {
+	if (nargs() != 2) {
+		// Someone who knows about octave should fix this.
+		LASSERT(false, return);
+	}
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
diff --git a/status.20x b/status.20x
index ce2a61f462..96daefedc8 100644
--- a/status.20x
+++ b/status.20x
@@ -28,6 +28,8 @@ What's new
   except on Windows, where 30 minutes are allowed. This is because the Windows
   installer may trigger MiKTeX updates that suffer from network latencies.
 
+- Improved XHTML output of various fractions.
+
 
 * USER INTERFACE
 
@@ -52,9 +54,8 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-- Fixed crash when outputing the unitone command to XHTML.
-
-- Improved XHTML output of various fractions.
+- Fixed crash when outputing the unitone command to XHTML or when using
+  such commands with mathematica, octave, or maple.
 
 - Fix output of decimally aligned columns in unviewed (on screen) tables.
 
@@ -74,6 +75,7 @@ What's new
   a document containing aligned and other multi-cell environments
   (bug ##7549).
 
+
 * USER INTERFACE
 
 - Fix crash relating to outliner and mouse movement.