Menu
▾
▴
[Maxima-commits] Maxima, A Computer Algebra System branch, master, updated. 908b474e1d8ace4a417f177f52b49da72790be8b
|
From: Dieter K. <cra...@us...> - 2011-06-11 14:22:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Maxima, A Computer Algebra System".
The branch, master has been updated
via 908b474e1d8ace4a417f177f52b49da72790be8b (commit)
from d804f9872d64dcb93a6405b91d9181dd9526c30d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 908b474e1d8ace4a417f177f52b49da72790be8b
Author: crategus <cra...@us...>
Date: Sat Jun 11 16:20:33 2011 +0200
Some formating to get a nice pdf-file
Changed files:
Program.texi
augmented_lagrangian.texi
cobyla.texi
contrib_ode.texi
descriptive.texi
draw.texi
drawdf.texi
ezunits.texi
f90.texi
graphs.texi
lapack.texi
lbfgs.texi
diff --git a/doc/info/Program.texi b/doc/info/Program.texi
index def1b18..0b97537 100644
--- a/doc/info/Program.texi
+++ b/doc/info/Program.texi
@@ -468,17 +468,18 @@ recognized.
eva@-lu@-ates to @var{expr_1} if @var{cond_1} evaluates to @code{true},
otherwise the expression evaluates to @var{expr_0}.
-@code{if @var{cond_1} then @var{expr_1} elseif @var{cond_2} then @var{expr_2}
-elseif ... else @var{expr_0}} evaluates to @var{expr_k} if @var{cond_k} is
-@code{true} and all preceding conditions are @code{false}. If none of the
-conditions are @code{true}, the expression evaluates to @code{expr_0}.
+The command @code{if @var{cond_1} then @var{expr_1} elseif @var{cond_2} then
+@var{expr_2} elseif ... else @var{expr_0}} evaluates to @var{expr_k} if
+@var{cond_k} is @code{true} and all preceding conditions are @code{false}. If
+none of the conditions are @code{true}, the expression evaluates to
+@code{expr_0}.
A trailing @code{else false} is assumed if @code{else} is missing. That is,
-@code{if @var{cond_1} then @var{expr_1}} is equivalent to @code{if @var{cond_1}
-then @var{expr_1} else false}, and @code{if @var{cond_1} then @var{expr_1}
-elseif ... elseif @var{cond_n} then @var{expr_n}} is equivalent to
+the command @code{if @var{cond_1} then @var{expr_1}} is equivalent to
+@code{if @var{cond_1} then @var{expr_1} else false}, and the command
@code{if @var{cond_1} then @var{expr_1} elseif ... elseif @var{cond_n} then
-@var{expr_n} else false}.
+@var{expr_n}} is equivalent to @code{if @var{cond_1} then @var{expr_1} elseif
+... elseif @var{cond_n} then @var{expr_n} else false}.
The alternatives @var{expr_0}, @dots{}, @var{expr_n} may be any Maxima
expressions, including nested @code{if} expressions. The alternatives are
diff --git a/doc/info/augmented_lagrangian.texi b/doc/info/augmented_lagrangian.texi
index 1c54d66..94eb2e3 100644
--- a/doc/info/augmented_lagrangian.texi
+++ b/doc/info/augmented_lagrangian.texi
@@ -5,7 +5,7 @@
@node Functions and Variables for augmented_lagrangian, , augmented_lagrangian, augmented_lagrangian
@section Functions and Variables for augmented_lagrangian
-@deffn {Function} augmented_lagrangian_method (@var{FOM}, @var{xx}, @var{C}, @var{yy})
+@deffn {Function} augmented_lagrangian_method (@var{FOM}, @var{xx}, @var{C}, @var{yy})
@deffnx {Function} augmented_lagrangian_method (@var{FOM}, @var{xx}, @var{C}, @var{yy}, optional_args)
@deffnx {Function} augmented_lagrangian_method ([@var{FOM}, @var{grad}], @var{xx}, @var{C}, @var{yy})
@deffnx {Function} augmented_lagrangian_method ([@var{FOM}, @var{grad}], @var{xx}, @var{C}, @var{yy}, optional_args)
@@ -54,11 +54,11 @@ References:
[2] @url{http://www.cs.ubc.ca/spider/ascher/542/chap10.pdf}
@end ifnottex
-@tex
-[1] \texttt{http://\-www-fp.mcs.anl.gov/\-otc/\-Guide/\-OptWeb/\-continuous/\-constrained/\-nonlinearcon/\-auglag.html}
+@iftex
+[1] @url{http://www-fp.mcs.anl.gov/@-otc/@-Guide/@-OptWeb/@-continuous/@-constrained/@*nonlinearcon/@-auglag.html}
-[2] \texttt{http://\-www.cs.ubc.ca/\-spider/\-ascher/\-542/\-chap10.pdf}
-@end tex
+[2] @url{http://www.cs.ubc.ca/spider/ascher/542/chap10.pdf}
+@end iftex
Examples:
@@ -87,7 +87,7 @@ Examples:
(%i6) yy: [1, 1];
(%o6) [1, 1]
(%i7) augmented_lagrangian_method(FOM, xx, C, yy, iprint=[-1,0]);
-(%o7) [[x = 0.66665984108002, y = 0.33334027245545],
+(%o7) [[x = 0.66665984108002, y = 0.33334027245545],
%lambda = [- 1.333337940892525]]
@end example
@@ -101,7 +101,8 @@ Same example as before, but this time the gradient is supplied as an argument.
@c grad : [2*x, 4*y];
@c C: [x + y - 1];
@c yy: [1, 1];
-@c augmented_lagrangian_method ([FOM, grad], xx, C, yy, iprint = [-1, 0]);
+@c augmented_lagrangian_method ([FOM, grad], xx, C, yy,
+@c iprint = [-1, 0]);
@c ===end===
@example
(%i1) load (lbfgs)$
@@ -120,7 +121,8 @@ Same example as before, but this time the gradient is supplied as an argument.
(%o7) [y + x - 1]
(%i8) yy: [1, 1];
(%o8) [1, 1]
-(%i9) augmented_lagrangian_method ([FOM, grad], xx, C, yy, iprint = [-1, 0]);
+(%i9) augmented_lagrangian_method ([FOM, grad], xx, C, yy,
+ iprint = [-1, 0]);
(%o9) [[x = 0.666659841080025, y = .3333402724554462],
%lambda = [- 1.333337940892543]]
@end example
diff --git a/doc/info/cobyla.texi b/doc/info/cobyla.texi
index 8adf0fd..f8fd138 100755
--- a/doc/info/cobyla.texi
+++ b/doc/info/cobyla.texi
@@ -4,7 +4,7 @@
* Examples for cobyla::
@end menu
-@node Introduction to cobyla, Functions and Variables for cobyla, cobyla, cobyla
+@node Introduction to cobyla, Functions and Variables for cobyla, cobyla, cobyla
@section Introduction to cobyla
@code{fmin_cobyla} is a Common Lisp translation (via @code{f2cl}) of the
@@ -140,20 +140,22 @@ Minimize x1*x2 with 1-x1^2-x2^2 >= 0.
The theoretical solution is x1 = 1/sqrt(2), x2 = -1/sqrt(2).
@c ===beg===
-@c load(fmin_cobyla);
-@c fmin_cobyla(x1*x2, [x1, x2], [1,1], constraints = [x1^2+x2^2<=1], iprint=1);
+@c load(fmin_cobyla)$
+@c fmin_cobyla(x1*x2, [x1, x2], [1,1],
+@c constraints = [x1^2+x2^2<=1], iprint=1);
@c ===end===
@example
(%i1) load(fmin_cobyla)$
-
-(%i2) fmin_cobyla(x1*x2, [x1, x2], [1,1], constraints = [x1^2+x2^2<=1], iprint=1);
-
+@group
+(%i2) fmin_cobyla(x1*x2, [x1, x2], [1,1],
+ constraints = [x1^2+x2^2<=1], iprint=1);
+@end group
Normal return from subroutine COBYLA
NFVALS = 66 F =-5.000000E-01 MAXCV = 1.999845E-12
X = 7.071058E-01 -7.071077E-01
-(%o2) [[x1 = 0.70710584934848, x2 = - 0.7071077130248], - 0.49999999999926,
- [[-1.999955756559757e-12],[]], 66]
+(%o2) [[x1 = 0.70710584934848, x2 = - 0.7071077130248],
+ - 0.49999999999926, [[-1.999955756559757e-12],[]], 66]
@end example
There are additional examples in the share/cobyla/ex directory.
diff --git a/doc/info/contrib_ode.texi b/doc/info/contrib_ode.texi
index 862c789..6bf3102 100755
--- a/doc/info/contrib_ode.texi
+++ b/doc/info/contrib_ode.texi
@@ -557,14 +557,14 @@ E. S. Cheb-Terrab, A. D. Roche, Symmetries and First Order
E. S. Cheb-Terrab, T. Kolokolnikov, First Order ODEs,
Symmetries and Linear Transformations, European Journal of
Applied Mathematics, Vol. 14, No. 2, pp. 231-246 (2003).
-@ifnottex
- (@url{http://arxiv.org/abs/math-ph/0007023},
+@c @ifnottex
+ (@url{http://arxiv.org/abs/math-ph/0007023},@*
@url{http://lie.uwaterloo.ca/papers/ode_iv.pdf})
-@end ifnottex
-@tex
- (\texttt{http://\-arxiv.org/\-abs/\-math-ph/\-0007023},
- \texttt{http://\-lie.uwaterloo.ca/\-papers/\-ode\_iv.pdf})
-@end tex
+@c @end ifnottex
+@c @tex
+@c (\texttt{http://\-arxiv.org/\-abs/\-math-ph/\-0007023},
+@c \texttt{http://\-lie.\-uwaterloo.ca/\-papers/\-ode\_iv.pdf})
+@c @end tex
@item
G. W. Bluman, S. C. Anco, Symmetry and Integration Methods for
diff --git a/doc/info/descriptive.texi b/doc/info/descriptive.texi
index a75311f..e3a3a64 100644
--- a/doc/info/descriptive.texi
+++ b/doc/info/descriptive.texi
@@ -1280,7 +1280,7 @@ Example:
@group
(%i5) kurtosis (s2);
(%o5) [- .2715445622195385, 0.119998784429451,
- - .4275233490482861, - .6405361979019522, - .4952382132352935]
+ - .4275233490482861, - .6405361979019522, - .4952382132352935]
@end group
@end example
@@ -1597,7 +1597,11 @@ Example:
@end group
@end example
-Function @code{global_variances} has an optional logical argument: @code{global_variances(x,true)} tells Maxima that @code{x} is the data matrix, making the same as @code{global_variances(x)}. On the other hand, @code{global_variances(x,false)} means that @code{x} is not the data matrix, but the covariance matrix, avoiding its recalculation,
+The function @code{global_variances} has an optional logical argument:
+@code{global_variances(x, true)} tells Maxima that @code{x} is the data matrix,
+making the same as @code{global_variances(x)}. On the other hand,
+@code{global_variances(x, false)} means that @code{x} is not the data matrix,
+but the covariance matrix, avoiding its recalculation,
@c ===beg===
@c load (descriptive)$
diff --git a/doc/info/draw.texi b/doc/info/draw.texi
index cf0b3f4..d3c3384 100644
--- a/doc/info/draw.texi
+++ b/doc/info/draw.texi
@@ -69,12 +69,13 @@ and objects. This scene is interpreted sequentially: @i{graphic options} affect
@i{graphic objects} placed on its right. Some @i{graphic options} affect the global
appearence of the scene.
-This is the list of @i{graphic objects} available for scenes in three dimensions:
+This is the list of @i{graphic objects} available for scenes in three
+dimensions:@*
@code{cylindrical}, @code{elevation_grid}, @code{explicit}, @code{implicit},
-@code{label}, @code{mesh}, @code{parametric}, @code{parametric_surface},
-@code{points}, @code{quadrilateral}, @code{spherical}, @code{triangle},
-@code{tube}, @code{vector}, and @code{geomap} (this one defined in
-package @code{worldmap}).
+@code{label}, @code{mesh}, @code{parametric},@*
+@code{parametric_surface}, @code{points}, @code{quadrilateral},
+@code{spherical}, @code{triangle}, @code{tube},@*
+@code{vector}, and @code{geomap} (this one defined in package @code{worldmap}).
See also @code{draw} and @code{draw3d}.
@@ -563,26 +564,30 @@ polygons and labels.
Colors can be given as names or in hexadecimal @i{rgb} code.
-Available color names are:
-@code{white}, @code{black}, @code{gray0}, @code{grey0}, @code{gray10},
-@code{grey10}, @code{gray20}, @code{grey20}, @code{gray30}, @code{grey30},
-@code{gray40}, @code{grey40}, @code{gray50}, @code{grey50}, @code{gray60},
-@code{grey60}, @code{gray70}, @code{grey70}, @code{gray80}, @code{grey80},
-@code{gray90}, @code{grey90}, @code{gray100}, @code{grey100}, @code{gray},
-@code{grey}, @code{light_gray}, @code{light_grey}, @code{dark_gray},
-@code{dark_grey}, @code{red}, @code{light_red}, @code{dark_red}, @code{yellow},
-@code{light_yellow}, @code{dark_yellow}, @code{green}, @code{light_green},
-@code{dark_green}, @code{spring_green}, @code{forest_green}, @code{sea_green},
-@code{blue}, @code{light_blue}, @code{dark_blue}, @code{midnight_blue},
-@code{navy}, @code{medium_blue}, @code{royalblue}, @code{skyblue},
-@code{cyan}, @code{light_cyan}, @code{dark_cyan}, @code{magenta},
-@code{light_magenta}, @code{dark_magenta}, @code{turquoise},
-@code{light_turquoise}, @code{dark_turquoise}, @code{pink}, @code{light_pink},
-@code{dark_pink}, @code{coral}, @code{light_coral}, @code{orange_red},
-@code{salmon}, @code{light_salmon}, @code{dark_salmon}, @code{aquamarine},
-@code{khaki}, @code{dark_khaki}, @code{goldenrod}, @code{light_goldenrod},
-@code{dark_goldenrod}, @code{gold}, @code{beige}, @code{brown}, @code{orange},
-@code{dark_orange}, @code{violet}, @code{dark_violet}, @code{plum} and @code{purple}.
+Available color names are:
+@verbatim
+white black gray0 grey0
+gray10 grey10 gray20 grey20
+gray30 grey30 gray40 grey40
+gray50 grey50 gray60 grey60
+gray70 grey70 gray80 grey80
+gray90 grey90 gray100 grey100
+gray grey light_gray light_grey
+dark_gray dark_grey red light_red
+dark_red yellow light_yellow dark_yellow
+green light_green dark_green spring_green
+forest_green sea_green blue light_blue
+dark_blue midnight_blue navy medium_blue
+royalblue skyblue cyan light_cyan
+dark_cyan magenta light_magenta dark_magenta
+turquoise light_turquoise dark_turquoise pink
+light_pink dark_pink coral light_coral
+orange_red salmon light_salmon dark_salmon
+aquamarine khaki dark_khaki goldenrod
+light_goldenrod dark_goldenrod gold beige
+brown orange dark_orange violet
+dark_violet plum purple
+@end verbatim
Cromatic componentes in hexadecimal code are introduced in the form @code{"#rrggbb"}.
@@ -1261,7 +1266,13 @@ set graphic option @code{font} to the name of the font.
@item
@i{Postscript}:
-Standard Postscript fonts are: @code{"Times-Roman"}, @code{"Times-Italic"}, @code{"Times-Bold"}, @code{"Times-BoldItalic"}, @code{"Helvetica"}, @code{"Helvetica-Oblique"}, @code{"Helvetica-Bold"}, @code{"Helvetic-BoldOblique"}, @code{"Courier"}, @code{"Courier-Oblique"}, @code{"Courier-Bold"}, and @code{"Courier-BoldOblique"}.
+Standard Postscript fonts are:@*
+@code{"Times-Roman"}, @code{"Times-Italic"}, @code{"Times-Bold"},
+@code{"Times-BoldItalic"},@*
+@code{"Helvetica"}, @code{"Helvetica-Oblique"}, @code{"Helvetica-Bold"},@*
+@code{"Helvetic-BoldOblique"}, @code{"Courier"},
+@code{"Courier-Oblique"}, @code{"Courier-Bold"},@*
+and @code{"Courier-BoldOblique"}.
Example:
@example
@@ -3640,15 +3651,16 @@ Example:
-@deffn {Graphic object} cylindrical (@var{radius},@var{z},@var{minz},@var{maxz},@var{azi},@var{minazi},@var{maxazi})
+@deffn {Graphic object} cylindrical (@var{radius}, @var{z}, @var{minz}, @var{maxz}, @var{azi}, @var{minazi}, @var{maxazi})
Draws 3D functions defined in cylindrical coordinates.
@b{3D}
-@code{cylindrical (@var{radius},@var{z},@var{minz},@var{maxz},@var{azi},@var{minazi},@var{maxazi})}
-plots function @code{@var{radius}(@var{z},@var{azi})} defined in cylindrical coordinates, with variable
-@var{z} taking values from @var{minz} to @var{maxz} and @i{azimuth} @var{azi} taking values from
-@var{minazi} to @var{maxazi}.
+@code{cylindrical(@var{radius}, @var{z}, @var{minz}, @var{maxz}, @var{azi},
+@var{minazi}, @var{maxazi})} plots the function @code{@var{radius}(@var{z},
+@var{azi})} defined in cylindrical coordinates, with variable @var{z} taking
+values from @var{minz} to @var{maxz} and @i{azimuth} @var{azi} taking values
+from @var{minazi} to @var{maxazi}.
This object is affected by the following @i{graphic options}: @code{xu_grid},
@code{yv_grid}, @code{line_type}, @code{key} and @code{color}.
@@ -3750,17 +3762,18 @@ Example:
-@deffn {Graphic object} errors ([@var{x1},@var{x2},...], [@var{y1},@var{y2},...])
+@deffn {Graphic object} errors ([@var{x1}, @var{x2}, @dots{}], [@var{y1}, @var{y2}, @dots{}])
Draws points with error bars, horizontally, vertically or both, depending on the
value of option @code{error_type}.
@b{2D}
-If @code{error_type=x}, arguments to @code{errors} must be of the form
-@code{[x,y,xdelta]} or @code{[x,y,xlow,xhigh]}. If @code{error_type=y},
-arguments must be of the form @code{[x,y,ydelta]} or @code{[x,y,ylow,yhigh]}.
-If @code{error_type=xy} or @code{error_type=boxes}, arguments to @code{errors}
-must be of the form @code{[x,y,xdelta,ydelta]} or @code{[x,y,xlow,xhigh,ylow,yhigh]}.
+If @code{error_type = x}, arguments to @code{errors} must be of the form
+@code{[x, y, xdelta]} or @code{[x, y, xlow, xhigh]}. If @code{error_type = y},
+arguments must be of the form @code{[x, y, ydelta]} or
+@code{[x, y, ylow, yhigh]}. If @code{error_type = xy} or
+@code{error_type = boxes}, arguments to @code{errors} must be of the form
+@code{[x, y, xdelta, ydelta]} or @code{[x, y, xlow, xhigh, ylow, yhigh]}.
See also @code{error_type}.
@@ -3827,14 +3840,14 @@ Example:
@b{3D}
-@code{explicit(@var{fcn},@var{var1},@var{minval1},@var{maxval1},@var{var2},@var{minval2},@var{maxval2})}
-plots explicit function @var{fcn}, with variable @var{var1} taking values
-from @var{minval1} to @var{maxval1} and variable @var{var2} taking values
-from @var{minval2} to @var{maxval2}.
+@code{explicit(@var{fcn}, @var{var1}, @var{minval1}, @var{maxval1}, @var{var2},
+@var{minval2}, @var{maxval2})} plots the explicit function @var{fcn}, with
+variable @var{var1} taking values from @var{minval1} to @var{maxval1} and
+variable @var{var2} taking values from @var{minval2} to @var{maxval2}.
-This object is affected by the following @i{graphic options}: @code{xu_grid},
-@code{yv_grid}, @code{line_type}, @code{line_width}, @code{key}, @code{enhanced3d},
- and @code{color}.
+This object is affected by the following @i{graphic options}: @code{xu_grid},
+@code{yv_grid}, @code{line_type}, @code{line_width}, @code{key},
+@code{enhanced3d}, and @code{color}.
Example:
@@ -3954,7 +3967,7 @@ An xpm file is read and then rendered.
See also @code{make_level_picture}, @code{make_rgb_picture} and @code{read_xpm}.
-URL @url{http://www.telefonica.net/web2/biomates/maxima/gpdraw/image}
+@url{http://www.telefonica.net/web2/biomates/maxima/gpdraw/image}@*
contains more elaborated examples.
@opencatbox
@@ -4145,9 +4158,9 @@ This object is affected by the following @i{graphic options}: @code{nticks},
@b{2D}
-@code{parametric (@var{xfun},@var{yfun},@var{par},@var{parmin},@var{parmax})} plots parametric function
-@code{[@var{xfun},@var{yfun}]}, with parameter @var{par} taking values from
-@var{parmin} to @var{parmax}.
+The command @code{parametric(@var{xfun}, @var{yfun}, @var{par}, @var{parmin},
+@var{parmax})} plots the parametric function @code{[@var{xfun}, @var{yfun}]},
+with parameter @var{par} taking values from @var{parmin} to @var{parmax}.
Example:
@@ -4161,9 +4174,10 @@ Example:
@b{3D}
-@code{parametric (@var{xfun},@var{yfun},@var{zfun},@var{par},@var{parmin},@var{parmax})} plots parametric curve
-@code{[@var{xfun},@var{yfun},@var{zfun}]}, with parameter @var{par} taking values from
-@var{parmin} to @var{parmax}.
+@code{parametric(@var{xfun}, @var{yfun}, @var{zfun}, @var{par}, @var{parmin},
+@var{parmax})} plots the parametric curve @code{[@var{xfun}, @var{yfun},
+@var{zfun}]}, with parameter @var{par} taking values from @var{parmin} to
+@var{parmax}.
Example:
@@ -4188,15 +4202,17 @@ Example:
-@deffn {Graphic object} parametric_surface (@var{xfun},@var{yfun},@var{zfun},@var{par1},@var{par1min},@var{par1max},@var{par2},@var{par2min},@var{par2max})
+@deffn {Graphic object} parametric_surface (@var{xfun}, @var{yfun}, @var{zfun}, @var{par1}, @var{par1min}, @var{par1max}, @var{par2}, @var{par2min}, @var{par2max})
Draws parametric surfaces in 3D.
@b{3D}
-@code{parametric_surface (@var{xfun},@var{yfun},@var{zfun},@var{par1},@var{par1min},@var{par1max},@var{par2},@var{par2min},@var{par2max})}
-plots parametric surface @code{[@var{xfun},@var{yfun},@var{zfun}]}, with parameter @var{par1}
-taking values from @var{par1min} to @var{par1max} and parameter @var{par2}
-taking values from @var{par2min} to @var{par2max}.
+The command @code{parametric_surface(@var{xfun}, @var{yfun}, @var{zfun},
+@var{par1}, @var{par1min}, @var{par1max}, @var{par2}, @var{par2min},
+@var{par2max})} plots the parametric surface @code{[@var{xfun}, @var{yfun},
+@var{zfun}]}, with parameter @var{par1} taking values from @var{par1min} to
+@var{par1max} and parameter @var{par2} taking values from @var{par2min} to
+@var{par2max}.
This object is affected by the following @i{graphic options}: @code{xu_grid},
@code{yv_grid}, @code{line_type}, @code{line_width}, @code{key}, @code{enhanced3d},
@@ -4330,11 +4346,11 @@ Drawing an array filled with function @code{read_array}.
@b{3D}
-@code{points ([[@var{x1},@var{y1},@var{z1}], [@var{x2},@var{y2},@var{z2}],...])} or
-@code{points ([@var{x1},@var{x2},...], [@var{y1},@var{y2},...], [@var{z1},@var{z2},...])}
-plots points @code{[@var{x1},@var{y1},@var{z1}]}, @code{[@var{x2},@var{y2},@var{z2}]}, etc.
-If @var{matrix} is a three-column or three-row matrix, @code{points (@var{matrix})}
-draws the associated points.
+@code{points([[@var{x1}, @var{y1}, @var{z1}], [@var{x2}, @var{y2}, @var{z2}],
+...])} or @code{points([@var{x1}, @var{x2}, ...], [@var{y1}, @var{y2}, ...],
+[@var{z1}, @var{z2},...])} plots points @code{[@var{x1}, @var{y1}, @var{z1}]},
+@code{[@var{x2}, @var{y2}, @var{z2}]}, etc. If @var{matrix} is a three-column
+or three-row matrix, @code{points (@var{matrix})} draws the associated points.
When arguments are lisp arrays, @code{points (@var{1d_x_array}, @var{1d_y_array}, @var{1d_z_array})}
takes coordinates from the three 1D arrays. If @var{2d_xyz_array} is a 2D array with three columns,
@@ -4452,15 +4468,16 @@ Example:
-@deffn {Graphic object} polygon ([[@var{x1},@var{y1}], [@var{x2},@var{y2}],...])
-@deffnx {Graphic object} polygon ([@var{x1},@var{x2},...], [@var{y1},@var{y2},...])
+@deffn {Graphic object} polygon ([[@var{x1}, @var{y1}], [@var{x2}, @var{y2}], @dots{}])
+@deffnx {Graphic object} polygon ([@var{x1}, @var{x2}, @dots{}], [@var{y1}, @var{y2}, @dots{}])
Draws polygons in 2D.
@b{2D}
-@code{polygon ([[@var{x1},@var{y1}], [@var{x2},@var{y2}],...])} or
-@code{polygon ([@var{x1},@var{x2},...], [@var{y1},@var{y2},...])}:
-plots on the plane a polygon with vertices @code{[@var{x1},@var{y1}]}, @code{[@var{x2},@var{y2}]}, etc..
+The commands @code{polygon([[@var{x1}, @var{y1}], [@var{x2}, @var{y2}], ...])}
+or @code{polygon([@var{x1}, @var{x2}, ...], [@var{y1}, @var{y2}, ...])} plot on
+the plane a polygon with vertices @code{[@var{x1}, @var{y1}]}, @code{[@var{x2},
+@var{y2}]}, etc.
This object is affected by the following @i{graphic options}: @code{transparent},
@code{fill_color}, @code{border}, @code{line_width}, @code{key},
@@ -4491,12 +4508,15 @@ Draws a quadrilateral.
@b{2D}
-@code{quadrilateral ([@var{x1},@var{y1}], [@var{x2},@var{y2}], [@var{x3},@var{y3}], [@var{x4},@var{y4}])} draws a quadrilateral with vertices @code{[@var{x1},@var{y1}]}, @code{[@var{x2},@var{y2}]},
-@code{[@var{x3},@var{y3}]}, and @code{[@var{x4},@var{y4}]}.
+@code{quadrilateral([@var{x1}, @var{y1}], [@var{x2}, @var{y2}],
+[@var{x3}, @var{y3}], [@var{x4}, @var{y4}])} draws a quadrilateral with vertices
+@code{[@var{x1}, @var{y1}]}, @code{[@var{x2}, @var{y2}]},
+@code{[@var{x3}, @var{y3}]}, and @code{[@var{x4}, @var{y4}]}.
-This object is affected by the following @i{graphic options}: @code{transparent},
-@code{fill_color}, @code{border}, @code{line_width}, @code{key}, @code{xaxis_secondary},
-@code{yaxis_secondary}, @code{line_type}, @code{transform} and @code{color}.
+This object is affected by the following @i{graphic options}:@*
+@code{transparent}, @code{fill_color}, @code{border}, @code{line_width},
+@code{key}, @code{xaxis_secondary}, @code{yaxis_secondary}, @code{line_type},
+@code{transform} and @code{color}.
Example:
@@ -4508,12 +4528,15 @@ Example:
@b{3D}
-@code{quadrilateral ([@var{x1},@var{y1},@var{z1}], [@var{x2},@var{y2},@var{z2}], [@var{x3},@var{y3},@var{z3}], [@var{x4},@var{y4},@var{z4}])} draws a quadrilateral with vertices
-@code{[@var{x1},@var{y1},@var{z1}]}, @code{[@var{x2},@var{y2},@var{z2}]},
-@code{[@var{x3},@var{y3},@var{z3}]}, and @code{[@var{x4},@var{y4},@var{z4}]}.
+@code{quadrilateral([@var{x1}, @var{y1}, @var{z1}], [@var{x2}, @var{y2},
+@var{z2}], [@var{x3}, @var{y3}, @var{z3}], [@var{x4}, @var{y4}, @var{z4}])}
+draws a quadrilateral with vertices @code{[@var{x1}, @var{y1}, @var{z1}]},
+@code{[@var{x2}, @var{y2}, @var{z2}]}, @code{[@var{x3}, @var{y3}, @var{z3}]},
+and @code{[@var{x4}, @var{y4}, @var{z4}]}.
This object is affected by the following @i{graphic options}: @code{line_type},
-@code{line_width}, @code{color}, @code{key}, @code{enhanced3d}, and @code{transform}.
+@code{line_width}, @code{color}, @code{key}, @code{enhanced3d}, and
+@code{transform}.
@opencatbox
@category{Package draw}
@@ -4587,15 +4610,16 @@ Example:
-@deffn {Graphic object} spherical (@var{radius},@var{azi},@var{minazi},@var{maxazi},@var{zen},@var{minzen},@var{maxzen})
+@deffn {Graphic object} spherical (@var{radius}, @var{azi}, @var{minazi}, @var{maxazi}, @var{zen}, @var{minzen}, @var{maxzen})
Draws 3D functions defined in spherical coordinates.
@b{3D}
-@code{spherical (@var{radius},@var{azi},@var{minazi},@var{maxazi},@var{zen},@var{minzen},@var{maxzen})}
-plots function @code{@var{radius}(@var{azi},@var{zen})} defined in spherical coordinates, with @i{azimuth}
-@var{azi} taking values from @var{minazi} to @var{maxazi} and @i{zenith} @var{zen} taking values from
-@var{minzen} to @var{maxzen}.
+@code{spherical(@var{radius}, @var{azi}, @var{minazi}, @var{maxazi}, @var{zen},
+@var{minzen}, @var{maxzen})} plots the function @code{@var{radius}(@var{azi},
+@var{zen})} defined in spherical coordinates, with @i{azimuth} @var{azi} taking
+values from @var{minazi} to @var{maxazi} and @i{zenith} @var{zen} taking values
+from @var{minzen} to @var{maxzen}.
This object is affected by the following @i{graphic options}: @code{xu_grid},
@code{yv_grid}, @code{line_type}, @code{key} and @code{color}.
@@ -4623,9 +4647,10 @@ Draws a triangle.
@code{triangle ([@var{x1},@var{y1}], [@var{x2},@var{y2}], [@var{x3},@var{y3}])} draws a triangle with vertices @code{[@var{x1},@var{y1}]}, @code{[@var{x2},@var{y2}]},
and @code{[@var{x3},@var{y3}]}.
-This object is affected by the following @i{graphic options}: @code{transparent},
-@code{fill_color}, @code{border}, @code{line_width}, @code{key}, @code{xaxis_secondary},
-@code{yaxis_secondary}, @code{line_type}, @code{transform}, and @code{color}.
+This object is affected by the following @i{graphic options}:@*
+@code{transparent}, @code{fill_color}, @code{border}, @code{line_width},
+@code{key}, @code{xaxis_secondary}, @code{yaxis_secondary}, @code{line_type},
+@code{transform}, and @code{color}.
Example:
@@ -5214,11 +5239,11 @@ A simple map defined by hand:
(%i8) draw2d(geomap([0,1,2,3,4]))$
@end example
-Auxiliary package @code{worldmap} sets global variable
+The auxiliary package @code{worldmap} sets the global variable
@code{boundaries_array} to real world boundaries in
(longitude, latitude) coordinates. These data are in the
public domain and come from
-@url{http://www-cger.nies.go.jp/grid-e/gridtxt/grid19.html}.
+@url{http://www-cger.nies.go.jp/@-grid-e/@-gridtxt/@-grid19.html}.
Package @code{worldmap} defines also boundaries for countries,
continents and coastlines as lists with the necessary components of
@code{boundaries_array} (see file @code{share/draw/worldmap.mac}
diff --git a/doc/info/drawdf.texi b/doc/info/drawdf.texi
index 096505f..1000bbe 100644
--- a/doc/info/drawdf.texi
+++ b/doc/info/drawdf.texi
@@ -123,7 +123,8 @@ package include: @code{explicit}, @code{implicit}, @code{parametric},
others supported by @code{draw2d} and @code{gr2d}.
Commonly used @i{graphic options} inherited from the @code{draw}
-package include: @code{points_joined}, @code{color},
+package include:@*
+@code{points_joined}, @code{color},
@code{point_type}, @code{point_size}, @code{line_width},
@code{line_type}, @code{key}, @code{title}, @code{xlabel},
@code{ylabel}, @code{user_preamble}, @code{terminal},
diff --git a/doc/info/ezunits.texi b/doc/info/ezunits.texi
index d1b0596..c022c5e 100644
--- a/doc/info/ezunits.texi
+++ b/doc/info/ezunits.texi
@@ -607,7 +607,8 @@ Declared unit conversions.
@c ===beg===
@c load (ezunits)$
@c declare_unit_conversion (MMBtu = 10^6*Btu, kW = 1000*W);
-@c declare_unit_conversion (kWh = kW*hour, MWh = 1000*kWh, bell = 1800*s);
+@c declare_unit_conversion (kWh = kW*hour, MWh = 1000*kWh,
+@c bell = 1800*s);
@c 1 ` kW*s `` MWh;
@c 1 ` kW/m^2 `` MMBtu/bell/ft^2;
@c ===end===
@@ -615,7 +616,8 @@ Declared unit conversions.
(%i1) load (ezunits)$
(%i2) declare_unit_conversion (MMBtu = 10^6*Btu, kW = 1000*W);
(%o2) done
-(%i3) declare_unit_conversion (kWh = kW*hour, MWh = 1000*kWh, bell = 1800*s);
+(%i3) declare_unit_conversion (kWh = kW*hour, MWh = 1000*kWh,
+ bell = 1800*s);
(%o3) done
(%i4) 1 ` kW*s `` MWh;
Computing conversions to base units; may take a moment.
@@ -958,12 +960,14 @@ Unit conversions expressed by equations of multiplicative terms.
@c ===beg===
@c load (ezunits)$
-@c declare_unit_conversion (nautical_mile = 1852 * m, fortnight = 14 * day);
+@c declare_unit_conversion (nautical_mile = 1852 * m,
+@c fortnight = 14 * day);
@c 100 ` nautical_mile / fortnight `` m/s;
@c ===end===
@example
(%i1) load (ezunits)$
-(%i2) declare_unit_conversion (nautical_mile = 1852 * m, fortnight = 14 * day);
+(%i2) declare_unit_conversion (nautical_mile = 1852 * m,
+ fortnight = 14 * day);
(%o2) done
(%i3) 100 ` nautical_mile / fortnight `` m/s;
Computing conversions to base units; may take a moment.
@@ -1107,7 +1111,8 @@ Examples:
@c ===beg===
@c load (ezunits) $
@c declare_fundamental_dimensions (money, cattle, happiness);
-@c declare_fundamental_units (dollar, money, goat, cattle, smile, happiness);
+@c declare_fundamental_units (dollar, money, goat, cattle,
+@c smile, happiness);
@c dimensions (100 ` dollar/goat/km^2);
@c dimensions (x ` smile/kg);
@c fundamental_units (money*cattle/happiness);
@@ -1116,7 +1121,8 @@ Examples:
(%i1) load (ezunits) $
(%i2) declare_fundamental_dimensions (money, cattle, happiness);
(%o2) done
-(%i3) declare_fundamental_units (dollar, money, goat, cattle, smile, happiness);
+(%i3) declare_fundamental_units (dollar, money, goat, cattle,
+ smile, happiness);
(%o3) [dollar, goat, smile]
(%i4) dimensions (100 ` dollar/goat/km^2);
money
diff --git a/doc/info/f90.texi b/doc/info/f90.texi
index b3af666..40b419b 100644
--- a/doc/info/f90.texi
+++ b/doc/info/f90.texi
@@ -54,7 +54,8 @@ Capture standard output into a file via the @code{with_stdout} function.
(%i1) load (f90)$
(%i2) foo : sin (3*x + 1) - cos (7*x - 2);
(%o2) sin(3 x + 1) - cos(7 x - 2)
-(%i3) with_stdout ("foo.f90", f90 (x = 0.25, y = 0.625, 'foo = foo, 'stop, 'end));
+(%i3) with_stdout ("foo.f90",
+ f90 (x=0.25, y=0.625, 'foo=foo, 'stop, 'end));
(%o3) false
(%i4) printfile ("foo.f90");
x = 0.25
diff --git a/doc/info/graphs.texi b/doc/info/graphs.texi
index 53c6d4a..c45b5e3 100644
--- a/doc/info/graphs.texi
+++ b/doc/info/graphs.texi
@@ -2882,13 +2882,15 @@ Example 6:
@c ===beg===
@c load(graphs)$
@c t: tutte_graph();
-@c draw_graph(t, redraw=true, fixed_vertices=[1,2,3,4,5,6,7,8,9]);
+@c draw_graph(t, redraw=true,
+@c fixed_vertices=[1,2,3,4,5,6,7,8,9]);
@c ===end===
@example
(%i1) load(graphs)$
(%i2) t: tutte_graph();
(%o2) GRAPH
-(%i3) draw_graph(t, redraw=true, fixed_vertices=[1,2,3,4,5,6,7,8,9]);
+(%i3) draw_graph(t, redraw=true,
+ fixed_vertices=[1,2,3,4,5,6,7,8,9]);
(%o3) done
@end example
diff --git a/doc/info/lapack.texi b/doc/info/lapack.texi
index 954d363..d1aea01 100644
--- a/doc/info/lapack.texi
+++ b/doc/info/lapack.texi
@@ -150,7 +150,6 @@ Examples:
@c dlange (inf_norm, b - A . x);
@c ===end===
@example
-(%o0) done
(%i1) A : matrix ([1, -0.15], [1.82, 2]);
[ 1 - 0.15 ]
(%o1) [ ]
@@ -160,9 +159,9 @@ Examples:
(%o2) [ ]
[ - 2.3 5 - 3.9 ]
(%i3) x : dgesv (A, b);
- [ 3.103827540695117 1.20985481742191 6.781786185657722 ]
-(%o3) [ ]
- [ - 3.974483062032557 1.399032116146062 - 8.121425428948527 ]
+ [ 3.103827540695117 1.20985481742191 6.781786185657722 ]
+(%o3) [ ]
+ [ -3.974483062032557 1.399032116146062 -8.121425428948527 ]
(%i4) dlange (inf_norm, b - A . x);
(%o4) 1.1102230246251565E-15
@end example
diff --git a/doc/info/lbfgs.texi b/doc/info/lbfgs.texi
index 46e0505..f8648e4 100644
--- a/doc/info/lbfgs.texi
+++ b/doc/info/lbfgs.texi
@@ -349,7 +349,8 @@ Gradient of FOM is specified (instead of computing it automatically).
@c load (lbfgs)$
@c F(a, b, c) := (a - 5)^2 + (b - 3)^4 + (c - 2)^6;
@c F_grad : map (lambda ([x], diff (F(a, b, c), x)), [a, b, c]);
-@c estimates : lbfgs ([F(a, b, c), F_grad], [a, b, c], [0, 0, 0], 1e-4, [1, 0]);
+@c estimates : lbfgs ([F(a, b, c), F_grad],
+@c [a, b, c], [0, 0, 0], 1e-4, [1, 0]);
@c ===end===
@example
(%i1) load (lbfgs)$
@@ -359,7 +360,8 @@ Gradient of FOM is specified (instead of computing it automatically).
(%i3) F_grad : map (lambda ([x], diff (F(a, b, c), x)), [a, b, c]);
3 5
(%o3) [2 (a - 5), 4 (b - 3) , 6 (c - 2) ]
-(%i4) estimates : lbfgs ([F(a, b, c), F_grad], [a, b, c], [0, 0, 0], 1e-4, [1, 0]);
+(%i4) estimates : lbfgs ([F(a, b, c), F_grad],
+ [a, b, c], [0, 0, 0], 1e-4, [1, 0]);
*************************************************
N= 3 NUMBER OF CORRECTIONS=25
INITIAL VALUES
-----------------------------------------------------------------------
Summary of changes:
doc/info/Program.texi | 17 ++--
doc/info/augmented_lagrangian.texi | 18 ++--
doc/info/cobyla.texi | 18 ++--
doc/info/contrib_ode.texi | 14 ++--
doc/info/descriptive.texi | 8 +-
doc/info/draw.texi | 195 ++++++++++++++++++++----------------
doc/info/drawdf.texi | 3 +-
doc/info/ezunits.texi | 18 ++-
doc/info/f90.texi | 3 +-
doc/info/graphs.texi | 6 +-
doc/info/lapack.texi | 7 +-
doc/info/lbfgs.texi | 6 +-
12 files changed, 179 insertions(+), 134 deletions(-)
hooks/post-receive
--
Maxima, A Computer Algebra System
|
