<xsl:value-of select="*/titlepage/title"/>

@@ -91,11 +130,13 @@ Which comes out like this: Footnotes are created with the footnote element: This is an example of a footnote + <footnote>This is an example of a footnote</footnote> + Within a footnote, you can use inline content described in the next chapter to format the type styles of the text in the footnote. @@ -114,18 +155,22 @@ running text referring to that footnote. Lists Three types of lists are supported: + + itemize for bulleted lists such as this one. enumerate for numbered lists. description for tagged lists. + Each item in such a list must be in an item element. In fact, an item is the only element allowed in an itemize, enumerate or description element. You should not put ordinary text or any other element in a list without enclosing them in <item> and </item>. Here is an example of a numbered list: + @@ -137,7 +182,9 @@ Here is an example of a numbered list: + And this is what the list turns into: + First you need an enumerate, itemize or description tag. @@ -145,11 +192,13 @@ And this is what the list turns into: Finally, put the content inside the items. + In a description list, you make your own tags for each item instead of the automatically generated bullts or numbers. The tags for each item go in the tag attribute of the item element. So, repeating the above list as a description list: + <description> @@ -159,7 +208,9 @@ So, repeating the above list as a description list: </description> + Which creates the following output: + for bulleted lists. @@ -167,6 +218,7 @@ Which creates the following output: for tagged lists such as this one. + An item can contain inline content as well as block-level content.

- SEC + SEC

+
-
+

@@ -184,6 +281,12 @@

+ 
+

@@ -229,9 +332,10 @@ -^footnote
-

- +

+^footnote
+ +

@@ -258,6 +362,18 @@ + +

+ + + +

+ +

@@ -288,7 +404,7 @@ - +

@@ -313,5 +429,19 @@ + +

+ http://www.w3.org/1998/Math/MathML + +

