===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxgentexi.c,v
retrieving revision 1.6
retrieving revision 1.18
diff -u -p -r1.6 -r1.18
--- OpenXM/src/util/oxgentexi.c	2005/04/06 09:26:29	1.6
+++ OpenXM/src/util/oxgentexi.c	2017/03/28 12:00:04	1.18
@@ -1,6 +1,8 @@
-/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.5 2005/04/06 05:08:11 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.17 2017/03/19 00:22:16 takayama Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 int Debug = 0;
 #define VMAX 20
 #define LIMIT   65536
@@ -16,8 +18,10 @@ struct item {
   char *shortDescription;
   char *description;
   char *algorithm;
+  char *changelog;
   char *examplev[VMAX];
   char *exampleDescv[VMAX];
+  char *options;
   int examplec;
   int refc;
   char *refv[VMAX];
@@ -29,6 +33,18 @@ struct item *getItem(void);
 char *str(char *key);
 char *str2(char *key,int size);
 int cmpItem(struct item *it,struct item *it2);
+void printItem(struct item *it);
+void shell(struct item *v[],int n);
+void printMenu(FILE *fp, struct item **it, int n);
+void printBye();
+void printTitlePage(char *title, char *author,char *infoName);
+void printItem(struct item *it);
+void printTexi(FILE *fp, struct item *it);
+void printTexi_common(FILE *fp,struct item *it);
+void printTexi0(FILE *fp, struct item *it);
+void printTexi1(FILE *fp, struct item *it);
+void outputExample(FILE *fp,char *s);
+void outputOfExample(char *com);
 
 char *S;
 int Ssize = 256;
@@ -41,11 +57,13 @@ int GenExample = 0;
 int DebugItem = 0;
 char *Title = NULL;
 char *Author = NULL;
+char *InfoName = NULL;
 int NoSorting = 0;
 
+int
 main(int argc,char *argv[]) {
   char *t;
-  int p,c,n,i;
+  int c,n,i;
   struct item *tt;
   struct item *items[ITEMMAX];
 
@@ -71,6 +89,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 +145,7 @@ main(int argc,char *argv[]) {
 	exit(0);
   }
 
-  if (Title) printTitlePage(Title,Author);
+  if (Title) printTitlePage(Title,Author,InfoName);
 
   printMenu(stdout,items,n);
 
@@ -137,6 +157,7 @@ main(int argc,char *argv[]) {
   exit(0);  
 }
 
+int
 genInclude(char *name) {
   char fname[4098];
   FILE *fp;
@@ -156,6 +177,7 @@ genInclude(char *name) {
   return 0;
 }
 
+int
 cmpItem(struct item *it,struct item *it2) {
   return strcmp(it->sortKey,it2->sortKey);
 }
@@ -166,13 +188,11 @@ struct item * newItem(){
     fprintf(stderr,"newItem: No more memory.\n");
     exit(20);
   }
-  a->argc = 0; a->optc = 0; a->refc=0; a->examplec = 0;
-  a->type=0;
-  a->category = a->category2 = a->name = a->shortDescription
-    = a->description = a->author = a->algorithm = a->sortKey = NULL; 
+  memset(a, 0, sizeof(struct item));
   return a;
 }
-  
+
+int
 nextToken(char *key,int n) {
   static int pos = 0;
   int i = 0;
@@ -210,6 +230,7 @@ nextToken(char *key,int n) {
   return pos;
 }
 
+void
 printItem(struct item *it) {
   int i;
   if (it == NULL) return;
@@ -233,6 +254,10 @@ 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);
+  if (it->options != NULL)
+    printf("options=%s\n",it->options);
   for (i=0; i<it->refc; i++)
     printf("  refv[%d]=%s\n",i,it->refv[i]);
   if (it->author != NULL)
@@ -266,7 +291,7 @@ char *str2(char *key,int size) {
   return s;
 }
 char *getCategory(char *key) {
-  int i,n;
+  int i;
   char *s;
   s = str(key);
   for (i=0; i<strlen(s); i++) {
@@ -278,9 +303,9 @@ char *getCategory(char *key) {
   return s;
 }
 char *getCategory2(char *key) {
-  int i,n;
+  int i;
   char *s;
-  int count;
+  int count=0;
   s = str(key);
   for (i=0; i<strlen(s); i++) {
     if ((s[i] == '_') || (s[i] == '.')) count++;
@@ -372,9 +397,14 @@ 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 ) {
+        strcmp(key,"example_description:") ==0 ||
+        strcmp(key,"options:") ==0  ||
+        strcmp(key,"Options:") ==0  ||
+        strcmp(key,"Example:") ==0 
+        ) {
       pp = p;
       strcpy(key2,key);
       do {
@@ -389,7 +419,7 @@ struct item *getItem() {
       if (strcmp(key2,"description:") == 0) {
         it->description = str2(&(S[pp]),pOld-pp);
       }
-      if (strcmp(key2,"example:") == 0) {
+      if ((strcmp(key2,"example:") == 0) || (strcmp(key2,"Example:") == 0)) {
         it->examplev[examplec++] = str2(&(S[pp]),pOld-pp);
         it->exampleDescv[examplec-1] = "";
         it->examplec = examplec;
@@ -411,6 +441,12 @@ 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);
+      }
+      if ((strcmp(key2,"options:") == 0) || (strcmp(key2,"Options:")==0)) {
+        it->options = str2(&(S[pp]),pOld-pp);
+      }
     }else if (strcmp(key,"ref:") == 0) {
       argc = 0;
       while ((pp=nextToken(key,LIMIT)) >= 0) {
@@ -426,11 +462,10 @@ struct item *getItem() {
         }
       }
     }else{
-      fprintf(stderr,"Error: unknown keyword << %s >> at %s.\n",key, it->name);
+      fprintf(stderr,"Warning: 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);
@@ -438,6 +473,7 @@ struct item *getItem() {
   return it;
 }
 
+void
 shell(struct item *v[],int n) {
   int gap,i,j;
   struct item *temp;
@@ -453,6 +489,7 @@ shell(struct item *v[],int n) {
   }
 }
 
+void
 printMenu(FILE *fp, struct item **it, int n) {
   int i,m;
 
@@ -467,21 +504,32 @@ printMenu(FILE *fp, struct item **it, int n) {
   }
 }
 
+void
 printTexi(FILE *fp, struct item *it) {
-  int i;
-  if (it->type == 1) return printTexi1(fp,it);
-  else return printTexi0(fp,it);
+  if (it->type == 1) printTexi1(fp,it);
+  else printTexi0(fp,it);
+  return;
 }
 
+void
 printTexi_common(FILE *fp,struct item *it) {
   int i;
-  if (it->description != NULL) {
-    fprintf(fp,"%s\n\n",it->description);
+  int elen;
+  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) {
@@ -496,7 +544,9 @@ printTexi_common(FILE *fp,struct item *it) {
       if (GenExample) {
         outputOfExample(it->examplev[i]);
       }
-      fprintf(fp,"@end example\n");
+      elen=strlen(it->examplev[i]);
+      if ((it->examplev[i])[elen-1] == '\n') fprintf(fp,"@end example\n");
+      else fprintf(fp,"\n@end example\n");
       if (it->exampleDescv[i] != NULL && strlen(it->exampleDescv[i]) > 0) {
         fprintf(fp,"%s\n\n",it->exampleDescv[i]);
       }
@@ -505,18 +555,26 @@ 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->options != NULL) {
+    fprintf(fp,"\nOptinal variabes:");
+    fprintf(fp,"%s\n\n",it->options);
+  }
   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");
 }
 
+void
 printTexi0(FILE *fp, struct item *it) {
   int i;
 
@@ -590,6 +648,7 @@ printTexi0(FILE *fp, struct item *it) {
   printTexi_common(fp,it);  
 }
 
+void
 printTexi1(FILE *fp, struct item *it) {
   int i;
   /* For  it->type == 1 */
@@ -617,8 +676,15 @@ printTexi1(FILE *fp, struct item *it) {
   printTexi_common(fp,it);  
 }
 
+void
 outputExample(FILE *fp,char *s) {
   int i;
+  /* Remove unnecessary spaces at the tail. */
+  for (i=strlen(s)-1; i>=0; i--) {
+	if (s[i] == '\n') break;
+	else if (s[i] <= ' ') {s[i] = 0;}
+	else break;
+  }
   for (i=0; s[i] != 0; i++) {
 	if (s[i] == '@') {
 	  if (s[i+1] == '{') {fprintf(fp,"%s","@{"); i += 1;}
@@ -635,6 +701,7 @@ outputExample(FILE *fp,char *s) {
   }
 }
 
+void
 outputOfExample(char *com) {
   FILE *fp2;
   int c;
@@ -662,7 +729,8 @@ outputOfExample(char *com) {
   putchar('\n');
 }
 
-printTitlePage(char *title, char *author) {
+void
+printTitlePage(char *title, char *author,char *infoName) {
   printf("\\input texinfo\n");
   printf("@def@colon{:}\n\n");
   printf("@iftex\n");
@@ -672,7 +740,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");
@@ -684,7 +753,17 @@ printTitlePage(char *title, char *author) {
   printf("@node Top,, (dir), (dir)\n\n");
 }
 
+void
 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 */