Simplify treatment of the copyright notice, now I've also simplified

the preamble: \copyright paragraphs are now treated identically to
normal paragraphs (so they appear precisely where they're put
instead of in a fixed location), _except_ that the Windows Help
backend also copies their text into the help file's copyright slot.

[originally from svn r4001]

1 files changed, 2 insertions, 11 deletions

diff --git a/bk_xhtml.c b/bk_xhtml.c
index 0406f45..745cce5 100644
--- a/bk_xhtml.c
+++ b/bk_xhtml.c
@@ -872,7 +872,7 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform)
     }
   }
 
-  /* Do the preamble and copyright */
+  /* Do the preamble */
   for (p = sourceform; p; p = p->next)
   {
     if (p->type == para_Chapter || p->type == para_Heading ||
@@ -886,15 +886,6 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform)
 	break;
     }
   }
-  for (p = sourceform; p; p = p->next)
-  {
-    if (p->type == para_Copyright)
-    {
-      fprintf(fp, "<p>");
-      xhtml_para(fp, p->words, FALSE);
-      fprintf(fp, "</p>\n");
-    }
-  }
 
   xhtml_do_contents(fp, file);
   xhtml_do_sections(fp, file->sections);
@@ -1099,7 +1090,6 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end,
      case para_BR:
      case para_Biblio:		       /* only touch BiblioCited */
      case para_VersionID:
-     case para_Copyright:
      case para_NoCite:
      case para_Title:
        break;
@@ -1123,6 +1113,7 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end,
         break;
 
       case para_Normal:
+      case para_Copyright:
         fprintf(fp, "\n<p>");
         xhtml_para(fp, p->words, indexable);
         fprintf(fp, "</p>\n");