diff --git a/examples/sample-article.xml b/examples/sample-article.xml index c99653299..0c29f05c3 100644 --- a/examples/sample-article.xml +++ b/examples/sample-article.xml @@ -2242,7 +2242,9 @@ the xsltproc executable. finer control, it is generally best to specify the width.

- + + Trefoil image +
@@ -2355,15 +2357,16 @@ the xsltproc executable.

Similarly, text can be put next to images

- -

here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text

- +

+ here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text + cross reference: and math: x^2

You can even place text next to numbered figures, as shown below in .

-

here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text

+

here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text here is some text; + cross reference: and math: x^2
@@ -2397,22 +2400,90 @@ the xsltproc executable. Side-by-side Table, with subtable children. - tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
width=50
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
width=25
Widths can be calculated automatically. - tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +

If you put two table elements side-by-side without a global caption, then they will use regular numbering; see @@ -2420,17 +2491,66 @@ the xsltproc executable. - - tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB +
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
@@ -2443,15 +2563,66 @@ the xsltproc executable. Global Caption - tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
halign="right"
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
valign="top"
@@ -2462,7 +2633,24 @@ the xsltproc executable. - tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
Table next to a Figure

@@ -2474,9 +2662,26 @@ the xsltproc executable. Tables Next to Text

Tables can go next to text blocks.

- +
- tabular bodytabular body + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + +
Table next to text

here is some text here is some text here is some text here is some text here

@@ -2489,26 +2694,132 @@ the xsltproc executable. - + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + + + CCCC + DDDD + + + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + + + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + + + + + + + + + 1111 + 2222 + + + aaaa + bbbb + + + AAAA + BBBB + + + + + + Other objects +

Other objects such as lists can be put in the sidebyside element.

+ + +
    +

  1. Footnotes: Fermat allusion at .

    2. +

  2. Examples: Mystery derivative at .

    3. +

  3. Definition-like: A mathematical statement with no proof .

    4. +

  4. Figures: An early plot, Figure.

    5. +
+ + +
    +

  • Footnotes: Fermat allusion at .

    • +

  • Examples: Mystery derivative at .

    • +

  • Definition-like: A mathematical statement with no proof .

    • +

  • Figures: An early plot, Figure.

    • +
+ + +

You can even experiment with aligned equations in the sidebyside element.

+ + +

here is some text, and here is an equation that contains alignment.

+ + f(x)&= x^2+3x+2 + &=(x+2)(x+1) + + + +

here is some text, and here is an equation that contains alignment.

+ + f(x)&= x^2+3x+2 + &=(x+2)(x+1) + +

here is some text, and here is an equation that contains alignment.

+ + f(x)&= x^2+3x+2 + &=(x+2)(x+1) + + ---> diff --git a/xsl/mathbook-html.xsl b/xsl/mathbook-html.xsl index 344da390d..1b62246d3 100644 --- a/xsl/mathbook-html.xsl +++ b/xsl/mathbook-html.xsl @@ -1539,7 +1539,10 @@ is just flat out on the page, as if printed there. - + + center + + @@ -1621,9 +1624,14 @@ is just flat out on the page, as if printed there. - + + center - + + + left + + ; diff --git a/xsl/mathbook-latex.xsl b/xsl/mathbook-latex.xsl index 2b644d8f9..5eff39713 100644 --- a/xsl/mathbook-latex.xsl +++ b/xsl/mathbook-latex.xsl @@ -2166,10 +2166,7 @@ along with MathBook XML. If not, see . - - + \begin{figure} \centering @@ -2177,11 +2174,9 @@ along with MathBook XML. If not, see . \end{figure} - - + + \begin{figure} + \centering + + + \popValignCaptionBottom + + + \end{figure} + + + + + @@ -2255,10 +2269,10 @@ along with MathBook XML. If not, see . \textwidth}{% - - - \parbox{\textwidth}{% - + + + + @@ -2279,27 +2293,103 @@ along with MathBook XML. If not, see . % horizontal alignment - - - - + + + + + + + + - - - - - - } - - + + }% end body { + + + }% caption + + + + + + + + + + }% end body { }% caption - - - \popValignCaptionBottom + + + + + + + + + + \includegraphics[ + width=\textwidth, + + height=pt, + + ] + {} + + + }% end body { + + }% caption + + + + + + + + + \parbox{\textwidth}{% + + + + + } + + }% end body { + + }% caption + + + + + + + \parbox{\textwidth}{% + + + + + } + + }% end body { + + }% caption + + + + + + + + + + + }% end body { + + }% caption @@ -2310,10 +2400,6 @@ along with MathBook XML. If not, see . - - - - \includegraphics[ @@ -2445,7 +2531,7 @@ along with MathBook XML. If not, see . - +