Fix framed output.

16 years ago · 62b697c229
parent 050d7a82cb
commit 62b697c229
3 changed files with 16 additions and 7 deletions
--- a/doc/reference.html
+++ b/doc/reference.html
@ -1303,10 +1303,10 @@ void mxmlSetWrapMargin (<br>
 <h4 class="parameters">Parameters</h4>
 <dl>
 <dt>column</dt>
-<dd class="description">Column for wrapping</dd>
+<dd class="description">Column for wrapping, 0 to disable wrapping</dd>
 </dl>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">Wrapping is disabled when &quot;column&quot; is &lt;= 0.
+<p class="discussion">Wrapping is disabled when &quot;column&quot; is 0.

 </p>
 <h3 class="function"><a name="mxmlWalkNext">mxmlWalkNext</a></h3>
--- a/mxml.xml
+++ b/mxml.xml
@ -1023,12 +1023,12 @@ The node is not changed if it is not a text node.</description>
  <function name="mxmlSetWrapMargin">
    <description>Set the the wrap margin when saving XML data.

-Wrapping is disabled when &quot;column&quot; is &lt;= 0.
+Wrapping is disabled when &quot;column&quot; is 0.

@since Mini-XML 2.3@</description>
    <argument name="column" direction="I">
      <type>int</type>
-      <description>Column for wrapping</description>
+      <description>Column for wrapping, 0 to disable wrapping</description>
    </argument>
  </function>
  <function name="mxmlWalkNext">
--- a/mxmldoc.c
+++ b/mxmldoc.c
@ -2936,13 +2936,22 @@ write_html(const char  *section,	/* I - Section */
      return;
    }

-    write_html_head(out, section, title, cssfile);
+    fputs("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" "
+          "\"http://www.w3.org/TR/html4/frameset.dtd\">\n"
+	  "<html>\n"
+	  "<head>\n"
+	  "<title>", out);
+    write_string(out, title, OUTPUT_HTML);
+    fputs("</title>\n", out);

-    fputs("<frameset cols=\"250,*\">\n", out);
+    if (section)
+      fprintf(out, "<meta name=\"keywords\" content=\"%s\">\n", section);
+
+    fputs("<meta name=\"creator\" content=\"" MXML_VERSION "\">\n"
+          "<frameset cols=\"250,*\">\n", out);
    fprintf(out, "<frame src=\"%s-toc.html\">\n", basename);
    fprintf(out, "<frame name=\"body\" src=\"%s-body.html\">\n", basename);
    fputs("</frameset>\n"
-          "</body>\n"
          "</html>\n", out);
    fclose(out);