20697: change "plane_curves" folder name to "curves"

sagemath · May 31, 2016 · 5a5fe9a · 5a5fe9a
1 parent 058b909
commit 5a5fe9a
Show file tree

Hide file tree

Showing 38 changed files with 36 additions and 36 deletions.
diff --git a/src/doc/de/tutorial/tour_groups.rst b/src/doc/de/tutorial/tour_groups.rst
@@ -84,4 +84,4 @@ Sie können auch mit (endlichen oder unendlichen) abelschen Gruppen rechnen.
     sage: AbelianGroup(5)
     Multiplicative Abelian group isomorphic to Z x Z x Z x Z x Z
     sage: AbelianGroup(5).order()
-    +Infinity
+    +Infinity
diff --git a/src/doc/en/constructions/rep_theory.rst b/src/doc/en/constructions/rep_theory.rst
@@ -204,4 +204,4 @@ The example below using the GAP interface illustrates the syntax.
     X.4     3  .  . -1
     <BLANKLINE>
     A = E(3)^2
-      = (-1-Sqrt(-3))/2 = -1-b3
+      = (-1-Sqrt(-3))/2 = -1-b3
diff --git a/src/doc/en/prep/conf.py b/src/doc/en/prep/conf.py
@@ -33,4 +33,4 @@
 latex_documents = [
   ('index', name+'.tex', u'PREP Tutorials',
    u'Rob Beezer, Karl-Dieter Crisman, and Jason Grout', 'manual'),
-]
+]
diff --git a/src/doc/en/prep/quickstart.rst b/src/doc/en/prep/quickstart.rst
@@ -33,4 +33,4 @@ Contents:
    Numerical Analysis <Quickstarts/NumAnalysis>
    Number Theory/Cryptography <Quickstarts/Number-Theory>
    Statistics and Distributions <Quickstarts/Statistics-and-Distributions>
-   Creating Interacts <Quickstarts/Interact>
+   Creating Interacts <Quickstarts/Interact>
diff --git a/src/doc/en/reference/plane_curves/conf.py → src/doc/en/reference/curves/conf.py b/src/doc/en/reference/plane_curves/conf.py → src/doc/en/reference/curves/conf.py
diff --git a/src/doc/en/reference/plane_curves/index.rst → src/doc/en/reference/curves/index.rst b/src/doc/en/reference/plane_curves/index.rst → src/doc/en/reference/curves/index.rst
@@ -4,10 +4,10 @@ Plane curves
 .. toctree::
    :maxdepth: 2
 
-   sage/schemes/plane_curves/constructor
-   sage/schemes/plane_curves/affine_curve
-   sage/schemes/plane_curves/projective_curve
-   sage/schemes/plane_curves/curve
+   sage/schemes/curves/constructor
+   sage/schemes/curves/affine_curve
+   sage/schemes/curves/projective_curve
+   sage/schemes/curves/curve
 
    sage/schemes/plane_conics/constructor
    sage/schemes/plane_conics/con_field

diff --git a/src/doc/en/reference/index.rst b/src/doc/en/reference/index.rst
@@ -97,7 +97,7 @@ Number Theory, Algebraic Geometry
 * :doc:`Quadratic Forms <quadratic_forms/index>`
 * :doc:`L-Functions <lfunctions/index>`
 * :doc:`Schemes <schemes/index>`
-* :doc:`Elliptic, Plane, and Hyperelliptic Curves <plane_curves/index>`
+* :doc:`Elliptic, Plane, and Hyperelliptic Curves <curves/index>`
 * :doc:`Arithmetic Subgroups of SL_2(Z) <arithgroup/index>`
 * :doc:`General Hecke Algebras and Hecke Modules <hecke/index>`
 * :doc:`Modular Symbols <modsym/index>`

diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_eye_view.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_eye_view.rst
@@ -11,4 +11,4 @@ capabilities of Sage, much of which is unique to Sage.
 
    integer_factorization
    elliptic_curves
-   birds_other
+   birds_other
diff --git a/...oc/en/thematic_tutorials/explicit_methods_in_number_theory/method_of_graphs.rst b/...oc/en/thematic_tutorials/explicit_methods_in_number_theory/method_of_graphs.rst
@@ -32,4 +32,4 @@ expander graphs with good properties. And it is important in my
 algorithm for computing Tamagawa numbers of purely toric modular
 abelian varieties. This algorithm is not implemented in Sage yet,
 since it is only interesting in the case of non-prime level, as it
-turns out.
+turns out.
diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms.rst
@@ -18,4 +18,4 @@ Magma, which I developed during 1998-2004.
    half_integral
    generators_for_rings
    l_series
-   modabvar
+   modabvar
diff --git a/src/doc/en/thematic_tutorials/numerical_sage/installation.rst b/src/doc/en/thematic_tutorials/numerical_sage/installation.rst
@@ -5,4 +5,4 @@ Installation of Visualization Tools
    :maxdepth: 2
 
    installation_linux
-   installation_osx
+   installation_osx
diff --git a/src/doc/en/thematic_tutorials/numerical_sage/numerical_tools.rst b/src/doc/en/thematic_tutorials/numerical_sage/numerical_tools.rst
@@ -30,4 +30,4 @@ than ours.
 
    numpy
    scipy
-   cvxopt
+   cvxopt
diff --git a/src/doc/en/thematic_tutorials/numerical_sage/parallel_computation.rst b/src/doc/en/thematic_tutorials/numerical_sage/parallel_computation.rst
@@ -5,4 +5,4 @@ Parallel Computation
    :maxdepth: 2
 
    mpi4py
-   parallel_laplace_solver
+   parallel_laplace_solver
diff --git a/src/doc/en/thematic_tutorials/numerical_sage/using_compiled_code_iteractively.rst b/src/doc/en/thematic_tutorials/numerical_sage/using_compiled_code_iteractively.rst
@@ -47,4 +47,4 @@ feel like.
    weave
    ctypes
    ctypes_examples
-   comparison_to_cython
+   comparison_to_cython
diff --git a/src/doc/en/thematic_tutorials/numerical_sage/visualization.rst b/src/doc/en/thematic_tutorials/numerical_sage/visualization.rst
@@ -19,4 +19,4 @@ focus on are MavaVi, http://mayavi.sourceforge.net/, and easyviz.
    :maxdepth: 2
 
    installation
-   plotting
+   plotting
diff --git a/src/doc/en/thematic_tutorials/tutorial-comprehensions.rst b/src/doc/en/thematic_tutorials/tutorial-comprehensions.rst
@@ -374,4 +374,4 @@ Infinite loops can nevertheless be very useful::
 
     sage: counter_examples = (p for p in Primes() if not is_prime(mersenne(p)))
     sage: next(counter_examples)
-    11
+    11
diff --git a/src/doc/en/tutorial/tour_groups.rst b/src/doc/en/tutorial/tour_groups.rst
@@ -82,4 +82,4 @@ You can also compute using abelian groups (infinite and finite):
     sage: AbelianGroup(5)
     Multiplicative Abelian group isomorphic to Z x Z x Z x Z x Z
     sage: AbelianGroup(5).order()
-    +Infinity
+    +Infinity
diff --git a/src/doc/en/website/index.rst b/src/doc/en/website/index.rst
@@ -2,4 +2,4 @@ Sage Documentation
 ==================
 
 Do not edit this file as its output is overridden by the template in
-templates/.
+templates/.
diff --git a/src/doc/fr/tutorial/tour_groups.rst b/src/doc/fr/tutorial/tour_groups.rst
@@ -85,4 +85,4 @@ ou finis) :
     sage: AbelianGroup(5)
     Multiplicative Abelian group isomorphic to Z x Z x Z x Z x Z
     sage: AbelianGroup(5).order()
-    +Infinity
+    +Infinity
diff --git a/src/doc/ru/tutorial/tour_groups.rst b/src/doc/ru/tutorial/tour_groups.rst
@@ -82,4 +82,4 @@ Sage также включает в себя классические и мат
     sage: AbelianGroup(5)
     Multiplicative Abelian group isomorphic to Z x Z x Z x Z x Z
     sage: AbelianGroup(5).order()
-    +Infinity
+    +Infinity
diff --git a/src/sage/schemes/all.py b/src/sage/schemes/all.py
@@ -24,7 +24,7 @@
 
 from hyperelliptic_curves.all import *
 
-from plane_curves.all import *
+from curves.all import *
 
 from plane_conics.all import *
 

diff --git a/src/sage/schemes/plane_curves/__init__.py → src/sage/schemes/curves/__init__.py b/src/sage/schemes/plane_curves/__init__.py → src/sage/schemes/curves/__init__.py
diff --git a/...sage/schemes/plane_curves/affine_curve.py → src/sage/schemes/curves/affine_curve.py b/...sage/schemes/plane_curves/affine_curve.py → src/sage/schemes/curves/affine_curve.py
diff --git a/src/sage/schemes/plane_curves/all.py → src/sage/schemes/curves/all.py b/src/sage/schemes/plane_curves/all.py → src/sage/schemes/curves/all.py
diff --git a/src/sage/schemes/plane_curves/constructor.py → src/sage/schemes/curves/constructor.py b/src/sage/schemes/plane_curves/constructor.py → src/sage/schemes/curves/constructor.py
diff --git a/src/sage/schemes/plane_curves/curve.py → src/sage/schemes/curves/curve.py b/src/sage/schemes/plane_curves/curve.py → src/sage/schemes/curves/curve.py
diff --git a/...lane_curves/notes/riemann_roch_spaces.txt → ...emes/curves/notes/riemann_roch_spaces.txt b/...lane_curves/notes/riemann_roch_spaces.txt → ...emes/curves/notes/riemann_roch_spaces.txt
diff --git a/.../schemes/plane_curves/projective_curve.py → src/sage/schemes/curves/projective_curve.py b/.../schemes/plane_curves/projective_curve.py → src/sage/schemes/curves/projective_curve.py
diff --git a/src/sage/schemes/elliptic_curves/ell_finite_field.py b/src/sage/schemes/elliptic_curves/ell_finite_field.py
@@ -30,7 +30,7 @@
 
 from sage.misc.randstate import current_randstate
 
-from sage.schemes.plane_curves.projective_curve import Hasse_bounds
+from sage.schemes.curves.projective_curve import Hasse_bounds
 from ell_field import EllipticCurve_field
 from constructor import EllipticCurve, EllipticCurve_from_j
 from sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field import HyperellipticCurve_finite_field

diff --git a/src/sage/schemes/elliptic_curves/ell_generic.py b/src/sage/schemes/elliptic_curves/ell_generic.py
@@ -78,7 +78,7 @@
 oo = rings.infinity       # infinity
 O = rings.O         # big oh
 
-import sage.schemes.plane_curves.projective_curve as plane_curve
+import sage.schemes.curves.projective_curve as plane_curve
 
 def is_EllipticCurve(x):
     r"""

diff --git a/src/sage/schemes/elliptic_curves/ell_point.py b/src/sage/schemes/elliptic_curves/ell_point.py
@@ -133,7 +133,7 @@
 from sage.libs.pari.pari_instance import pari, prec_words_to_bits
 from sage.structure.sequence import Sequence
 
-from sage.schemes.plane_curves.projective_curve import Hasse_bounds
+from sage.schemes.curves.projective_curve import Hasse_bounds
 from sage.schemes.projective.projective_point import (SchemeMorphism_point_projective_ring,
                                                       SchemeMorphism_point_abelian_variety_field)
 from sage.schemes.generic.morphism import is_SchemeMorphism
@@ -3544,7 +3544,7 @@ def order(self):
             return Integer(1)
         E = self.curve()
         K = E.base_ring()
-        from sage.schemes.plane_curves.projective_curve import Hasse_bounds
+        from sage.schemes.curves.projective_curve import Hasse_bounds
         bounds = Hasse_bounds(K.order())
 
         try:

diff --git a/src/sage/schemes/elliptic_curves/jacobian.py b/src/sage/schemes/elliptic_curves/jacobian.py
@@ -111,7 +111,7 @@ def Jacobian(X, **kwds):
     from sage.rings.polynomial.multi_polynomial_element import is_MPolynomial
     if is_MPolynomial(X):
         if morphism:
-            from sage.schemes.plane_curves.constructor import Curve
+            from sage.schemes.curves.constructor import Curve
             return Jacobian_of_equation(X, curve=Curve(X), **kwds)
         else:
             return Jacobian_of_equation(X, **kwds)

diff --git a/src/sage/schemes/generic/divisor_group.py b/src/sage/schemes/generic/divisor_group.py
@@ -49,7 +49,7 @@ def DivisorGroup(scheme, base_ring=None):
     if base_ring is None:
         base_ring = ZZ
 
-    from sage.schemes.plane_curves.curve import Curve_generic
+    from sage.schemes.curves.curve import Curve_generic
     if isinstance(scheme, Curve_generic):
         DG = DivisorGroup_curve(scheme, base_ring)
     else:

diff --git a/src/sage/schemes/hyperelliptic_curves/hyperelliptic_generic.py b/src/sage/schemes/hyperelliptic_curves/hyperelliptic_generic.py
@@ -36,7 +36,7 @@
 from sage.functions.all import log
 from sage.structure.category_object import normalize_names
 
-import sage.schemes.plane_curves.projective_curve as plane_curve
+import sage.schemes.curves.projective_curve as plane_curve
 
 def is_HyperellipticCurve(C):
     """
