EquationStyle: allow setting font size and color

- fallback to the parent's style if these are not set
- rename InlineEquation to Equation since it takes an inline argument
- rename Equation to DisplayEquation

Author: brechtm

src/rinoh/data/stylesheets/sphinx.rts

@@ -52,9 +52,6 @@ typeface=$(mono_typeface)
 hyphenate=False
 ligatures=False
 
-[inline math]
-base=monospaced
-
 [quote]
 font_slant=italic
 
@@ -160,14 +157,17 @@ padding_bottom=3pt
 base=caption
 keep_with_next=true
 
-[equation]
+[math block]
 label_position=right
 
-[equation paragraph]
+[math block paragraph]
+base=default
 border=none
 tab_stops=50% CENTER, 100% RIGHT
 
-[equation label]
+[math block equation]
+
+[math block label]
 number_format=number
 numbering_level = 1
 label_prefix = '('

src/rinoh/frontend/rst/nodes.py

@@ -256,7 +256,7 @@ def _ids(self):
         return [self.get('label'), *self.get('ids')]
 
     def build_flowable(self):
-        return rt.Equation(self.text)
+        return rt.DisplayEquation(self.text)
 
 
 class Admonition(DocutilsGroupingNode):
@@ -342,7 +342,7 @@ class Math(Inline):
     style = 'math'
 
     def build_styled_text(self):
-        return rt.InlineEquation(self.text)
+        return rt.Equation(self.text)
 
 
 class Superscript(DocutilsInlineNode):

src/rinoh/math.py

@@ -1,17 +1,18 @@
 
 from io import BytesIO
 
-from .attribute import OverrideDefault
-from .dimension import PT
+from .attribute import Attribute, OverrideDefault
+from .color import BLACK, Color
+from .dimension import Dimension, PT
 from .flowable import LabeledFlowable
 from .image import InlineImage
-from .inline import InlineFlowable
+from .inline import InlineFlowable, InlineFlowableStyle
 from .number import Label, NumberFormat, NumberStyle
 from .paragraph import Paragraph, ParagraphBase, ParagraphStyle
 from .text import MixedStyledText, Tab
 
 
-__all__ = ['Equation', 'EquationLabel', 'InlineEquation']
+__all__ = ['DisplayEquation', 'EquationLabel', 'Equation']
 
 
 try:
@@ -43,34 +44,47 @@ def text(self, container):
         return MixedStyledText(label, parent=self)
 
 
-class Equation(LabeledFlowable):
+class DisplayEquation(LabeledFlowable):
 
     category = 'equation'
 
     def __init__(self, latex_equation, custom_label=None,
                  id=None, style=None, parent=None, source=None):
-        paragraph = Paragraph(Tab() + InlineEquation(latex_equation, inline=False))
+        paragraph = Paragraph(Tab() + Equation(latex_equation, inline=False))
         label = EquationLabel()
         super().__init__(label, paragraph, id=id, style=style, parent=parent)
 
 
-class InlineEquation(InlineFlowable):
+class EquationStyle(InlineFlowableStyle):
+    font_size = Attribute(Dimension, 9*PT, 'Height of characters')
+    font_color = Attribute(Color, BLACK, 'Color of the font')
+
+
+class Equation(InlineFlowable):
+    style_class = EquationStyle
+
     def __init__(self, latex_equation, inline=True, id=None, style=None, parent=None, source=None):
-        if not MATH_ENABLED:
-            equation = baseline = None
-        else:
-            equation = ziamath.Latex(latex_equation, inline=inline)
-            baseline = - equation.getyofst() * PT
-        super().__init__(baseline, id, style, parent, source)
+        super().__init__(id=id, style=style, parent=parent, source=source)
         self.latex_equation = latex_equation
-        self.equation = equation
+        self.inline = inline
+
+    def fallback_to_parent(self, attribute):
+        return attribute in ('font_size', 'font_color')
+
+    def prepare(self, flowable_target):
+        super().prepare(flowable_target)
+        if MATH_ENABLED:
+            size = float(self.get_style('font_size', flowable_target))
+            color = str(self.get_style('font_color', flowable_target))
+            self._math = ziamath.Latex(self.latex_equation, inline=self.inline,
+                                       size=size, color=color)
+            self.baseline = - self._math.getyofst() * PT
 
     def render(self, container, descender, state, space_below=0, **kwargs):
