diff --git a/Doc/Tdoc/general.xml b/Doc/Tdoc/general.xml index 75d5d5e3c2c993214d6d568dc5e92d9064172c2b..e6ecc7deb3e9b852657b2c435c238c6dde3fd224 100644 --- a/Doc/Tdoc/general.xml +++ b/Doc/Tdoc/general.xml @@ -11,13 +11,284 @@ xmlns:db="http://docbook.org/ns/docbook"> <title>General Elements</title> - <section xml:id="tdocSectioning"> - <title>Document sectioning</title> + <annotation role="slide"> + <para>This section and its children will appear as slides as well.</para> + </annotation> + + <para>In the next sections we will describe common building blocks of + (technical) documents.</para> + + <section xml:id="sectTdocBlocksLists"> + <title>Block level elements: Lists</title> + + <informaltable border="1"> + <colgroup width="10%"/> + + <colgroup width="25%"/> + + <colgroup width="10%"/> + + <colgroup width="15%"/> + + <colgroup width="40%"/> + + <tr> + <th>HTML</th> + + <td><programlisting language="none"><code><ul> + <li>One</li> + <li>Two</li> +</ul></code></programlisting></td> + + <td/> + + <th>Docbook</th> + + <td><programlisting language="none"><code><itemizedlist> + <listitem> + <para>One</para> + </listitem> + + <listitem> + <para>Two</para> + </listitem> +</itemizedlist></code></programlisting></td> + </tr> + + <tr> + <th>LaTeX</th> + + <td><programlisting language="none"><code>\begin{itemize} + \item One + \item Two +\end{itemize}</code></programlisting></td> + + <td/> + + <th>Rendering</th> + + <td><itemizedlist> + <listitem> + <para>One</para> + </listitem> + + <listitem> + <para>Two</para> + </listitem> + </itemizedlist></td> + </tr> + </informaltable> + </section> + + <section xml:id="sectTdocBlocksTables"> + <title>Block level elements: Tables</title> + + <informaltable border="1"> + <colgroup width="5%"/> + + <colgroup width="40%"/> + + <colgroup width="10%"/> + + <colgroup width="5%"/> + + <colgroup width="40%"/> + + <tr> + <th>HTML</th> + + <td><programlisting language="none"><code><table> + <tr> + <td>a1</td> + <td>a2</td> + </tr> + <tr> + <td>b1</td> + <td>b2</td> + </tr> +</table></code></programlisting></td> + + <td/> + + <th>Docbook</th> + + <td><programlisting language="none"><code><informaltable> + <tr> + <td>a1</td> + <td>a2</td> + </tr> + <tr> + <td>b1</td> + <td>b2</td> + </tr> +</informaltable></code></programlisting></td> + </tr> + + <tr> + <th>LaTeX</th> + + <td><programlisting language="none"><code>\begin{tabular}{ll} + a1 & a2 \\ + b1 & b2 \\ +\end{tabular}</code></programlisting></td> + + <td/> + + <th>Rendering</th> + + <td><informaltable border="1"> + <tr> + <td valign="top">a1</td> + + <td>a1</td> + </tr> + + <tr> + <td>b1</td> + + <td>b2</td> + </tr> + </informaltable></td> + </tr> + </informaltable> + </section> + + <section xml:id="sectTdocMath"> + <title>Mathematical formulas</title> + + <informaltable border="1"> + <colgroup width="10%"/> + + <colgroup width="90%"/> + + <tr> + <th>HTML / Docbook</th> + + <td><programlisting language="none"><code><m:math> + <m:mrow> + <m:munderover> + <m:mo>∫</m:mo> + ... + <m:msqrt> + <m:mi>Ï€</m:mi> + </m:msqrt> + </m:mrow> +</m:math></code></programlisting></td> + </tr> + + <tr> + <th>LaTeX</th> + + <td><programlisting language="none"><code>\begin{equation} + \int\limits_{-\infty}^{+\infty} + e^{-x²} dx = \sqrt{\pi} +\end{equation}</code></programlisting></td> + </tr> + + <tr> + <th>Rendering</th> + + <td><informalequation> + <m:math display="block"> + <m:mrow> + <m:mrow> + <m:munderover> + <m:mo>∫</m:mo> + + <m:mrow> + <m:mo>-</m:mo> + + <m:mi mathvariant="normal">∞</m:mi> + </m:mrow> + + <m:mrow> + <m:mo>+</m:mo> + + <m:mi mathvariant="normal">∞</m:mi> + </m:mrow> + </m:munderover> + + <m:mrow> + <m:msup> + <m:mi>e</m:mi> + + <m:mrow> + <m:mo>-</m:mo> + + <m:msup> + <m:mi>x</m:mi> + + <m:mi>2</m:mi> + </m:msup> + </m:mrow> + </m:msup> + + <m:mo>â¢</m:mo> + + <m:mrow> + <m:mo mathvariant="italic">d</m:mo> - <annotation role="slide"> - <para>This section and its children will appear as slides as - well.</para> - </annotation> + <m:mi>x</m:mi> + </m:mrow> + </m:mrow> + </m:mrow> + + <m:mo>=</m:mo> + + <m:msqrt> + <m:mi>Ï€</m:mi> + </m:msqrt> + </m:mrow> + </m:math> + </informalequation></td> + </tr> + </informaltable> + </section> + + <section xml:id="sectTdocModularDocs"> + <title>Modular document sources</title> + + <informaltable border="1"> + <colgroup width="10%"/> + + <colgroup width="90%"/> + + <tr> + <th>HTML</th> + + <td><programlisting language="none"><code> <body> + ... + <object name="foo" type="text/html" data="table.html"/> + ... + </body></code></programlisting></td> + </tr> + + <tr> + <th>Docbook</th> + + <td><programlisting language="none"><code> <part xml:id="sd1"> + <title>Software development 1</title> + <xi:include href="Sd1/gettingStarted.xml" xpointer="element(/1)"/> + <xi:include href="Sd1/languageFundamentals.xml" xpointer="element(/1)"/> +...</code></programlisting></td> + </tr> + + <tr> + <th>LaTeX</th> + + <td><programlisting language="none"><code>\documentclass{article} +\input{mydefs.tex} +\begin{document} +... +\include{math.tex} +... +\end{document}</code></programlisting></td> + </tr> + </informaltable> + </section> + + <section xml:id="sectTdocSectioning"> + <title>Document sectioning</title> <informaltable border="1"> <tr>