From: André Pönitz <poenitz@gmx.net>
Date: Fri, 14 Feb 2003 14:30:09 +0000 (+0000)
Subject: make naming a bit saner...
X-Git-Tag: 1.6.10~17521
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c9e78a825bd659ddb7b4b55a6adfa7f0a1a98dd6;p=lyx.git

make naming a bit saner...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6150 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index d1761a326f..83e756a574 100644
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -105,9 +105,9 @@ void MathArrayInset::normalize(NormalStream & os) const
 }
 
 
-void MathArrayInset::maplize(MapleStream & os) const
+void MathArrayInset::maple(MapleStream & os) const
 {
 	os << "array(";
-	MathGridInset::maplize(os);
+	MathGridInset::maple(os);
 	os << ')';
 }
diff --git a/src/mathed/math_arrayinset.h b/src/mathed/math_arrayinset.h
index a39c120d7a..10fe6146c5 100644
--- a/src/mathed/math_arrayinset.h
+++ b/src/mathed/math_arrayinset.h
@@ -40,7 +40,7 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 
 private:
 	///
diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C
index 1038717336..0bb24a6e05 100644
--- a/src/mathed/math_braceinset.C
+++ b/src/mathed/math_braceinset.C
@@ -62,13 +62,13 @@ void MathBraceInset::normalize(NormalStream & os) const
 }
 
 
-void MathBraceInset::maplize(MapleStream & os) const
+void MathBraceInset::maple(MapleStream & os) const
 {
 	os << cell(0);
 }
 
 
-void MathBraceInset::octavize(OctaveStream & os) const
+void MathBraceInset::octave(OctaveStream & os) const
 {
 	os << cell(0);
 }
@@ -80,7 +80,7 @@ void MathBraceInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathBraceInset::mathematicize(MathematicaStream & os) const
+void MathBraceInset::mathematica(MathematicaStream & os) const
 {
 	os << cell(0);
 }
diff --git a/src/mathed/math_braceinset.h b/src/mathed/math_braceinset.h
index 7cad01f07d..133ee5e8a0 100644
--- a/src/mathed/math_braceinset.h
+++ b/src/mathed/math_braceinset.h
@@ -30,11 +30,11 @@ public:
 	/// write normalized content
 	void normalize(NormalStream & ns) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C
index 78b7b11ddc..5d992788c1 100644
--- a/src/mathed/math_casesinset.C
+++ b/src/mathed/math_casesinset.C
@@ -53,10 +53,10 @@ void MathCasesInset::normalize(NormalStream & os) const
 }
 
 
-void MathCasesInset::maplize(MapleStream & os) const
+void MathCasesInset::maple(MapleStream & os) const
 {
 	os << "cases(";
-	MathGridInset::maplize(os);
+	MathGridInset::maple(os);
 	os << ')';
 }
 
diff --git a/src/mathed/math_casesinset.h b/src/mathed/math_casesinset.h
index d8ff0b4710..ebd27bf31b 100644
--- a/src/mathed/math_casesinset.h
+++ b/src/mathed/math_casesinset.h
@@ -22,7 +22,7 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
 	void write(WriteStream & os) const;
 };
diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 2026140387..b7e49f6c73 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -139,7 +139,7 @@ void MathCharInset::normalize(NormalStream & os) const
 }
 
 
-void MathCharInset::octavize(OctaveStream & os) const
+void MathCharInset::octave(OctaveStream & os) const
 {
 	os << char_;
 }
diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 8c07f30207..3673ba15c5 100644
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -30,7 +30,7 @@ public:
 	///
 	void normalize(NormalStream & ns) const;
 	///
-	void octavize(OctaveStream & os) const;
+	void octave(OctaveStream & os) const;
 	/// identifies Charinsets
 	MathCharInset const * asCharInset() const { return this; }
 	///
diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C
index e554fae3b1..929b544e57 100644
--- a/src/mathed/math_commentinset.C
+++ b/src/mathed/math_commentinset.C
@@ -59,17 +59,17 @@ void MathCommentInset::write(WriteStream & os) const
 }
 
 
-void MathCommentInset::maplize(MapleStream & os) const
+void MathCommentInset::maple(MapleStream & os) const
 {
 	os << '#' << cell(0) << "\n";
 }
 
 