+ + + + + + diff --git a/latex.xsl b/latex.xsl index 566bb4b..eb197ee 100644 --- a/latex.xsl +++ b/latex.xsl @@ -8,6 +8,7 @@ \documentclass[a4paper]{article} +\usepackage{xcolor} \usepackage{graphics} \usepackage{latexsym} \usepackage{marvosym} @@ -18,6 +19,7 @@ \documentclass[a4paper]{book} +\usepackage{xcolor} \usepackage{graphics} \usepackage{latexsym} \usepackage{marvosym} @@ -28,6 +30,7 @@ \documentclass[a4paper]{report} +\usepackage{xcolor} \usepackage{graphics} \usepackage{latexsym} \usepackage{marvosym} @@ -137,6 +140,12 @@ \end{verbatim} + +\begin{verbatim} +\makebox{ } +\end{verbatim} + + \begin{itemize} @@ -180,6 +189,11 @@ $_{}$ $^{}$ +\textcolor{}{} + +\large{} +\small{} + \\ \newpage diff --git a/xml2html b/xml2html index b960d22..0619df7 100755 --- a/xml2html +++ b/xml2html @@ -25,6 +25,6 @@ do esac shift done -TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` -xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE -xp $stylesheet $TMPFILE +#TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` +#xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE +xp $stylesheet $inputs diff --git a/xml2latex b/xml2latex index fca54c2..f2629c7 100755 --- a/xml2latex +++ b/xml2latex @@ -26,6 +26,6 @@ do esac shift done -TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` -xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE -xp --latex $stylesheet $TMPFILE +#TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` +#xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE +xp --latex $stylesheet $inputs diff --git a/xml2text b/xml2text index 82c01da..e30c017 100755 --- a/xml2text +++ b/xml2text @@ -25,6 +25,6 @@ do esac shift done -TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` -xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE -xp $stylesheet $TMPFILE +#TMPFILE=`mktemp /tmp/xmldoc.XXXXXX` +#xp $XSLDIR/preprocess.xsl $inputs >$TMPFILE +xp $stylesheet $inputs diff --git a/xp.c b/xp.c index e56e35a..fd997d4 100644 --- a/xp.c +++ b/xp.c @@ -23,9 +23,6 @@ #include #include #include -#ifdef LIBXML_DOCB_ENABLED -#include -#endif #ifdef LIBXML_XINCLUDE_ENABLED #include #endif @@ -68,15 +65,13 @@ static int docbook = 0; #ifdef LIBXML_HTML_ENABLED static int html = 0; #endif -#ifdef LIBXML_XINCLUDE_ENABLED -static int xinclude = 0; -#endif -static int profile = 0; static const char *params[16 + 1]; static int nbparams = 0; static const char *output = NULL; +void LatexEscape(xmlNodePtr node); + /* * The LaTeX translation table. Translate unicodes to LaTeX escape sequences. */ @@ -351,17 +346,16 @@ static void xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { xmlDocPtr res; -#ifdef LIBXML_XINCLUDE_ENABLED - if (xinclude) { - xmlXIncludeProcess(doc); + xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS); + + if (latex) + { + LatexEscape(xmlDocGetRootElement(doc)); } -#endif + if (output == NULL) { - if (profile) { - res = xsltProfileStylesheet(cur, doc, params, stderr); - } else { - res = xsltApplyStylesheet(cur, doc, params); - } + res = xsltApplyStylesheet(cur, doc, params); + xmlFreeDoc(doc); if (res == NULL) { fprintf(stderr, "no result for %s\n", filename); @@ -415,8 +409,8 @@ void LatexEscape(xmlNodePtr node) if (xmlNodeIsText(node)) { #ifdef DEBUG - fprintf(stderr, "\n-------- Text node (%d bytes):\n%s", - strlen(node->content), node->content); + fprintf(stderr, "\n-------- Text node at %p (%d bytes):\n%s", + node, strlen(node->content), node->content); #endif textlen = strlen(node->content); @@ -501,7 +495,7 @@ void LatexEscape(xmlNodePtr node) { for (child = node->children; child != 0; child = child->next) { - if (strcmp(child->name, "verbatim") != 0) + if (strcmp(child->name, "verbatim") != 0 ) { LatexEscape(child); } @@ -535,10 +529,6 @@ static void usage(const char *name) printf("\t otherwise XML Catalogs starting from \n"); printf("\t file:///etc/xml/catalog are activated by default\n"); #endif -#ifdef LIBXML_XINCLUDE_ENABLED - printf("\t--xinclude : do XInclude processing on document intput\n"); -#endif - printf("\t--profile or --norman : dump profiling informations \n"); } int @@ -597,22 +587,11 @@ main(int argc, char **argv) } else if ((!strcmp(argv[i], "-noout")) || (!strcmp(argv[i], "--noout"))) { noout++; -#ifdef LIBXML_DOCB_ENABLED - } else if ((!strcmp(argv[i], "-docbook")) || - (!strcmp(argv[i], "--docbook"))) { - docbook++; -#endif #ifdef LIBXML_HTML_ENABLED } else if ((!strcmp(argv[i], "-html")) || (!strcmp(argv[i], "--html"))) { html++; #endif - } else if ((!strcmp(argv[i], "-profile")) || - (!strcmp(argv[i], "--profile"))) { - profile++; - } else if ((!strcmp(argv[i], "-norman")) || - (!strcmp(argv[i], "--norman"))) { - profile++; } else if ((!strcmp(argv[i], "-nonet")) || (!strcmp(argv[i], "--nonet"))) { xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader); @@ -628,12 +607,6 @@ main(int argc, char **argv) xmlLoadCatalogs(catalogs); } #endif -#ifdef LIBXML_XINCLUDE_ENABLED - } else if ((!strcmp(argv[i], "-xinclude")) || - (!strcmp(argv[i], "--xinclude"))) { - xinclude++; - xsltSetXIncludeDefault(1); -#endif } else if ((!strcmp(argv[i], "-param")) || (!strcmp(argv[i], "--param"))) { i++; @@ -660,6 +633,7 @@ main(int argc, char **argv) } params[nbparams] = NULL; + xsltSetXIncludeDefault(1); /* * Replace entities with their content. */ @@ -730,20 +704,11 @@ main(int argc, char **argv) doc = htmlParseFile(argv[i], NULL); else #endif -#ifdef LIBXML_DOCB_ENABLED - if (docbook) - doc = docbParseFile(argv[i], NULL); - else -#endif doc = xmlParseFile(argv[i]); if (doc == NULL) { fprintf(stderr, "unable to parse %s\n", argv[i]); continue; } - if (latex) - { - LatexEscape(xmlDocGetRootElement(doc)); - } xsltProcess(doc, cur, argv[i]); } }

+

#SEC @@ -103,7 +201,6 @@

- SEC + SEC