use new-style print methods

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index d0d9d7d1e075c245d59fc416e34ffbd44c982197..f5cd5de83dde6d208d3afabbf511c9c840e44650 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -43,13 +43,12 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
        size_t nops() const;
        ex op(size_t i) const;
        ex & let_op(size_t i);
        ex eval(int level=0) const;
        ex evalm() const {return *this;}
-       ex subs(const lst & ls, const lst & lr, unsigned options = 0) const;
+       ex subs(const exmap & m, unsigned options = 0) 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;
@@ -87,6 +86,11 @@ protected:
        int division_free_elimination(const bool det = false);
        int fraction_free_elimination(const bool det = false);
        int pivot(unsigned ro, unsigned co, bool symbolic = true);
+
+       void print_elements(const print_context & c, const std::string & row_start, const std::string & row_end, const std::string & row_sep, const std::string & col_sep) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
        
 // member variables
 protected: