- fix LaTeX-output bug reported by Stefan, remove obsolete has(matrix,ex).

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 1041c6433c8001f64f7c79d7533e929c6f870abc..0e7660b969fcc28d0d905725ac99bf55fad4162a 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -42,16 +42,14 @@ public:
        
        // functions overriding virtual functions from bases classes
 public:
-       void print(std::ostream & os, unsigned upper_precedence=0) const;
-       void printraw(std::ostream & os) const;
+       void print(const print_context & c, unsigned level = 0) const;
        unsigned nops() const;
        ex op(int i) const;
        ex & let_op(int i);
        ex expand(unsigned options=0) const;
-       bool has(const ex & other) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
-       ex subs(const lst & ls, const lst & lr) const;
+       ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
        ex eval_indexed(const basic & i) const;
        ex add_indexed(const ex & self, const ex & other) const;
        ex scalar_mul_indexed(const ex & self, const numeric & other) const;
@@ -92,7 +90,6 @@ protected:
        unsigned row;             ///< number of rows
        unsigned col;             ///< number of columns
        exvector m;               ///< representation (cols indexed first)
-       static unsigned precedence;
 };
 
 
@@ -104,9 +101,6 @@ inline unsigned nops(const matrix & m)
 inline ex expand(const matrix & m, unsigned options = 0)
 { return m.expand(options); }
 
-inline bool has(const matrix & m, const ex & other)
-{ return m.has(other); }
-
 inline ex eval(const matrix & m, int level = 0)
 { return m.eval(level); }