Don't embed links or other markup in title attributes.

Update copyright/license stuff.
16 years ago · 16c5e31280
parent 509bbfaf20
commit 16c5e31280
3 changed files with 16 additions and 41 deletions
--- a/22
+++ b/22
@ -1,4 +1,4 @@
-README - 2008-11-28
+README - 2009-01-12
 -------------------


@ -184,21 +184,5 @@ GETTING HELP AND REPORTING PROBLEMS

 LEGAL STUFF

-    The Mini-XML library is Copyright 2003-2008 by Michael Sweet.
-
-    This library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Library General
-    Public License as published by the Free Software Foundation;
-    either version 2 of the License, or (at your option) any
-    later version.
-
-    This library is distributed in the hope that it will be
-    useful, but WITHOUT ANY WARRANTY; without even the implied
-    warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU Library General Public License for
-    more details.
-
-    You should have received a copy of the GNU Library General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-    02139, USA.
+    The Mini-XML library is Copyright 2003-2009 by Michael Sweet.
+    License terms are described in the file "COPYING".
--- a/doc/intro.html
+++ b/doc/intro.html
@ -1,7 +1,7 @@
 <html>
 <head>
 	<title>Mini-XML Programmers Manual, Version 2.6</title>
-	<meta name='copyright' content='Copyright 2003-2008'>
+	<meta name='copyright' content='Copyright 2003-2009'>
 	<meta name='author' content='Michael R. Sweet'>
 	<meta name='keywords' content='XML, C, C++, library'>
 </head>
@ -113,15 +113,15 @@ Examples and their meanings and uses are explained below:</p>

 <dl>

-	<dt><code>lpstat</code><br>
-	<code>lpstat(1)</code></dt>
+	<dt><code>mxmldoc</code><br>
+	<code>mxmldoc(1)</code></dt>

 	<dd>The names of commands; the first mention of a command
 	or function in a chapter is followed by a manual page
 	section number.<br><br></dd>

 	<dt><var>/var</var><br>
-	<var>/usr/share/cups/data/testprint.ps</var></dt>
+	<var>/etc/hosts</var></dt>

 	<dd>File and directory names.<br><br></dd>

@ -192,21 +192,8 @@ manual:</p>
 <!-- NEED 6 -->
 <h2>Legal Stuff</h2>

-<p>The Mini-XML library is copyright 2003-2008 by Michael
-Sweet.</p>
-
-<p>This library is free software; you can redistribute it and/or
-modify it under the terms of the <a
-href='#LICENSE'>GNU Library General Public
-License</a> as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later
-version.</p>
-
-<p>This library is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for
-more details.</p>
+<p>The Mini-XML library is copyright 2003-2009 by Michael Sweet. License terms
+are described in <a href='#LICENSE'>Appendix A - Mini-XML License</a>.</p>

 </body>
 </html>
--- a/mxmldoc.c
+++ b/mxmldoc.c
@ -5,7 +5,7 @@
 * Documentation generator using Mini-XML, a small XML-like file parsing
 * library.
 *
- * Copyright 2003-2008 by Michael Sweet.
+ * Copyright 2003-2009 by Michael Sweet.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@ -2739,8 +2739,10 @@ write_description(
      else
        ptr --;

-      if (element)
+      if (element[0])
        fprintf(out, "<code>%s</code>", start);
+      else if (element)
+        fputs(start, out);
      else
        fprintf(out, "\\fB%s\\fR", start);
    }
@ -2755,8 +2757,10 @@ write_description(
      else
        ptr --;

-      if (element)
+      if (element[0])
        fprintf(out, "<a href=\"#%s\"><code>%s</code></a>", start, start);
+      else if (element)
+        fputs(start, out);
      else
        fprintf(out, "\\fI%s\\fR", start);
    }