-        if self.equation is None:
+        if not MATH_ENABLED:
             self.warn("Math rendering requires the 'ziamath' and "
                       "'cairosvg' packages to be installed.", container)
             return 0, 0, 0
-        else:
-            pdf_file = BytesIO(cairosvg.svg2pdf(self.equation.svg()))
-            inline_image = InlineImage(pdf_file, baseline=self.baseline)
-            return inline_image.render(container, descender, state, **kwargs)
+        pdf_file = BytesIO(cairosvg.svg2pdf(self._math.svg()))
+        inline_image = InlineImage(pdf_file)
+        return inline_image.render(container, descender, state, **kwargs)

src/rinoh/styleds.py

@@ -11,7 +11,7 @@
 from .image import Figure, Caption
 from .image import ListOfFiguresSection, ListOfFigures
 from .image import Image, InlineImage
-from .math import Equation, EquationLabel, InlineEquation
+from .math import DisplayEquation, EquationLabel, Equation
 from .flowable import Flowable, Float
 from .flowable import GroupedFlowables, StaticGroupedFlowables
 from .flowable import LabeledFlowable, GroupedLabeledFlowables

src/rinoh/stylesheets/matcher.py

@@ -36,7 +36,7 @@
     'strong': StyledText.like('strong'),
     'literal emphasis': StyledText.like('literal emphasis'),
     'literal strong': StyledText.like('literal strong'),
-    'inline math': StyledText.like('math'),
+    'inline equation': Equation.like(inline=True),
 
     'inline definition': StyledText.like('definition'),
     'quote': StyledText.like('quote'),
@@ -74,16 +74,17 @@
 matcher('body', Paragraph)
 matcher('code block', +CodeBlock)
 matcher('code block caption', CodeBlockWithCaption / Caption)
-matcher('equation', Equation)
-matcher('equation paragraph', 'equation' / +Paragraph)
-matcher('equation label', EquationLabel)
 matcher('graphviz code block', Paragraph.like('graphviz'))
 matcher('attribution', Paragraph.like('attribution'))
 matcher('centered', Paragraph.like('centered'))
 matcher('line block', Paragraph.like('line block'))
 
 matcher('block quote', GroupedFlowables.like('block quote'))
 
+matcher('math block', DisplayEquation)
+matcher('math block paragraph', 'math block' / +Paragraph)
+matcher('math block equation', 'math block paragraph' / Equation)
+matcher('math block label', EquationLabel)
 
 #
 

tests_regression/rst/math.pdf

@@ -11,3 +11,10 @@
         <reference name="myeq" refid="myeq">
             myeq
         .
+    <paragraph>
+        The area of a circle is 
+        <math classes="large">
+            A_\text{c} = (\pi/4) d^2
+        .
+    <math_block classes="large" xml:space="preserve">
+        \frac{ \sum_{t=0}^{N}f(t,k) }{N}

tests_regression/rst/math.pxml

@@ -8,3 +8,15 @@ The area of a circle is :math:`A_\text{c} = (\pi/4) d^2`.
 
 
 Referencing myeq_.
+
+
+.. role:: large-math(math)
+   :class: large
+
+
+The area of a circle is :large-math:`A_\text{c} = (\pi/4) d^2`.
+
+.. math::
+   :class: large
+
+   \frac{ \sum_{t=0}^{N}f(t,k) }{N}

tests_regression/rst/math.rst

@@ -0,0 +1,16 @@
+[STYLESHEET]
+base = sphinx_base14
+
+
+[default:Paragraph]
+font_size = 12pt
+
+[math block paragraph]
+font_color = #F00
+
+[large inline equation : Equation(has_class='large', inline=True)]
+font_size = 14pt
+font_color = #0000FF
+
+[large equation : DisplayEquation(has_class='large') / ... / Equation]
+font_size = 20pt