@@ -167,7 +167,7 @@ def is_singular(self):
             sage: set_verbose(None)
             sage: H.is_singular()
             False
-            sage: from sage.schemes.plane_curves.projective_curve import ProjectivePlaneCurve
+            sage: from sage.schemes.curves.projective_curve import ProjectivePlaneCurve
             sage: ProjectivePlaneCurve.is_singular(H)
             True
         """
@@ -194,7 +194,7 @@ def is_smooth(self):
             sage: set_verbose(None)
             sage: H.is_smooth()
             True
-            sage: from sage.schemes.plane_curves.projective_curve import ProjectivePlaneCurve
+            sage: from sage.schemes.curves.projective_curve import ProjectivePlaneCurve
             sage: ProjectivePlaneCurve.is_smooth(H)
             False
         """

diff --git a/src/sage/schemes/plane_conics/con_field.py b/src/sage/schemes/plane_conics/con_field.py
@@ -36,7 +36,7 @@
 from sage.matrix.constructor import Matrix
 from sage.matrix.matrix import is_Matrix
 
-from sage.schemes.plane_curves.projective_curve import ProjectivePlaneCurve
+from sage.schemes.curves.projective_curve import ProjectivePlaneCurve
 
 from sage.categories.fields import Fields
 _Fields = Fields()

diff --git a/src/sage/schemes/plane_conics/con_finite_field.py b/src/sage/schemes/plane_conics/con_finite_field.py
@@ -22,7 +22,7 @@
 #*****************************************************************************
 
 from sage.rings.all import PolynomialRing
-from sage.schemes.plane_curves.projective_curve import ProjectivePlaneCurve_finite_field
+from sage.schemes.curves.projective_curve import ProjectivePlaneCurve_finite_field
 from con_field import ProjectiveConic_field
 
 class ProjectiveConic_finite_field(ProjectiveConic_field, ProjectivePlaneCurve_finite_field):

diff --git a/src/sage/schemes/plane_conics/con_prime_finite_field.py b/src/sage/schemes/plane_conics/con_prime_finite_field.py
@@ -22,7 +22,7 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.schemes.plane_curves.projective_curve import ProjectivePlaneCurve_prime_finite_field
+from sage.schemes.curves.projective_curve import ProjectivePlaneCurve_prime_finite_field
 from con_finite_field import ProjectiveConic_finite_field
 
 class ProjectiveConic_prime_finite_field(ProjectiveConic_finite_field, ProjectivePlaneCurve_prime_finite_field):

diff --git a/src/sage/schemes/plane_quartics/quartic_generic.py b/src/sage/schemes/plane_quartics/quartic_generic.py
@@ -17,7 +17,7 @@
 #*****************************************************************************
 
 
-import sage.schemes.plane_curves.projective_curve as projective_curve
+import sage.schemes.curves.projective_curve as projective_curve
 
 def is_QuarticCurve(C):
     """