X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathExtern.h;h=b6707f92a9fc7464315872bb01860e4dc399e35c;hb=ebe6612e2661f49dcfae6103f056c27afd47751f;hp=33c710a170ead7d55c8fa028ca80768f6e113af7;hpb=e89625ef28143545a511cdabc67dee8b7be1b216;p=lyx.git

diff --git a/src/mathed/MathExtern.h b/src/mathed/MathExtern.h
index 33c710a170..b6707f92a9 100644
--- a/src/mathed/MathExtern.h
+++ b/src/mathed/MathExtern.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,30 +12,39 @@
 #ifndef MATH_EXTERN_H
 #define MATH_EXTERN_H
 
-#include <string>
+#include "support/strfwd.h"
 
+namespace lyx {
 
+class HtmlStream;
 class NormalStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathMLStream;
+class MathStream;
 class OctaveStream;
 class WriteStream;
-class MathArray;
+class MathData;
 
-void write(MathArray const &, WriteStream &);
-void normalize(MathArray const &, NormalStream &);
-void maple(MathArray const &, MapleStream &);
-void maxima(MathArray const &, MaximaStream &);
-void mathematica(MathArray const &, MathematicaStream &);
-void mathmlize(MathArray const &, MathMLStream &);
-void octave(MathArray const &, OctaveStream &);
+void write(MathData const &, WriteStream &);
+void htmlize(MathData const &, HtmlStream &);
+void normalize(MathData const &, NormalStream &);
+void maple(MathData const &, MapleStream &);
+void maxima(MathData const &, MaximaStream &);
+void mathematica(MathData const &, MathematicaStream &);
+void mathmlize(MathData const &, MathStream &);
+void octave(MathData const &, OctaveStream &);
 
-bool extractNumber(MathArray const & ar, int & i);
-bool extractNumber(MathArray const & ar, double & i);
+bool extractNumber(MathData const & ar, int & i);
+bool extractNumber(MathData const & ar, double & i);
 
-MathArray pipeThroughExtern(std::string const & lang, std::string const & extra,
-	MathArray const & ar);
+/// Write \p s (which may contain math or text contents in LaTeX syntax) to \p os
+void writeString(docstring const & s, WriteStream & os);
+
+MathData pipeThroughExtern(std::string const & language,
+	docstring const & extra, MathData const & ar);
+
+
+} // namespace lyx
 
 #endif