-void MathCommentInset::mathematicize(MathematicaStream &) const
+void MathCommentInset::mathematica(MathematicaStream &) const
 {}
 
 
-void MathCommentInset::octavize(OctaveStream &) const
+void MathCommentInset::octave(OctaveStream &) const
 {}
 
 
diff --git a/src/mathed/math_commentinset.h b/src/mathed/math_commentinset.h
index b2806600ac..e4827c89e1 100644
--- a/src/mathed/math_commentinset.h
+++ b/src/mathed/math_commentinset.h
@@ -33,11 +33,11 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 9cb7570798..bb7dbce5e9 100644
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -126,7 +126,7 @@ bool MathDelimInset::isAbs() const
 }
 
 
-void MathDelimInset::maplize(MapleStream & os) const
+void MathDelimInset::maple(MapleStream & os) const
 {
 	if (isAbs()) {
 		if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -138,7 +138,7 @@ void MathDelimInset::maplize(MapleStream & os) const
 		os << left_ << cell(0) << right_;
 }
 
-void MathDelimInset::maximize(MaximaStream & os) const
+void MathDelimInset::maxima(MaximaStream & os) const
 {
 	if (isAbs()) {
 		if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -151,7 +151,7 @@ void MathDelimInset::maximize(MaximaStream & os) const
 }
 
 
-void MathDelimInset::mathematicize(MathematicaStream & os) const
+void MathDelimInset::mathematica(MathematicaStream & os) const
 {
 	if (isAbs()) {
 		if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -171,7 +171,7 @@ void MathDelimInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathDelimInset::octavize(OctaveStream & os) const
+void MathDelimInset::octave(OctaveStream & os) const
 {
 	if (isAbs())
 		os << "det(" << cell(0) << ')';
diff --git a/src/mathed/math_deliminset.h b/src/mathed/math_deliminset.h
index d662896b4e..8c1feef1ed 100644
--- a/src/mathed/math_deliminset.h
+++ b/src/mathed/math_deliminset.h
@@ -40,15 +40,15 @@ public:
 	/// write normalized content
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void maximize(MaximaStream &) const;
+	void maxima(MaximaStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	string left_;
 	///
diff --git a/src/mathed/math_diffinset.C b/src/mathed/math_diffinset.C
index c6bfc89990..d872157586 100644
--- a/src/mathed/math_diffinset.C
+++ b/src/mathed/math_diffinset.C
@@ -44,7 +44,7 @@ void MathDiffInset::draw(MathPainterInfo &, int, int) const
 }
 
 
-void MathDiffInset::maplize(MapleStream & os) const
+void MathDiffInset::maple(MapleStream & os) const
 {
 	os << "diff(";
 	for (idx_type idx = 0; idx < nargs(); ++idx) {
@@ -56,7 +56,7 @@ void MathDiffInset::maplize(MapleStream & os) const
 }
 
 
-void MathDiffInset::mathematicize(MathematicaStream & os) const
+void MathDiffInset::mathematica(MathematicaStream & os) const
 {
 	os << "Dt[";
 	for (idx_type idx = 0; idx < nargs(); ++idx) {
diff --git a/src/mathed/math_diffinset.h b/src/mathed/math_diffinset.h
index d51d3a271e..651a60d67b 100644
--- a/src/mathed/math_diffinset.h
+++ b/src/mathed/math_diffinset.h
@@ -24,9 +24,9 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_exfuncinset.C b/src/mathed/math_exfuncinset.C
index 7e8e70eed3..e0b6e1c049 100644
--- a/src/mathed/math_exfuncinset.C
+++ b/src/mathed/math_exfuncinset.C
@@ -43,7 +43,7 @@ string MathExFuncInset::name() const
 }
 
 
-void MathExFuncInset::maplize(MapleStream & os) const
+void MathExFuncInset::maple(MapleStream & os) const
 {
 	if (name_ == "det")
 		os << "linalg[det](" << cell(0) << ')';
@@ -52,7 +52,7 @@ void MathExFuncInset::maplize(MapleStream & os) const
 }
 
 
-void MathExFuncInset::maximize(MaximaStream & os) const
+void MathExFuncInset::maxima(MaximaStream & os) const
 {
 	if (name_ == "det")
 		os << "determinant(" << cell(0) << ')';
@@ -83,7 +83,7 @@ string asMathematicaName(string const & name)
 }
 
 
-void MathExFuncInset::mathematicize(MathematicaStream & os) const
+void MathExFuncInset::mathematica(MathematicaStream & os) const
 {
 	os << asMathematicaName(name_) << '[' << cell(0) << ']';
 }
@@ -95,7 +95,7 @@ void MathExFuncInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathExFuncInset::octavize(OctaveStream & os) const
+void MathExFuncInset::octave(OctaveStream & os) const
 {
 	os << name_ << '(' << cell(0) << ')';
 }
diff --git a/src/mathed/math_exfuncinset.h b/src/mathed/math_exfuncinset.h
index 400a29b984..1e0b04d9c6 100644
--- a/src/mathed/math_exfuncinset.h
+++ b/src/mathed/math_exfuncinset.h
@@ -24,15 +24,15 @@ public:
 	string name() const;
 
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void maximize(MaximaStream &) const;
+	void maxima(MaximaStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 
 private:
 	///
diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index 9a0da76e7c..4cdf247e41 100644
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -60,7 +60,7 @@ void MathExIntInset::draw(MathPainterInfo &, int, int) const
 }
 
 
-void MathExIntInset::maplize(MapleStream & os) const
+void MathExIntInset::maple(MapleStream & os) const
 {
 	os << symbol_ << '(';
 	if (cell(0).size())
@@ -74,7 +74,7 @@ void MathExIntInset::maplize(MapleStream & os) const
 }
 
 
-void MathExIntInset::maximize(MaximaStream & os) const
+void MathExIntInset::maxima(MaximaStream & os) const
 {
 	if ( symbol_ == "int" )
 		os << "integrate(";
@@ -91,7 +91,7 @@ void MathExIntInset::maximize(MaximaStream & os) const
 		os << cell(1) << ')';
 }
 
-void MathExIntInset::mathematicize(MathematicaStream & os) const
+void MathExIntInset::mathematica(MathematicaStream & os) const
 {
 	if ( symbol_ == "int" )
 		os << "Integrate[";
diff --git a/src/mathed/math_exintinset.h b/src/mathed/math_exintinset.h
index f2fd46568f..71aefb4607 100644
--- a/src/mathed/math_exintinset.h
+++ b/src/mathed/math_exintinset.h
@@ -25,11 +25,11 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maximize(MaximaStream &) const;
+	void maxima(MaximaStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index c7c62c2b46..c122716678 100644
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -820,39 +820,39 @@ void normalize(MathArray const & ar, NormalStream & os)
 }
 
 
-void octavize(MathArray const & dat, OctaveStream & os)
+void octave(MathArray const & dat, OctaveStream & os)
 {
 	MathArray ar = dat;
 	extractStructure(ar);
 	for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
-		(*it)->octavize(os);
+		(*it)->octave(os);
 }
 
 
-void maplize(MathArray const & dat, MapleStream & os)
+void maple(MathArray const & dat, MapleStream & os)
 {
 	MathArray ar = dat;
 	extractStructure(ar);
 	for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
-		(*it)->maplize(os);
+		(*it)->maple(os);
 }
 
 
-void maximize(MathArray const & dat, MaximaStream & os)
+void maxima(MathArray const & dat, MaximaStream & os)
 {
 	MathArray ar = dat;
 	extractStructure(ar);
 	for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
-		(*it)->maximize(os);
+		(*it)->maxima(os);
 }
 
 
-void mathematicize(MathArray const & dat, MathematicaStream & os)
+void mathematica(MathArray const & dat, MathematicaStream & os)
 {
 	MathArray ar = dat;
 	extractStructure(ar);
 	for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
-		(*it)->mathematicize(os);
+		(*it)->mathematica(os);
 }
 
 
diff --git a/src/mathed/math_extern.h b/src/mathed/math_extern.h
index 7517d73c6b..94406652d0 100644
--- a/src/mathed/math_extern.h
+++ b/src/mathed/math_extern.h
@@ -15,11 +15,11 @@ class MathArray;
 
 void write(MathArray const &, WriteStream &);
 void normalize(MathArray const &, NormalStream &);
-void maplize(MathArray const &, MapleStream &);
-void maximize(MathArray const &, MaximaStream &);
-void mathematicize(MathArray const &, MathematicaStream &);
+void maple(MathArray const &, MapleStream &);
+void maxima(MathArray const &, MaximaStream &);
+void mathematica(MathArray const &, MathematicaStream &);
 void mathmlize(MathArray const &, MathMLStream &);
-void octavize(MathArray const &, OctaveStream &);
+void octave(MathArray const &, OctaveStream &);
 
 bool extractNumber(MathArray const & ar, int & i);
 bool extractNumber(MathArray const & ar, double & i);
diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index b036d12c5b..ec0517161d 100644
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -89,19 +89,19 @@ string MathFracInset::name() const
 }
 
 
-void MathFracInset::maplize(MapleStream & os) const
+void MathFracInset::maple(MapleStream & os) const
 {
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::mathematicize(MathematicaStream & os) const
+void MathFracInset::mathematica(MathematicaStream & os) const
 {
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::octavize(OctaveStream & os) const
+void MathFracInset::octave(OctaveStream & os) const
 {
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
diff --git a/src/mathed/math_fracinset.h b/src/mathed/math_fracinset.h
index 42f9588b76..53ec035ca6 100644
--- a/src/mathed/math_fracinset.h
+++ b/src/mathed/math_fracinset.h
@@ -34,11 +34,11 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 public:
diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index c4de2a27ea..29e8c9afc7 100644
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -203,11 +203,11 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	//void maplize(MapleStream &) const;
+	//void maple(MapleStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	//void octavize(OctaveStream &) const;
+	//void octave(OctaveStream &) const;
 
 protected:
 	/// returns x offset of cell compared to inset
diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index d3a34b39d0..47a1c3d82c 100644
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -207,28 +207,28 @@ void MathInset::normalize(NormalStream & os) const
 }
 
 
-void MathInset::octavize(OctaveStream & os) const
+void MathInset::octave(OctaveStream & os) const
 {
 	NormalStream ns(os.os());
 	normalize(ns);
 }
 
 
-void MathInset::maplize(MapleStream & os) const
+void MathInset::maple(MapleStream & os) const
 {
 	NormalStream ns(os.os());
 	normalize(ns);
 }
 
 
-void MathInset::maximize(MaximaStream & os) const
+void MathInset::maxima(MaximaStream & os) const
 {
 	MapleStream ns(os.os());
-	maplize(ns);
+	maple(ns);
 }
 
 
-void MathInset::mathematicize(MathematicaStream & os) const
+void MathInset::mathematica(MathematicaStream & os) const
 {
 	NormalStream ns(os.os());
 	normalize(ns);
diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index faae6e2ce2..0ca35c6107 100644
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -270,15 +270,15 @@ public:
 	/// write normalized content
 	virtual void normalize(NormalStream &) const;
 	/// write content as something readable by Maple
-	virtual void maplize(MapleStream &) const;
+	virtual void maple(MapleStream &) const;
 	/// write content as something readable by Maxima
-	virtual void maximize(MaximaStream &) const;
+	virtual void maxima(MaximaStream &) const;
 	/// write content as something readable by Mathematica
-	virtual void mathematicize(MathematicaStream &) const;
+	virtual void mathematica(MathematicaStream &) const;
 	/// write content as something resembling MathML
 	virtual void mathmlize(MathMLStream &) const;
 	/// write content as something readable by Octave
-	virtual void octavize(OctaveStream &) const;
+	virtual void octave(OctaveStream &) const;
 	/// describe content if cursor inside
 	virtual void infoize(std::ostream &) const {}
 	/// describe content if cursor behind
diff --git a/src/mathed/math_liminset.C b/src/mathed/math_liminset.C
index 252c99a32b..6330df80bb 100644
--- a/src/mathed/math_liminset.C
+++ b/src/mathed/math_liminset.C
@@ -40,13 +40,13 @@ void MathLimInset::draw(MathPainterInfo &, int, int) const
 }
 
 
-void MathLimInset::maplize(MapleStream & os) const
+void MathLimInset::maple(MapleStream & os) const
 {
 	os << "limit(" << cell(0) << ',' << cell(1) << '=' << cell(2) << ')';
 }
 
 
-void MathLimInset::mathematicize(MathematicaStream & os) const
+void MathLimInset::mathematica(MathematicaStream & os) const
 {
 	os << "Lim[" << cell(0) << ',' << cell(1) << ',' << cell(2) << ']';
 }
diff --git a/src/mathed/math_liminset.h b/src/mathed/math_liminset.h
index 18dc36d6d6..2016e6effa 100644
--- a/src/mathed/math_liminset.h
+++ b/src/mathed/math_liminset.h
@@ -22,9 +22,9 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index a1c8b6c337..faaa701158 100644
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -194,10 +194,10 @@ void MathMacro::validate(LaTeXFeatures & features) const
 }
 
 
-void MathMacro::maplize(MapleStream & os) const
+void MathMacro::maple(MapleStream & os) const
 {
 	updateExpansion();
-	::maplize(expanded_, os);
+	::maple(expanded_, os);
 }
 
 
@@ -208,10 +208,10 @@ void MathMacro::mathmlize(MathMLStream & os) const
 }
 
 
-void MathMacro::octavize(OctaveStream & os) const
+void MathMacro::octave(OctaveStream & os) const
 {
 	updateExpansion();
-	::octavize(expanded_, os);
+	::octave(expanded_, os);
 }
 
 
diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 1e0923026d..ac9f3c497c 100644
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -62,11 +62,11 @@ public:
 	bool match(MathAtom const &) const { return false; }
 
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void infoize(std::ostream &) const;
 	///
diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/math_mathmlstream.C
index a412a217c1..8a226ac17f 100644
--- a/src/mathed/math_mathmlstream.C
+++ b/src/mathed/math_mathmlstream.C
@@ -175,14 +175,14 @@ void MathMLStream::cr()
 
 MapleStream & operator<<(MapleStream & ms, MathAtom const & at)
 {
-	at->maplize(ms);
+	at->maple(ms);
 	return ms;
 }
 
 
 MapleStream & operator<<(MapleStream & ms, MathArray const & ar)
 {
-	maplize(ar, ms);
+	maple(ar, ms);
 	return ms;
 }
 
@@ -213,14 +213,14 @@ MapleStream & operator<<(MapleStream & ms, int i)
 
 MaximaStream & operator<<(MaximaStream & ms, MathAtom const & at)
 {
-	at->maximize(ms);
+	at->maxima(ms);
 	return ms;
 }
 
 
 MaximaStream & operator<<(MaximaStream & ms, MathArray const & ar)
 {
-	maximize(ar, ms);
+	maxima(ar, ms);
 	return ms;
 }
 
@@ -251,14 +251,14 @@ MaximaStream & operator<<(MaximaStream & ms, int i)
 
 MathematicaStream & operator<<(MathematicaStream & ms, MathAtom const & at)
 {
-	at->mathematicize(ms);
+	at->mathematica(ms);
 	return ms;
 }
 
 
 MathematicaStream & operator<<(MathematicaStream & ms, MathArray const & ar)
 {
-	mathematicize(ar, ms);
+	mathematica(ar, ms);
 	return ms;
 }
 
@@ -290,14 +290,14 @@ MathematicaStream & operator<<(MathematicaStream & ms, int i)
 
 OctaveStream & operator<<(OctaveStream & ns, MathAtom const & at)
 {
-	at->octavize(ns);
+	at->octave(ns);
 	return ns;
 }
 
 
 OctaveStream & operator<<(OctaveStream & ns, MathArray const & ar)
 {
-	octavize(ar, ns);
+	octave(ar, ns);
 	return ns;
 }
 
diff --git a/src/mathed/math_matrixinset.C b/src/mathed/math_matrixinset.C
index ca615efc33..37db699ed6 100644
--- a/src/mathed/math_matrixinset.C
+++ b/src/mathed/math_matrixinset.C
@@ -28,7 +28,7 @@ void MathMatrixInset::normalize(NormalStream & os) const
 }
 
 
-void MathMatrixInset::maplize(MapleStream & os) const
+void MathMatrixInset::maple(MapleStream & os) const
 {
 	os << "matrix(" << int(nrows()) << ',' << int(ncols()) << ",[";
 	for (idx_type idx = 0; idx < nargs(); ++idx) {
@@ -40,7 +40,7 @@ void MathMatrixInset::maplize(MapleStream & os) const
 }
 
 
-void MathMatrixInset::maximize(MaximaStream & os) const
+void MathMatrixInset::maxima(MaximaStream & os) const
 {
 	os << "matrix(";
 	for (row_type row = 0; row < nrows(); ++row) {
@@ -64,7 +64,7 @@ void MathMatrixInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathMatrixInset::octavize(OctaveStream & os) const
+void MathMatrixInset::octave(OctaveStream & os) const
 {
 	os << '[';
 	for (row_type row = 0; row < nrows(); ++row) {
diff --git a/src/mathed/math_matrixinset.h b/src/mathed/math_matrixinset.h
index b61b2ab660..8d8386bf68 100644
--- a/src/mathed/math_matrixinset.h
+++ b/src/mathed/math_matrixinset.h
@@ -25,13 +25,13 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void maximize(MaximaStream &) const;
+	void maxima(MaximaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 };
 
 #endif
diff --git a/src/mathed/math_numberinset.C b/src/mathed/math_numberinset.C
index d7b35f2b04..87bc4b05bc 100644
--- a/src/mathed/math_numberinset.C
+++ b/src/mathed/math_numberinset.C
@@ -38,13 +38,13 @@ void MathNumberInset::normalize(NormalStream & os) const
 }
 
 
-void MathNumberInset::maplize(MapleStream & os) const
+void MathNumberInset::maple(MapleStream & os) const
 {
 	os << str_;
 }
 
 
-void MathNumberInset::octavize(OctaveStream & os) const
+void MathNumberInset::octave(OctaveStream & os) const
 {
 	os << str_;
 }
diff --git a/src/mathed/math_numberinset.h b/src/mathed/math_numberinset.h
index 610dd2be65..b0a64fa24e 100644
--- a/src/mathed/math_numberinset.h
+++ b/src/mathed/math_numberinset.h
@@ -30,9 +30,9 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_rootinset.C b/src/mathed/math_rootinset.C
index 6fe31a6191..4e22bdbd2d 100644
--- a/src/mathed/math_rootinset.C
+++ b/src/mathed/math_rootinset.C
@@ -86,13 +86,13 @@ bool MathRootInset::idxUpDown(idx_type & idx, pos_type & pos, bool up, int) cons
 }
 
 
-void MathRootInset::maplize(MapleStream & os) const
+void MathRootInset::maple(MapleStream & os) const
 {
 	os << '(' << cell(1) << ")^(1/(" << cell(0) <<"))";
 }
 
 
-void MathRootInset::octavize(OctaveStream & os) const
+void MathRootInset::octave(OctaveStream & os) const
 {
 	os << "root(" << cell(1) << ',' << cell(0) << ')';
 }
diff --git a/src/mathed/math_rootinset.h b/src/mathed/math_rootinset.h
index cae421d413..d4debe2821 100644
--- a/src/mathed/math_rootinset.h
+++ b/src/mathed/math_rootinset.h
@@ -44,9 +44,9 @@ public:
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 };
 
 #endif
diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 5b55d7d6ad..201916eabf 100644
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -399,7 +399,7 @@ void MathScriptInset::normalize(NormalStream & os) const
 }
 
 
-void MathScriptInset::maplize(MapleStream & os) const
+void MathScriptInset::maple(MapleStream & os) const
 {
 	if (nuc().size())
 		os << nuc();
@@ -410,7 +410,7 @@ void MathScriptInset::maplize(MapleStream & os) const
 }
 
 
-void MathScriptInset::mathematicize(MathematicaStream & os) const
+void MathScriptInset::mathematica(MathematicaStream & os) const
 {
 	bool d = hasDown() && down().size();
 	bool u = hasUp() && up().size();
@@ -457,7 +457,7 @@ void MathScriptInset::mathmlize( MathMLStream & os) const
 }
 
 
-void MathScriptInset::octavize(OctaveStream & os) const
+void MathScriptInset::octave(OctaveStream & os) const
 {
 	if (nuc().size())
 		os << nuc();
diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index fad32bf22e..6b7688d4b8 100644
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -35,13 +35,13 @@ public:
 	/// write normalized content
 	void normalize(NormalStream &) const;
 	/// write content as something readable by Maple
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	/// write content as something readable by Mathematica
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	/// write content as something resembling MathML
 	void mathmlize(MathMLStream &) const;
 	/// write content as something readable by Octave
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	/// move cursor left
 	bool idxLeft(idx_type &, pos_type &) const;
 	/// move cursor right
diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 074e2558b0..168234db7d 100644
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -93,18 +93,18 @@ void MathSpaceInset::validate(LaTeXFeatures & features) const
 }
 
 
-void MathSpaceInset::maplize(MapleStream & os) const
+void MathSpaceInset::maple(MapleStream & os) const
 {
 	os << ' ';
 }
 
-void MathSpaceInset::mathematicize(MathematicaStream & os) const
+void MathSpaceInset::mathematica(MathematicaStream & os) const
 {
 	os << ' ';
 }
 
 
-void MathSpaceInset::octavize(OctaveStream & os) const
+void MathSpaceInset::octave(OctaveStream & os) const
 {
 	os << ' ';
 }
diff --git a/src/mathed/math_spaceinset.h b/src/mathed/math_spaceinset.h
index 2cb4ab9609..d48ff330d4 100644
--- a/src/mathed/math_spaceinset.h
+++ b/src/mathed/math_spaceinset.h
@@ -30,11 +30,11 @@ public:
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void write(WriteStream & os) const;
 private:
diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 3482f44d0a..960ccc2ab6 100644
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -72,18 +72,18 @@ void MathSqrtInset::normalize(NormalStream & os) const
 	os << "[sqrt " << cell(0) << ']';
 }
 
-void MathSqrtInset::maplize(MapleStream & os) const
+void MathSqrtInset::maple(MapleStream & os) const
 {
 	os << "sqrt(" << cell(0) << ')';
 }
 
-void MathSqrtInset::mathematicize(MathematicaStream & os) const
+void MathSqrtInset::mathematica(MathematicaStream & os) const
 {
 	os << "Sqrt[" << cell(0) << ']';
 }
 
 
-void MathSqrtInset::octavize(OctaveStream & os) const
+void MathSqrtInset::octave(OctaveStream & os) const
 {
 	os << "sqrt(" << cell(0) << ')';
 }
diff --git a/src/mathed/math_sqrtinset.h b/src/mathed/math_sqrtinset.h
index 0d1bbc0f74..942d9d5eda 100644
--- a/src/mathed/math_sqrtinset.h
+++ b/src/mathed/math_sqrtinset.h
@@ -30,11 +30,11 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 };
diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 164dc272a4..005eecf4e9 100644
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -38,7 +38,7 @@ void MathStringInset::normalize(NormalStream & os) const
 }
 
 
-void MathStringInset::maplize(MapleStream & os) const
+void MathStringInset::maple(MapleStream & os) const
 {
 	if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
 		os << ' ' << str_ << ' ';
@@ -52,13 +52,13 @@ void MathStringInset::maplize(MapleStream & os) const
 }
 
 
-void MathStringInset::mathematicize(MathematicaStream & os) const
+void MathStringInset::mathematica(MathematicaStream & os) const
 {
 	os << ' ' << str_ << ' ';
 }
 
 
-void MathStringInset::octavize(OctaveStream & os) const
+void MathStringInset::octave(OctaveStream & os) const
 {
 	if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
 		os << ' ' << str_ << ' ';
diff --git a/src/mathed/math_stringinset.h b/src/mathed/math_stringinset.h
index 3bcf74d223..d38a7cddf9 100644
--- a/src/mathed/math_stringinset.h
+++ b/src/mathed/math_stringinset.h
@@ -30,11 +30,11 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C
index 669389611c..801a45f62d 100644
--- a/src/mathed/math_substackinset.C
+++ b/src/mathed/math_substackinset.C
@@ -44,9 +44,9 @@ void MathSubstackInset::normalize(NormalStream & os) const
 }
 
 
-void MathSubstackInset::maplize(MapleStream & os) const
+void MathSubstackInset::maple(MapleStream & os) const
 {
 	os << "substack(";
-	MathGridInset::maplize(os);
+	MathGridInset::maple(os);
 	os << ')';
 }
diff --git a/src/mathed/math_substackinset.h b/src/mathed/math_substackinset.h
index d6535fc49e..428d4ede49 100644
--- a/src/mathed/math_substackinset.h
+++ b/src/mathed/math_substackinset.h
@@ -24,7 +24,7 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 };
 
 #endif
diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 42874bc578..272c38861d 100644
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -117,7 +117,7 @@ void MathSymbolInset::normalize(NormalStream & os) const
 }
 
 
-void MathSymbolInset::maplize(MapleStream & os) const
+void MathSymbolInset::maple(MapleStream & os) const
 {
 	if (name() == "cdot")
 		os << '*';
@@ -127,7 +127,7 @@ void MathSymbolInset::maplize(MapleStream & os) const
 		os << name();
 }
 
-void MathSymbolInset::maximize(MaximaStream & os) const
+void MathSymbolInset::maxima(MaximaStream & os) const
 {
 	if (name() == "cdot")
 		os << '*';
@@ -138,7 +138,7 @@ void MathSymbolInset::maximize(MaximaStream & os) const
 }
 
 
-void MathSymbolInset::mathematicize(MathematicaStream & os) const
+void MathSymbolInset::mathematica(MathematicaStream & os) const
 {
 	if ( name() == "pi")    { os << "Pi"; return;}
 	if ( name() == "infty") { os << "Infinity"; return;}
@@ -173,7 +173,7 @@ void MathSymbolInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathSymbolInset::octavize(OctaveStream & os) const
+void MathSymbolInset::octave(OctaveStream & os) const
 {
 	if (name() == "cdot")
 		os << '*';
diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index 062eb6d32c..7aa6ac1a13 100644
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -42,15 +42,15 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void maximize(MaximaStream &) const;
+	void maxima(MaximaStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void write(WriteStream & os) const;
 	///
diff --git a/src/mathed/math_unknowninset.C b/src/mathed/math_unknowninset.C
index 32c311523e..b562092460 100644
--- a/src/mathed/math_unknowninset.C
+++ b/src/mathed/math_unknowninset.C
@@ -70,12 +70,12 @@ bool MathUnknownInset::final() const
 }
 
 
-void MathUnknownInset::maplize(MapleStream & os) const
+void MathUnknownInset::maple(MapleStream & os) const
 {
 	os << name_;
 }
 
-void MathUnknownInset::mathematicize(MathematicaStream & os) const
+void MathUnknownInset::mathematica(MathematicaStream & os) const
 {
 	os << name_;
 }
@@ -87,7 +87,7 @@ void MathUnknownInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathUnknownInset::octavize(OctaveStream & os) const
+void MathUnknownInset::octave(OctaveStream & os) const
 {
 	os << name_;
 }
diff --git a/src/mathed/math_unknowninset.h b/src/mathed/math_unknowninset.h
index aae7c74f74..d18ddb3fea 100644
--- a/src/mathed/math_unknowninset.h
+++ b/src/mathed/math_unknowninset.h
@@ -33,13 +33,13 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
 	void finalize();
 	///
diff --git a/src/mathed/math_xymatrixinset.C b/src/mathed/math_xymatrixinset.C
index f0b988b6e8..37781b7f8d 100644
--- a/src/mathed/math_xymatrixinset.C
+++ b/src/mathed/math_xymatrixinset.C
@@ -54,9 +54,9 @@ void MathXYMatrixInset::normalize(NormalStream & os) const
 }
 
 
-void MathXYMatrixInset::maplize(MapleStream & os) const
+void MathXYMatrixInset::maple(MapleStream & os) const
 {
 	os << "xymatrix(";
-	MathGridInset::maplize(os);
+	MathGridInset::maple(os);
 	os << ')';
 }
diff --git a/src/mathed/math_xymatrixinset.h b/src/mathed/math_xymatrixinset.h
index e90d8d37db..32f16f9f37 100644
--- a/src/mathed/math_xymatrixinset.h
+++ b/src/mathed/math_xymatrixinset.h
@@ -28,7 +28,7 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 };
 
 #endif