Merge 'float' and 'sideways' (they are mutually exclusive)

Author: brechtm

CHANGES.rst

@@ -8,7 +8,7 @@ New Features:
 
 * Support for sideways figures and tables; these are placed on a separate page,
   rotated 90 degrees. This is useful for figures/tables that do not fit within
-  the page width.
+  the page width. See the *float* style attribute.
 * The GroupedFlowables *same_page* style property forces all of a
   GroupedFlowables' content to be placed on the same page (if possible).
 * Support for OpenType fonts with non-BMP Unicode characters (PR #308 by James

src/rinoh/data/stylesheets/sphinx.rts

@@ -645,7 +645,7 @@ horizontal_align=CENTER
 ; sideways figures and tables
 [sideways float : Float(has_class='sideways')]
 base = NEXT_MATCH
-sideways = true
+float = sideways
 
 [figure]
 space_above=10pt

src/rinoh/flowable.py

@@ -845,11 +845,16 @@ def render(self, container, descender, state, **kwargs):
             raise
 
 
+class FloatLocation(OptionSet):
+
+    values = (None, 'here', 'sideways')
+
+
 class FloatStyle(FlowableStyle):
-    float = Attribute(Bool, False, 'Float the flowable to the top or bottom '
-                                   'of the page')
-    sideways = Attribute(Bool, False, 'Render the flowable onto a separate '
-                                      'page, rotated 90 degrees')
+    float = Attribute(FloatLocation, None, 'Float the flowable to the top or '
+                                           'bottom of the current page, to a '
+                                           'dedicated page, or sideways to a '
+                                           'dedicated page')
 
 
 class Float(Flowable):
@@ -870,14 +875,14 @@ class Float(Flowable):
     def flow(self, container, last_descender, state=None, **kwargs):
         document = container.document
         id = self.get_id(document)
-        if self.get_style('sideways', container):
+        float = self.get_style('float', container)
+        if float == FloatLocation.SIDEWAYS:
             if id not in document.registered_sideways_floats:
                 document.add_sideways_float(self)
                 state = CompletedFlowableState()
                 self.page_break(container, state)
                 return 0, 0, last_descender
-        elif (self.get_style('float', container)
-              and id not in document.floats):
+        elif (float == FloatLocation.HERE and id not in document.floats):
             super().flow(container.float_space, None)
             document.floats.add(id)
             if not container.page.check_overflow():

tests_regression/rst/table_sideways.rts

@@ -4,5 +4,5 @@ base = sphinx_base14
 
 [sideways-break float : Float(has_class='sideways-break')]
 base = NEXT_MATCH
-sideways = true
+float = sideways
 page_break = any