From: Richard B. Kreckel <kreckel@ginac.de>
Date: Wed, 26 Mar 2008 23:05:38 +0000 (+0100)
Subject: Merge git://www.ginac.de/ginac
X-Git-Tag: release_1-5-0~107^2~1
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=67467d256b44f5e08498ca81c946d9ffaa25d1e2;hp=-c

Merge git://www.ginac.de/ginac
---

67467d256b44f5e08498ca81c946d9ffaa25d1e2
diff --combined doc/tutorial/ginac.texi
index cda94b20,b1b38c72..555b2d66
--- a/doc/tutorial/ginac.texi
+++ b/doc/tutorial/ginac.texi
@@@ -24,7 -24,7 +24,7 @@@
  This is a tutorial that documents GiNaC @value{VERSION}, an open
  framework for symbolic computation within the C++ programming language.
  
 -Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany
 +Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
  
  Permission is granted to make and distribute verbatim copies of
  this manual provided the copyright notice and this permission notice
@@@ -52,7 -52,7 +52,7 @@@ notice identical to this one
  
  @page
  @vskip 0pt plus 1filll
 -Copyright @copyright{} 1999-2007 Johannes Gutenberg University Mainz, Germany
 +Copyright @copyright{} 1999-2008 Johannes Gutenberg University Mainz, Germany
  @sp 2
  Permission is granted to make and distribute verbatim copies of
  this manual provided the copyright notice and this permission notice
@@@ -135,7 -135,7 +135,7 @@@ the near future
  
  @section License
  The GiNaC framework for symbolic computation within the C++ programming
 -language is Copyright @copyright{} 1999-2007 Johannes Gutenberg
 +language is Copyright @copyright{} 1999-2008 Johannes Gutenberg
  University Mainz, Germany.
  
  This program is free software; you can redistribute it and/or
@@@ -921,7 -921,12 +921,12 @@@ To get an idea about what kinds of symb
  have a look at the most important classes in the class hierarchy and
  some of the relations among the classes:
  
+ @ifnotinfo
  @image{classhierarchy}
+ @end ifnotinfo
+ @ifinfo
+ <PICTURE MISSING>
+ @end ifinfo
  
  The abstract classes shown here (the ones without drop-shadow) are of no
  interest for the user.  They are used internally in order to avoid code
@@@ -8551,7 -8556,12 +8556,12 @@@ addition and multiplication, one contai
  and exponent and some atomic leaves of symbols and numbers in this
  fashion:
  
+ @ifnotinfo
  @image{repnaive}
+ @end ifnotinfo
+ @ifinfo
+ <PICTURE MISSING>
+ @end ifinfo
  
  @cindex pair-wise representation
  However, doing so results in a rather deeply nested tree which will
@@@ -8562,7 -8572,12 +8572,12 @@@ spirit we can store the multiplication 
  having a numeric exponent and a possibly complicated base, the tree
  becomes much more flat:
  
+ @ifnotinfo
  @image{reppair}
+ @end ifnotinfo
+ @ifinfo
+ <PICTURE MISSING>
+ @end ifinfo
  
  The number @code{3} above the symbol @code{d} shows that @code{mul}
  objects are treated similarly where the coefficients are interpreted as
@@@ -8584,7 -8599,12 +8599,12 @@@ $2d^3 \left( 4a + 5b - 3 \right)$
  @math{2*d^3*(4*a+5*b-3)}:
  @end ifnottex
  
+ @ifnotinfo
  @image{repreal}
+ @end ifnotinfo
+ @ifinfo
+ <PICTURE MISSING>
+ @end ifinfo
  
  @cindex radical
  This also allows for a better handling of numeric radicals, since