[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] HTML output fixes
|
From: |
Ville Skyttä |
|
Subject: |
[PATCH] HTML output fixes |
|
Date: |
31 Mar 2002 16:05:55 +0300 |
Here's a patch with some HTML output related fixes. It's against
texinfo-pretest (4.1d) downloaded 2002-03-30.
diff -Nru texinfo-4.1d.orig/doc/texinfo.txi texinfo-4.1d/doc/texinfo.txi
--- texinfo-4.1d.orig/doc/texinfo.txi Thu Mar 28 18:36:00 2002
+++ texinfo-4.1d/doc/texinfo.txi Sun Mar 31 02:32:32 2002
@@ -3589,7 +3589,7 @@
This will produce the following output in the @samp{<head>} of the HTML:
@example
-<meta name=description content="descriptive text.">
+<meta name="description" content="descriptive text.">
@end example
@code{@@documentdescription} must be specified before the first node of
diff -Nru texinfo-4.1d.orig/makeinfo/footnote.c texinfo-4.1d/makeinfo/footnote.c
--- texinfo-4.1d.orig/makeinfo/footnote.c Sat Mar 2 17:05:29 2002
+++ texinfo-4.1d/makeinfo/footnote.c Sun Mar 31 02:41:42 2002
@@ -237,7 +237,7 @@
`fn-<n>', though that's unlikely. */
if (html)
{
- add_html_elt ("<a rel=footnote href=");
+ add_html_elt ("<a rel=\"footnote\" href=");
add_word_args ("\"#fn-%d\"><sup>%s</sup></a>",
current_footnote_number, marker);
}
@@ -351,7 +351,7 @@
already_outputting_pending_notes++;
execute_string ("%s", footnote->note);
already_outputting_pending_notes--;
- add_word ("</p>\n");
+ add_word ("</p>\n</li>\n");
}
else
{
diff -Nru texinfo-4.1d.orig/makeinfo/html.c texinfo-4.1d/makeinfo/html.c
--- texinfo-4.1d.orig/makeinfo/html.c Sat Mar 23 22:39:49 2002
+++ texinfo-4.1d/makeinfo/html.c Sun Mar 31 02:53:46 2002
@@ -53,10 +53,10 @@
if (!document_description)
document_description = html_title;
- add_word_args ("<meta name=description content=\"%s\">\n",
+ add_word_args ("<meta name=\"description\" content=\"%s\">\n",
document_description);
- add_word_args ("<meta name=generator content=\"makeinfo %s\">\n", VERSION);
- add_word ("<link href=\"http://www.gnu.org/software/texinfo/\";
rel=generator-home>\n");
+ add_word_args ("<meta name=\"generator\" content=\"makeinfo %s\">\n",
VERSION);
+ add_word ("<link href=\"http://www.gnu.org/software/texinfo/\";
rel=\"generator-home\">\n");
if (copying_text)
{ /* copying_text has already been fully expanded in
diff -Nru texinfo-4.1d.orig/makeinfo/insertion.c
texinfo-4.1d/makeinfo/insertion.c
--- texinfo-4.1d.orig/makeinfo/insertion.c Thu Mar 28 18:33:49 2002
+++ texinfo-4.1d/makeinfo/insertion.c Sun Mar 31 02:43:12 2002
@@ -334,7 +334,7 @@
start = *enumeration_arg - 'a' + 1;
}
- add_word_args ("<ol type=%c start=%d>\n", type, start);
+ add_word_args ("<ol type=\"%c\" start=\"%d\">\n", type, start);
}
/* Conditionally parse based on the current command name. */
diff -Nru texinfo-4.1d.orig/makeinfo/node.c texinfo-4.1d/makeinfo/node.c
--- texinfo-4.1d.orig/makeinfo/node.c Tue Mar 26 18:16:29 2002
+++ texinfo-4.1d/makeinfo/node.c Sun Mar 31 02:52:33 2002
@@ -928,7 +928,7 @@
tem = expansion (next, 0);
add_word (",\n");
add_word (_("Next:"));
- add_word ("<a rel=next accesskey=n href=\"");
+ add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
@@ -938,7 +938,7 @@
tem = expansion (prev, 0);
add_word (",\n");
add_word (_("Previous:"));
- add_word ("<a rel=previous accesskey=p href=\"");
+ add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
@@ -948,7 +948,7 @@
tem = expansion (up, 0);
add_word (",\n");
add_word (_("Up:"));
- add_word ("<a rel=up accesskey=u href=\"");
+ add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
diff -Nru texinfo-4.1d.orig/makeinfo/texinfo.xsl
texinfo-4.1d/makeinfo/texinfo.xsl
--- texinfo-4.1d.orig/makeinfo/texinfo.xsl Thu Jun 7 21:35:23 2001
+++ texinfo-4.1d/makeinfo/texinfo.xsl Sun Mar 31 02:50:46 2002
@@ -7,12 +7,12 @@
<!-- root rule -->
<xsl:template match="/">
- <HTML>
- <HEAD><TITLE>
+ <html>
+ <head><title>
<xsl:apply-templates select="TEXINFO/SETTITLE" mode="head"/>
- </TITLE></HEAD>
- <BODY BGCOLOR="#FFFFFF"><xsl:apply-templates/>
-</BODY></HTML>
+ </title></head>
+ <body bgcolor="#FFFFFF"><xsl:apply-templates/>
+</body></html>
</xsl:template>
@@ -46,7 +46,8 @@
<!-- The node -->
<xsl:template match="TEXINFO/NODE">
- <hr><p>
+ <hr/>
+ <p>
<xsl:apply-templates select="NODENAME" mode="select"/>
<xsl:apply-templates select="NODEPREV" mode="select"/>
<xsl:apply-templates select="NODEUP" mode="select"/>
@@ -56,7 +57,7 @@
<ol>
<xsl:apply-templates select=".//FOOTNOTE" mode="footnote"/>
</ol>
- </p></hr>
+ </p>
</xsl:template>
<xsl:template match="TEXINFO/NODE/NODENAME" mode="select">
@@ -127,7 +128,7 @@
<xsl:apply-templates select="MENUTITLE"/>
</a>:
<xsl:apply-templates select="MENUCOMMENT"/>
-<br></br>
+ <br/>
</xsl:template>
<xsl:template match="//MENU/MENUENTRY/MENUNODE">
@@ -239,4 +240,3 @@
</xsl:template>
</xsl:stylesheet>
-
diff -Nru texinfo-4.1d.orig/makeinfo/toc.c texinfo-4.1d/makeinfo/toc.c
--- texinfo-4.1d.orig/makeinfo/toc.c Mon Mar 18 21:43:19 2002
+++ texinfo-4.1d/makeinfo/toc.c Sun Mar 31 02:57:13 2002
@@ -75,8 +75,8 @@
if (html)
{
/* We need to insert the expanded node name into the TOC, so
- that when we eventually output the TOC, its <A REF= link will
- point to the <A NAME= tag created by cm_node in the navigation
+ that when we eventually output the TOC, its <a href= link will
+ point to the <a name= tag created by cm_node in the navigation
bar. We cannot expand the containing_node member, for the
reasons explained in the WARNING below. We also cannot wait
with the node name expansion until the TOC is actually output,
diff -Nru texinfo-4.1d.orig/util/install-info-html
texinfo-4.1d/util/install-info-html
--- texinfo-4.1d.orig/util/install-info-html Tue Dec 19 17:24:51 2000
+++ texinfo-4.1d/util/install-info-html Sun Mar 31 02:37:28 2002
@@ -130,8 +130,8 @@
# head
cat >> $index_file <<EOF
-<html>
-<title>Info documentation index</title>
+<html>
+<head><title>Info documentation index</title></head>
<body>
<h1>Info documentation index</h1>
This is the directory file \`index.html' a.k.a. \`DIR', which contains the
@@ -144,7 +144,7 @@
#list
for i in $document_dirs; do
- echo "<li> <a href=$i/$i.html>$i</a>"
+ echo "<li> <a href=\"$i/$i.html\">$i</a></li>"
done >> $index_file
# foot
Cheers,
--
Ville Skyttä
address@hidden
- [PATCH] HTML output fixes,
Ville Skyttä <=