===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxgentexi.c,v
retrieving revision 1.4
retrieving revision 1.12
diff -u -p -r1.4 -r1.12
--- OpenXM/src/util/oxgentexi.c	2005/04/05 13:12:06	1.4
+++ OpenXM/src/util/oxgentexi.c	2005/07/03 08:27:38	1.12
@@ -1,6 +1,8 @@
-/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.3 2005/04/04 12:38:32 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.11 2005/06/15 02:38:01 takayama Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 int Debug = 0;
 #define VMAX 20
 #define LIMIT   65536
@@ -16,6 +18,7 @@ struct item {
   char *shortDescription;
   char *description;
   char *algorithm;
+  char *changelog;
   char *examplev[VMAX];
   char *exampleDescv[VMAX];
   int examplec;
@@ -41,6 +44,7 @@ int GenExample = 0;
 int DebugItem = 0;
 char *Title = NULL;
 char *Author = NULL;
+char *InfoName = NULL;
 int NoSorting = 0;
 
 main(int argc,char *argv[]) {
@@ -71,6 +75,8 @@ main(int argc,char *argv[]) {
       DebugItem = 1;
     }else if (strcmp(argv[i],"--title") == 0) {
       i++; Title = str(argv[i]);
+    }else if (strcmp(argv[i],"--infoName") == 0) {
+      i++; InfoName = str(argv[i]);
     }else if (strcmp(argv[i],"--author") == 0) {
       i++; Author = str(argv[i]);
     }else if (strcmp(argv[i],"--noSorting") == 0) {
@@ -125,7 +131,7 @@ main(int argc,char *argv[]) {
 	exit(0);
   }
 
-  if (Title) printTitlePage(Title,Author);
+  if (Title) printTitlePage(Title,Author,InfoName);
 
   printMenu(stdout,items,n);
 
@@ -233,6 +239,8 @@ printItem(struct item *it) {
     printf("examplev[%d]=%s\n",i,it->examplev[i]);
   for (i=0; i <it->examplec; i++) 
     printf("exampleDescv[%d]=%s\n",i,it->exampleDescv[i]);
+  if (it->changelog != NULL)
+    printf("changelog=%s\n",it->changelog);
   for (i=0; i<it->refc; i++)
     printf("  refv[%d]=%s\n",i,it->refv[i]);
   if (it->author != NULL)
@@ -300,6 +308,7 @@ struct item *getItem() {
   int pp,pOld;
   int argc;
   int examplec = 0;
+  int i;
   it = newItem();
   do {
     p = nextToken(key,LIMIT);
@@ -371,6 +380,7 @@ struct item *getItem() {
     if (strcmp(key,"description:") == 0 ||
         strcmp(key,"algorithm:") == 0 ||
         strcmp(key,"author:") == 0 ||
+        strcmp(key,"changelog:") == 0 ||
         strcmp(key,"sortKey:") == 0 ||
         strcmp(key,"example:") == 0 ||
         strcmp(key,"example_description:") ==0 ) {
@@ -379,8 +389,11 @@ struct item *getItem() {
       do {
         pOld = p;
         p = nextToken(key,LIMIT);
-        /* printf("%s\n",key); */
-        if (key[strlen(key)-1] == ':') break; /* Next keyword. */
+        /* printf("key=%s\n",key); */
+        if (key[strlen(key)-1] == ':') {
+          pOld = p-strlen(key);
+          break; /* Next keyword. */
+        }
       }while (p >= 0);
       if (strcmp(key2,"description:") == 0) {
         it->description = str2(&(S[pp]),pOld-pp);
@@ -407,6 +420,9 @@ struct item *getItem() {
       if (strcmp(key2,"algorithm:") == 0) {
         it->algorithm = str2(&(S[pp]),pOld-pp);
       }
+      if (strcmp(key2,"changelog:") == 0) {
+        it->changelog = str2(&(S[pp]),pOld-pp);
+      }
     }else if (strcmp(key,"ref:") == 0) {
       argc = 0;
       while ((pp=nextToken(key,LIMIT)) >= 0) {
@@ -422,7 +438,11 @@ struct item *getItem() {
         }
       }
     }else{
-      fprintf(stderr,"Warning: unknown keyword << %s >> at %s. Ignored.\n",key, it->name);
+      fprintf(stderr,"Error: unknown keyword << %s >> at %s.\n",key, it->name);
+	  fprintf(stderr,"       The error occurs around ");
+	  for (i=pp ; i < p; i++) fputc(S[i],stderr);
+	  fprintf(stderr,"\n\n");
+	  exit(1);
       p = nextToken(key,LIMIT);
     }
   }while (p >= 0);
@@ -467,13 +487,21 @@ printTexi(FILE *fp, struct item *it) {
 
 printTexi_common(FILE *fp,struct item *it) {
   int i;
-  if (it->description != NULL) {
-    fprintf(fp,"%s\n\n",it->description);
+  if ((it->shortDescription != NULL) || (it->refc >0)
+      || (it->examplec > 0)) {
+    if (it->description != NULL) { 
+      fprintf(fp,"\nDescription:\n");
+      fprintf(fp,"@quotation\n%s\n@end quotation\n\n",it->description);
+    }
+  }else {
+    if (it->description != NULL) { 
+      fprintf(fp,"%s\n\n",it->description);
+    }
   }
 
   if (it->algorithm != NULL) {
-    fprintf(fp,"\n\n@noindent\nAlgorithm: \n");
-    fprintf(fp,"%s\n\n",it->algorithm);
+    fprintf(fp,"\n\n@noindent\nAlgorithm: \n@quotation\n");
+    fprintf(fp,"%s\n@end quotation\n",it->algorithm);
   }
 
   if (it->examplec > 0) {
@@ -497,14 +525,17 @@ printTexi_common(FILE *fp,struct item *it) {
   if (it->author != NULL) {
     fprintf(fp,"Author : %s\n\n",it->author);
   }
+  if (it->changelog != NULL) {
+    fprintf(fp,"\n\nChange Log:\n@quotation\n");
+    fprintf(fp,"%s\n@end quotation\n",it->changelog);
+  }
   if (it->refc > 0) {
-    fprintf(fp,"@table @t\n");
-    fprintf(fp,"@item References\n");
+    fprintf(fp,"\n\nReferences:\n@quotation\n");
     for (i=0; i <it->refc; i++) {
-      fprintf(fp,"@code{%s} ",it->refv[i]);
-      if (i != it->refc-1) fprintf(fp,", ");
+      fprintf(fp," @code{%s} ",it->refv[i]);
+      if (i != it->refc-1) fprintf(fp,", \n");
     }
-    fprintf(fp,"\n@end table\n");
+    fprintf(fp,"\n@end quotation\n");
   }
   fprintf(fp,"\n");
 }
@@ -512,7 +543,7 @@ printTexi_common(FILE *fp,struct item *it) {
 printTexi0(FILE *fp, struct item *it) {
   int i;
 
-  fprintf(fp,"@c DO NOT EDIT THIS FILE. Generated by gentexi0.\n");
+  fprintf(fp,"@c DO NOT EDIT THIS FILE. Generated by gentexi for asir function item.\n");
   if (it == NULL) {
     fprintf(fp,"@c item is NULL.\n");
     return ;
@@ -586,7 +617,7 @@ printTexi1(FILE *fp, struct item *it) {
   int i;
   /* For  it->type == 1 */
 
-  fprintf(fp,"@c DO NOT EDIT THIS FILE. Generated by gentexi1.\n");
+  fprintf(fp,"@c DO NOT EDIT THIS FILE. Generated by gentexi for verbose item.\n");
   if (it == NULL) {
     fprintf(fp,"@c item is NULL.\n");
     return ;
@@ -620,7 +651,9 @@ outputExample(FILE *fp,char *s) {
 		fprintf(fp,":"); i += 5;
 	  }else fprintf(fp,"@@");
     }else{
-	  fputc(s[i],fp);
+	  if (s[i] == '{') {fprintf(fp,"%s","@{"); }
+	  else if (s[i] == '}') {fprintf(fp,"%s","@}");}
+	  else fputc(s[i],fp);
     }
   }
 }
@@ -652,7 +685,7 @@ outputOfExample(char *com) {
   putchar('\n');
 }
 
-printTitlePage(char *title, char *author) {
+printTitlePage(char *title, char *author,char *infoName) {
   printf("\\input texinfo\n");
   printf("@def@colon{:}\n\n");
   printf("@iftex\n");
@@ -662,7 +695,8 @@ printTitlePage(char *title, char *author) {
   printf("@end iftex\n");
   printf("@overfullrule=0pt\n");
 
-  printf("@setfilename %s\n",Title);
+  if (infoName != NULL) printf("@setfilename %s\n",infoName);
+  else printf("@setfilename asir-contrib-infoName-is-not-set\n");
   printf("@settitle %s\n",Title);
 
   printf("@titlepage\n");
@@ -675,6 +709,15 @@ printTitlePage(char *title, char *author) {
 }
 
 printBye() {
+  printf("@node Index,,, Top\n");
+  printf("@unnumbered Index\n");
+  printf("@printindex fn\n");
+  printf("@printindex cp\n");
+  printf("@iftex\n");
+  printf("@vfill @eject\n");
+  printf("@end iftex\n");
+  printf("@summarycontents\n");
+  printf("@contents\n");
   printf("\n@bye\n");
 }
 /* Old file was OpenXM/src/asir-contrib/packages/doc/gentexi.c */