Merge into the latest version of #18529; improve treatment of composi…

…te functions in ExpressionNice
sagemath · Jan 24, 2016 · 8e17d54 · 8e17d54
2 parents 00d265c + c01048f
commit 8e17d54
Show file tree

Hide file tree

Showing 13 changed files with 8,355 additions and 32 deletions.
diff --git a/src/doc/en/reference/manifolds/chart.rst b/src/doc/en/reference/manifolds/chart.rst
@@ -0,0 +1,11 @@
+Coordinate Charts
+=================
+
+.. toctree::
+   :maxdepth: 2
+
+   sage/manifolds/chart
+
+   sage/manifolds/coord_func
+
+   sage/manifolds/coord_func_symb
diff --git a/src/doc/en/reference/manifolds/index.rst b/src/doc/en/reference/manifolds/index.rst
@@ -11,8 +11,10 @@ More documentation (in particular example worksheets) can be found
 `here <http://sagemanifolds.obspm.fr/documentation.html>`_.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 3
 
    manifold
 
+   sage/manifolds/utilities
+
 .. include:: ../footer.txt
diff --git a/src/doc/en/reference/manifolds/manifold.rst b/src/doc/en/reference/manifolds/manifold.rst
@@ -12,4 +12,6 @@ Topological Manifolds
 
    sage/manifolds/point
 
-   sage/manifolds/chart
+   chart
+
+   scalarfield
diff --git a/src/doc/en/reference/manifolds/scalarfield.rst b/src/doc/en/reference/manifolds/scalarfield.rst
@@ -0,0 +1,9 @@
+Scalar Fields
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+   sage/manifolds/scalarfield_algebra
+
+   sage/manifolds/scalarfield
diff --git a/src/sage/manifolds/all.py b/src/sage/manifolds/all.py
@@ -1,3 +1,4 @@
 from sage.misc.lazy_import import lazy_import
 lazy_import('sage.manifolds.manifold', 'Manifold')
-
+lazy_import('sage.manifolds.utilities', 'nice_derivatives')
+lazy_import('sage.manifolds.utilities', 'omit_function_args')