diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2003-08-12 18:22:39 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2003-08-12 18:22:39 +0000 |
commit | e6c55529c9724ddb15db60fea72aa376fbcd5d7a (patch) | |
tree | b74c26742f73fa8b35b3c52eb700da161d592bd9 /docs/docbook/xslt/db2latex/mathml | |
parent | 8f3dd1e397f8f532a232166aa8b840854ae74fb5 (diff) | |
download | samba-e6c55529c9724ddb15db60fea72aa376fbcd5d7a.tar.gz samba-e6c55529c9724ddb15db60fea72aa376fbcd5d7a.tar.bz2 samba-e6c55529c9724ddb15db60fea72aa376fbcd5d7a.zip |
More fixes
(This used to be commit ec02b2cfa4d913c91dd78bc1b2bdb02d7d560c59)
Diffstat (limited to 'docs/docbook/xslt/db2latex/mathml')
6 files changed, 25 insertions, 108 deletions
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl index 585c744109..d9079b50da 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.content.constsymb.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML content markup, constants and symbols, 4.4.12. | MathML namespace used -> mml diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl index f197ca1924..2ae5cc7ccb 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.content.functions.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML content markup. | Note: these elements are not part of the DocBook DTD. I have extended diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl index d93ea22393..acdf329e71 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.content.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML content markup. | Note: these elements are not part of the DocBook DTD. I have extended diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl index 1f3f566763..fd9dfdeaa6 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.content.token.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML Content Markup, tokens (ci, cn, csymbol) | MathML namespace used -> mml diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl index f37edfb4ed..37619eb499 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML presentation and content markup. | Note: these elements are not part of the DocBook DTD. I have extended diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl index ce3c7c9a4d..62f317d344 100644 --- a/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl +++ b/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl @@ -5,7 +5,9 @@ <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent"> %mmlextra; ]> <!--############################################################################# + | $Id: mathml.presentation.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ |- ############################################################################# + | $Author: jelmer $ | | PURPOSE: MathML presentation markup. | Note: these elements are not part of the DocBook DTD. I have extended @@ -23,19 +25,12 @@ <xsl:text>{</xsl:text> <xsl:apply-templates/> <xsl:text>}</xsl:text> </xsl:template> -<xsl:variable name="latex.entities.xml" select="document('latex.entities.xml')"/> - <!-- TOKENS --> <!-- Math Identifier --> <xsl:template match="mml:mi"> <xsl:variable name="fontstyle" select="@fontstyle"/> <xsl:variable name="identifier" select="normalize-space(.)"/> - <xsl:variable name="equivalent"> - <xsl:if test="string-length($identifier)=1"> - <xsl:value-of select="$latex.entities.xml/latex/character[@entity=$identifier]"/> - </xsl:if> - </xsl:variable> <xsl:choose> <xsl:when test="$identifier='ⅇ'"> <xsl:text>\textrm{e}</xsl:text> @@ -46,19 +41,8 @@ <xsl:when test="$identifier='∞'"><!--/infty infinity --> <xsl:text>\infty</xsl:text> </xsl:when> - <!-- currently tries to map single-character identifiers only --> - <xsl:when test="$equivalent!=''"> - <xsl:text>{</xsl:text> - <xsl:copy-of select="$equivalent"/> - <xsl:text>}</xsl:text> - </xsl:when> <xsl:otherwise> - <xsl:if test="$fontstyle='normal' or string-length($identifier)>1"> - <xsl:text>\textrm</xsl:text> - </xsl:if> - <xsl:text>{</xsl:text> - <xsl:copy-of select="$identifier"/> - <xsl:text>}</xsl:text> + <xsl:text>\textrm{</xsl:text> <xsl:copy-of select="$identifier"/> <xsl:text>}</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -73,30 +57,9 @@ <xsl:apply-templates/> </xsl:template> -<!-- Empty unless $character is a single character --> -<xsl:template name="generate.equivalent"> - <xsl:param name="arguments" select="0"/> - <xsl:param name="character"/> - <xsl:if test="string-length($character)=1"> - <xsl:choose> - <xsl:when test="$arguments>0"> - <xsl:value-of select="$latex.entities.xml/latex/character[@entity=$character and @arguments=$arguments]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$latex.entities.xml/latex/character[@entity=$character and @arguments='']"/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> -</xsl:template> - <!-- Math Operator --> <xsl:template match="mml:mo"> <xsl:variable name="operator" select="normalize-space(.)"/> - <xsl:variable name="equivalent"> - <xsl:call-template name="generate.equivalent"> - <xsl:with-param name="character" select="$operator"/> - </xsl:call-template> - </xsl:variable> <xsl:choose> <xsl:when test="$operator='⁡'"> <xsl:text></xsl:text> @@ -158,9 +121,6 @@ <xsl:when test="$operator='+' or $operator='-' or $operator='/' or $operator='*'"> <xsl:value-of select="$operator"/> </xsl:when> - <xsl:when test="$equivalent"> - <xsl:value-of select="$equivalent"/> - </xsl:when> <xsl:otherwise> <xsl:text>\operatorname{</xsl:text> <xsl:value-of select="$operator" /> @@ -186,14 +146,6 @@ <!-- Math Space --> <xsl:template match="mml:mspace"> - <xsl:if test="@width!='' and not(contains(@width,'%'))"> - <xsl:text>\textrm{\hspace{</xsl:text><!-- kludge! --> - <xsl:value-of select="@width"/> - <xsl:text>}}</xsl:text> - </xsl:if> - <xsl:if test="@height!='' or @depth!=''"> - <xsl:message>Warning: mspace support does not include height or depth.</xsl:message> - </xsl:if> </xsl:template> @@ -233,8 +185,8 @@ <xsl:template match="mml:mmultiscripts"> </xsl:template> -<xsl:template match="mml:munder"> <!-- +<xsl:template match="mml:munder"> <xsl:choose> <xsl:when test="*[2] = ̲"> <xsl:text>\underline{</xsl:text><xsl:apply-templates select="*[1]"/><xsl:text>}</xsl:text> @@ -251,17 +203,10 @@ <xsl:text>}{</xsl:text> <xsl:apply-templates select="*[1]"/> <xsl:text>}</xsl:text> ---> - <xsl:text>{</xsl:text> - <xsl:apply-templates select="*[1]"/> - <xsl:text>_{</xsl:text> - <xsl:apply-templates select="*[2]"/> - <xsl:text>}}</xsl:text> -<!-- </xsl:otherwise> </xsl:choose> ---> </xsl:template> +--> <xsl:template match="mml:mover"> <!--<xsl:choose> <xsl:when test="normalize-space(*[2]) = ¯"> @@ -276,57 +221,20 @@ <xsl:when test="normalize-space(*[2]) = ⎴"> <xsl:text>\widehat{</xsl:text><xsl:apply-templates select="*[1]"/><xsl:text>}</xsl:text> </xsl:when> - <xsl:otherwise> - </xsl:otherwise> + <xsl:otherwise>--> + <xsl:text>\overset{</xsl:text> + <xsl:apply-templates select="*[2]"/> + <xsl:text>}{</xsl:text> + <xsl:apply-templates select="*[1]"/> + <xsl:text>}</xsl:text> +<!-- </xsl:otherwise> </xsl:choose>--> - <xsl:choose> - <xsl:when test="@accent='true' or ( local-name(*[2])='mo' and not(@accent='false'))"> - <xsl:variable name="equivalent"> - <xsl:call-template name="generate.equivalent"> - <xsl:with-param name="arguments" select="1"/> - <xsl:with-param name="character" select="normalize-space(*[2])"/> - </xsl:call-template> - </xsl:variable> - <xsl:choose> - <xsl:when test="$equivalent!=''"> - <xsl:text>{</xsl:text> - <xsl:value-of select="$equivalent"/> - <xsl:text>{</xsl:text> - <xsl:apply-templates select="*[1]"/> - <xsl:text>}}</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>{</xsl:text> - <xsl:apply-templates select="*[1]"/> - <xsl:text>^{</xsl:text> - <xsl:apply-templates select="*[2]"/> - <xsl:text>}}</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:text>{</xsl:text> - <xsl:apply-templates select="*[1]"/> - <xsl:text>^{</xsl:text> - <xsl:apply-templates select="*[2]"/> - <xsl:text>}}</xsl:text> - </xsl:otherwise> - </xsl:choose> </xsl:template> <!-- Math UnderOver --> <xsl:template match="mml:munderover"> - <xsl:text>{</xsl:text> - <xsl:apply-templates select="*[1]"/> - <xsl:text>_{</xsl:text> - <xsl:apply-templates select="*[2]"/> - <xsl:text>}</xsl:text> - <xsl:text>^{</xsl:text> - <xsl:apply-templates select="*[3]"/> - <xsl:text>}}</xsl:text> - <!-- <xsl:text>\overset{</xsl:text> <xsl:apply-templates select="*[3]"/> <xsl:text>}{\underset{</xsl:text> @@ -334,7 +242,6 @@ <xsl:text>}{</xsl:text> <xsl:apply-templates select="*[1]"/> <xsl:text>}}</xsl:text> - --> </xsl:template> @@ -350,7 +257,7 @@ <xsl:text> {\left\{ </xsl:text> </xsl:when> <xsl:when test="@open='['"> - <xsl:text> {\left[\, </xsl:text> + <xsl:text> {\left[ </xsl:text> </xsl:when> <xsl:otherwise> <xsl:text> {\left( </xsl:text> @@ -365,7 +272,7 @@ <xsl:text> \right\}} </xsl:text> </xsl:when> <xsl:when test="@close=']'"> - <xsl:text> \,\right]} </xsl:text> + <xsl:text> \right]} </xsl:text> </xsl:when> <xsl:otherwise> <xsl:text> \right)} </xsl:text> @@ -448,7 +355,7 @@ <xsl:call-template name="mtable.format.tabular"><xsl:with-param name="cols" select="count($rows)"/></xsl:call-template> <xsl:text>}\hline </xsl:text> <xsl:apply-templates/> -<xsl:text>\end{array} </xsl:text> +\end{array} </xsl:template> <xsl:template match="mml:mtr"> |