tests_regression/rst/math.rts

@@ -8,30 +8,32 @@
 #### ChainedContainer('column1')
   StaticGroupedFlowables()
     DocumentTree()   math.rst   <document>
-      Paragraph('The area of a circle is InlineEq...')   math.rst:2   <paragraph>
+      Paragraph('The area of a circle is Equation...')   math.rst:2   <paragraph>
            > (0,0,0,0,2) body [Sphinx] > default
-          MixedStyledText('The area of a circle is InlineEq...')
-            MixedStyledText('The area of a circle is InlineEq...')
+          MixedStyledText('The area of a circle is Equation...')
+            MixedStyledText('The area of a circle is Equation...')
               SingleStyledText('The area of a circle is ')
-              InlineEquation()   <math>
+              Equation()   <math>
+                   x (0,0,0,1,2) inline equation
               SingleStyledText('.')
-              InlineEquation()   <math>
-      Equation()   math.rst:4   <math_block>
-           > (0,0,0,0,2) equation [Sphinx] > DEFAULT
+              Equation()   <math>
+                   x (0,0,0,1,2) inline equation
+      DisplayEquation()   math.rst:4   <math_block>
+           > (0,0,0,0,2) math block [Sphinx] > DEFAULT
         EquationLabel('(1)')
-             > (0,0,0,0,2) equation label [Sphinx] > DEFAULT
+             > (0,0,0,0,2) math block label [Sphinx] > DEFAULT
             MixedStyledText('(1)', style='label')
               SingleStyledText('(')
               SingleStyledText('1')
               SingleStyledText(')')
-        Paragraph('	InlineEquation')
-             > (1,0,0,0,4) equation paragraph [Sphinx] > DEFAULT
+        Paragraph('	Equation')
+             > (1,0,0,0,4) math block paragraph [math.rts] > DEFAULT
                (0,0,0,0,2) body [Sphinx] > default
-            MixedStyledText('	InlineEquation')
-              MixedStyledText('	InlineEquation')
+            MixedStyledText('	Equation')
+              MixedStyledText('	Equation')
                 Tab('	')
-                InlineEquation()
-                InlineEquation()
+                Equation()
+                Equation()
       Paragraph('Referencing Equation 1.')   math.rst:10   <paragraph>
            > (0,0,0,0,2) body [Sphinx] > default
           MixedStyledText('Referencing Equation 1.')
@@ -45,3 +47,33 @@
                   SingleStyledText(' ')
                   SingleStyledText('1')
               SingleStyledText('.')
+      Paragraph('The area of a circle is Equation...')   math.rst:17   <paragraph>
+           > (0,0,0,0,2) body [Sphinx] > default
+          MixedStyledText('The area of a circle is Equation...')
+            MixedStyledText('The area of a circle is Equation...')
+              SingleStyledText('The area of a circle is ')
+              Equation()   <math classes='large'>
+                   > (0,0,0,2,2) large inline equation [math.rts] > DEFAULT
+                   x (0,0,0,1,2) inline equation
+              SingleStyledText('.')
+              Equation()   <math classes='large'>
+                   > (0,0,0,2,2) large inline equation [math.rts] > DEFAULT
+                   x (0,0,0,1,2) inline equation
+      DisplayEquation()   math.rst:19   <math_block classes='large'>
+           > (0,0,0,0,2) math block [Sphinx] > DEFAULT
+        EquationLabel('(2)')
+             > (0,0,0,0,2) math block label [Sphinx] > DEFAULT
+            MixedStyledText('(2)', style='label')
+              SingleStyledText('(')
+              SingleStyledText('2')
+              SingleStyledText(')')
+        Paragraph('	Equation')
+             > (1,0,0,0,4) math block paragraph [math.rts] > DEFAULT
+               (0,0,0,0,2) body [Sphinx] > default
+            MixedStyledText('	Equation')
+              MixedStyledText('	Equation')
+                Tab('	')
+                Equation()
+                     > (0,0,0,1,4) large equation [math.rts] > DEFAULT
+                Equation()
+                     > (0,0,0,1,4) large equation [math.rts] > DEFAULT