X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fprint.cpp;h=0c97074dff9d13deec6766156fdb17a6804e5790;hp=1018ee70d47d3fcb20dd474efa8ee370064b8382;hb=293ff6f6fe89c3e5413c8da57feedf3bd2016cd7;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7

diff --git a/ginac/print.cpp b/ginac/print.cpp
index 1018ee70..0c97074d 100644
--- a/ginac/print.cpp
+++ b/ginac/print.cpp
@@ -3,7 +3,7 @@
  *  Implementation of helper classes for expression output. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,58 +17,80 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-
 #include "print.h"
 
+#include <iostream>
+
 namespace GiNaC {
 
+/** Next free ID for print_context types. */
+unsigned next_print_context_id = 0;
+
+
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_context, void)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_dflt, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_latex, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_python, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_python_repr, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_tree, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_csrc, print_context)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_csrc_float, print_csrc)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_csrc_double, print_csrc)
+GINAC_IMPLEMENT_PRINT_CONTEXT(print_csrc_cl_N, print_csrc)
+
 print_context::print_context()
-	: s(std::cout) {}
-print_context::print_context(std::ostream & os)
-	: s(os) {}
+	: s(std::cout), options(0) {}
+print_context::print_context(std::ostream & os, unsigned opt)
+	: s(os), options(opt) {}
+
+print_dflt::print_dflt()
+	: print_context(std::cout) {}
+print_dflt::print_dflt(std::ostream & os, unsigned opt)
+	: print_context(os, opt) {}
 
 print_latex::print_latex()
 	: print_context(std::cout) {}
-print_latex::print_latex(std::ostream & os)
-	: print_context(os) {}
+print_latex::print_latex(std::ostream & os, unsigned opt)
+	: print_context(os, opt) {}
 
 print_python::print_python()
 	: print_context(std::cout) {}
-print_python::print_python(std::ostream & os)
-	: print_context(os) {}
+print_python::print_python(std::ostream & os, unsigned opt)
+	: print_context(os, opt) {}
 
 print_python_repr::print_python_repr()
 	: print_context(std::cout) {}
-print_python_repr::print_python_repr(std::ostream & os)
-	: print_context(os) {}
+print_python_repr::print_python_repr(std::ostream & os, unsigned opt)
+	: print_context(os, opt) {}
 
+print_tree::print_tree()
+	: print_context(std::cout), delta_indent(4) {}
 print_tree::print_tree(unsigned d)
 	: print_context(std::cout), delta_indent(d) {}
-print_tree::print_tree(std::ostream & os, unsigned d)
-	: print_context(os), delta_indent(d) {}
+print_tree::print_tree(std::ostream & os, unsigned opt, unsigned d)
+	: print_context(os, opt), delta_indent(d) {}
 
 print_csrc::print_csrc()
 	: print_context(std::cout) {}
-print_csrc::print_csrc(std::ostream & os)
-	: print_context(os) {}
+print_csrc::print_csrc(std::ostream & os, unsigned opt)
+	: print_context(os, opt) {}
 
 print_csrc_float::print_csrc_float()
 	: print_csrc(std::cout) {}
-print_csrc_float::print_csrc_float(std::ostream & os)
-	: print_csrc(os) {}
+print_csrc_float::print_csrc_float(std::ostream & os, unsigned opt)
+	: print_csrc(os, opt) {}
 
 print_csrc_double::print_csrc_double()
 	: print_csrc(std::cout) {}
-print_csrc_double::print_csrc_double(std::ostream & os)
-	: print_csrc(os) {}
+print_csrc_double::print_csrc_double(std::ostream & os, unsigned opt)
+	: print_csrc(os, opt) {}
 
 print_csrc_cl_N::print_csrc_cl_N()
 	: print_csrc(std::cout) {}
-print_csrc_cl_N::print_csrc_cl_N(std::ostream & os)
-	: print_csrc(os) {}
+print_csrc_cl_N::print_csrc_cl_N(std::ostream & os, unsigned opt)
+	: print_csrc(os, opt) {}
 
 } // namespace GiNaC