rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

[lyx.git] / src / mathed / math_extern.C

diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index ac84ace03428a9bedfa39229ae5d37fcb6d4dde3..c1227166786befddc14c50ace904315543b3a482 100644 (file)
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -1,8 +1,4 @@
 
-#ifdef __GNUG__
-#pragma implementation 
-#endif
-
 // This file contains most of the magic that extracts "context
 // information" from the unstructered layout-oriented stuff in an
 // MathArray.
@@ -306,7 +302,7 @@ void extractExps(MathArray & ar)
                if (!sup || sup->hasDown())
                        continue;
 
-               // create a proper exp-inset as replacement 
+               // create a proper exp-inset as replacement
                ar[i] = MathAtom(new MathExFuncInset("exp", sup->cell(1)));
                ar.erase(i + 1);
        }
@@ -490,7 +486,7 @@ bool testIntegral(MathAtom const & at)
 {
        return
         testIntSymbol(at) ||
-               ( at->asScriptInset() 
+               ( at->asScriptInset()
                  && at->asScriptInset()->nuc().size()
                        && testIntSymbol(at->asScriptInset()->nuc().back()) );
 }
@@ -569,7 +565,7 @@ bool testSum(MathAtom const & at)
 {
        return
         testSumSymbol(at) ||
-               ( at->asScriptInset() 
+               ( at->asScriptInset()
                  && at->asScriptInset()->nuc().size()
                        && testSumSymbol(at->asScriptInset()->nuc().back()) );
 }
@@ -750,7 +746,7 @@ void extractLims(MathArray & ar)
                MathArray::iterator it = ar.begin() + i;
 
                // is this a limit function?
-               if (!testSymbol(*it, "lim")) 
+               if (!testSymbol(*it, "lim"))
                        continue;
 
                // the next one must be a subscript (without superscript)
@@ -767,7 +763,7 @@ void extractLims(MathArray & ar)
                // the -> splits the subscript int x and x0
                MathArray x  = MathArray(s.begin(), st);
                MathArray x0 = MathArray(st + 1, s.end());
-               
+
                // use something behind the script as core
                MathArray f;
                MathArray::iterator tt = extractArgument(f, it + 2, ar.end());
@@ -824,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);
 }
 
 
@@ -927,7 +923,7 @@ namespace {
                ostringstream os;
                MaximaStream ms(os);
                ms << ar;
-               string expr = os.str().c_str();
+               string expr = STRCONV(os.str());
                string const header = "SIMPSUM:true;";
 
                string out;
@@ -1050,7 +1046,7 @@ namespace {
                ostringstream os;
                MapleStream ms(os);
                ms << ar;
-               string expr = os.str().c_str();
+               string expr = STRCONV(os.str());
                lyxerr << "ar: '" << ar << "'\n";
                lyxerr << "ms: '" << os.str() << "'\n";
 
@@ -1063,7 +1059,7 @@ namespace {
                        //                   Probably missing an operator such as * p
                        //
                        lyxerr << "checking expr: '" << expr << "'\n";
-                       string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";");
+                       string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';');
                        if (out.empty())
                                break; // expression syntax is ok
                        istringstream is(out.c_str());
@@ -1078,7 +1074,7 @@ namespace {
                        pos -= 15; // skip the "on line ..." part
                        if (expr[pos] == '*' || (pos > 0 && expr[pos - 1] == '*'))
                                break; // two '*' in a row are definitely bad
-                       expr.insert(pos,  "*");
+                       expr.insert(pos, 1, '*');
                }
 
                string full = "latex(" +  extra + '(' + expr + "));";
@@ -1098,7 +1094,7 @@ namespace {
                ostringstream os;
                OctaveStream vs(os);
                vs << ar;
-               string expr = os.str().c_str();
+               string expr = STRCONV(os.str());
                string out;
 
                lyxerr << "pipe: ar: '" << ar << "'\n";
@@ -1139,7 +1135,7 @@ namespace {
                        pos -= 4; // skip the ">>> " part
                        if (expr[pos] == '*')
                                break; // two '*' in a row are definitely bad
-                       expr.insert(pos,  "*");
+                       expr.insert(pos, 1, '*');
                }
 
                if (out.size() < 6)
@@ -1179,15 +1175,15 @@ MathArray pipeThroughExtern(string const & lang, string const & extra,
        // create normalized expression
        ostringstream os;
        NormalStream ns(os);
-       os << "[" << extra << ' ';
+       os << '[' << extra << ' ';
        ns << ar;
-       os << "]";
-       string data = os.str().c_str();
+       os << ']';
+       string data = STRCONV(os.str());
 
        // search external script
        string file = LibFileSearch("mathed", "extern_" + lang);
        if (file.empty()) {
-               lyxerr << "converter to '" << lang << "' not found\n";
+               lyxerr << "converter to '" << lang << "' not found" << endl;
                return MathArray();
        }