- added Dirac gammaL and gammaR objects (chiral projectors)

[ginac.git] / ginac / add.cpp

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 821649d245b7e443f7de479fd05a2d7d079bd2ee..b3fd1f60bfa678867ab9d4e76ea7fb3ac039ea2d 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -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));
 }