X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=706013a3905f3ca60e4e45c121b8aa9cfcdefb09;hp=821649d245b7e443f7de479fd05a2d7d079bd2ee;hb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 821649d2..706013a3 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -141,14 +141,17 @@ void add::print(const print_context & c, unsigned level) const
 				it->rest.print(c, precedence());
 			}
 		
-			// Separator is "+", except if the following expression would have a leading minus sign
+			// Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor)
 			++it;
-			if (it != itend && !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative))))
+			if (it != itend
+			 && (is_a<print_csrc_cl_N>(c)  // sign inside ctor arguments
+			  || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
 				c.s << "+";
 		}
 	
 		if (!overall_coeff.is_zero()) {
-			if (overall_coeff.info(info_flags::positive))
+			if (overall_coeff.info(info_flags::positive)
+			 || is_a<print_csrc_cl_N>(c))  // sign inside ctor argument
 				c.s << '+';
 			overall_coeff.print(c, precedence());
 		}
@@ -312,7 +315,7 @@ ex add::coeff(const ex & s, int n) const
  *  x stands for a symbolic variables of type ex and c stands for such
  *  an expression that contain a plain number.
  *  - +(;c) -> c
- *  - +(x;1) -> x
+ *  - +(x;0) -> x
  *
  *  @param level cut-off in recursive evaluation */
 ex add::eval(int level) const
@@ -521,7 +524,7 @@ ex add::expand(unsigned options) const
 		// the terms have not changed, so it is safe to declare this expanded
 		return (options == 0) ? setflag(status_flags::expanded) : *this;
 	}
-	
+
 	return (new add(vp, overall_coeff))->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
 }