docs: extract shapes feature analyses into subdir

Steve Canny · Steve Canny · commit 465a5581415c · 2015-03-15T13:37:20.000-07:00
Also, add `cleandocs` Makefile target
diff --git a/Makefile b/Makefile
@@ -24,6 +24,9 @@ clean:
 	find . -type f -name \*.pyc -exec rm {} \;
 	rm -rf dist *.egg-info .coverage .DS_Store
 
+cleandocs:
+	$(MAKE) -C docs clean
+
 coverage:
 	py.test --cov-report term-missing --cov=docx tests/
 
diff --git a/docs/dev/analysis/features/shapes/index.rst b/docs/dev/analysis/features/shapes/index.rst
@@ -2,10 +2,6 @@
 Shapes (in general)
 ===================
 
-
-Overview
---------
-
 A graphical object that appears in a Word document is known as a *shape*.
 A shape can be *inline* or *floating*. An inline shape appears on a text
 baseline as though it were a character glyph and affects the line height.
@@ -18,6 +14,16 @@ that determines the placement of the graphic. The same graphical object can be
 placed inline or floating by changing its container. The graphic itself is
 unaffected.
 
+In addition to this overview, there are the following more specialized
+feature analyses:
+
+.. toctree::
+   :titlesonly:
+
+   shapes-inline
+   shapes-inline-size
+   picture
+
 
 MS API
 ------
diff --git a/docs/dev/analysis/features/shapes/picture.rst b/docs/dev/analysis/features/shapes/picture.rst
@@ -2,10 +2,6 @@
 Picture
 =======
 
-
-Overview
---------
-
 Word allows a picture to be placed in a graphical object container, either an
 inline shape or a floating shape.
 
diff --git a/docs/dev/analysis/features/shapes/shapes-inline-size.rst b/docs/dev/analysis/features/shapes/shapes-inline-size.rst
@@ -2,10 +2,6 @@
 Inline shape size
 =================
 
-
-Overview
---------
-
 The position of an inline shape is completely determined by the text it is
 inline with, however its dimensions can be specified. For some shape types,
 both the contained shape and the shape container specify a width and height.
diff --git a/docs/dev/analysis/features/shapes/shapes-inline.rst b/docs/dev/analysis/features/shapes/shapes-inline.rst
@@ -2,10 +2,6 @@
 Inline shape
 ============
 
-
-Overview
---------
-
 Word allows a graphical object to be placed into a document as an inline
 object. An inline shape appears as a ``<w:drawing>`` element as a child of
 a ``<w:r>`` element.
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
@@ -13,13 +13,10 @@ Feature Analysis
    features/text/index
    features/table/index
    features/styles/index
+   features/shapes/index
    features/coreprops
    features/numbering
    features/sections
-   features/shapes
-   features/shapes-inline
-   features/shapes-inline-size
-   features/picture
 
 
 Schema Analysis
