===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxgentexi.c,v
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- OpenXM/src/util/oxgentexi.c	2005/04/04 07:36:44	1.2
+++ OpenXM/src/util/oxgentexi.c	2005/07/21 11:29:16	1.13
@@ -1,6 +1,8 @@
-/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.1 2005/04/04 06:10:58 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.12 2005/07/03 08:27:38 ohara 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;
@@ -39,6 +42,10 @@ char *Lang="en";
 int Include = 0;
 int GenExample = 0;
 int DebugItem = 0;
+char *Title = NULL;
+char *Author = NULL;
+char *InfoName = NULL;
+int NoSorting = 0;
 
 main(int argc,char *argv[]) {
   char *t;
@@ -66,6 +73,14 @@ main(int argc,char *argv[]) {
       Debug = 1;
     }else if (strcmp(argv[i],"--debugItem") == 0) {
       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) {
+      NoSorting = 1;
     }else {
       fprintf(stderr,"Unknown option\n"); exit(1);
     }
@@ -102,9 +117,12 @@ main(int argc,char *argv[]) {
       items[n++] = tt;
     }
   }
-  if (Debug) fprintf(stderr,"Sorting...\n");
-  shell(items,n);
-  if (Debug) fprintf(stderr,"Done.\n");
+  
+  if (!NoSorting) {
+    if (Debug) fprintf(stderr,"Sorting...\n");
+    shell(items,n);
+    if (Debug) fprintf(stderr,"Done.\n");
+  }
 
   if (DebugItem) {
 	for (i=0; i<n; i++) {
@@ -113,11 +131,15 @@ main(int argc,char *argv[]) {
 	exit(0);
   }
 
+  if (Title) printTitlePage(Title,Author,InfoName);
+
   printMenu(stdout,items,n);
 
   for (i=0; i<n; i++) {
     printTexi(stdout,items[i]);
   }
+
+  if (Title) printBye();
   exit(0);  
 }
 
@@ -217,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)
@@ -284,6 +308,7 @@ struct item *getItem() {
   int pp,pOld;
   int argc;
   int examplec = 0;
+  int i;
   it = newItem();
   do {
     p = nextToken(key,LIMIT);
@@ -302,6 +327,7 @@ struct item *getItem() {
   if (strcmp(key,"(") != 0) {
     pp = p+1;
     it->type = 1; /* For non-functions */
+    goto LL ;
   }else{
     it->type = 0; /* For functions */
     argc = 0; 
@@ -346,13 +372,15 @@ struct item *getItem() {
   }while (p >= 0);
   it->shortDescription = str2(&(S[pp]),pOld-pp);
 
-
+ LL: ;
+  if (it->type == 1 ) {strcpy(key,"description:"); p++; }
   do {
     /* Get Description or Examples */
     if (strcmp(key,"end:") == 0) break;
     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 ) {
@@ -361,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);
@@ -389,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) {
@@ -404,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);
@@ -449,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) {
@@ -466,7 +512,7 @@ printTexi_common(FILE *fp,struct item *it) {
         fprintf(fp,"Example %d:\n",i);
       }
       fprintf(fp,"@example\n");
-      fprintf(fp,"%s\n",it->examplev[i]);
+      outputExample(fp,it->examplev[i]);
       if (GenExample) {
         outputOfExample(it->examplev[i]);
       }
@@ -479,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");
 }
@@ -494,11 +543,12 @@ 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 ;
   }
+  fprintf(fp,"@c sortKey: %s\n",it->sortKey);
   if (it->name == NULL) {
     fprintf(fp,"@c item name is missing.\n");
     return ;
@@ -567,11 +617,12 @@ 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 ;
   }
+  fprintf(fp,"@c sortKey: %s\n",it->sortKey);
 
   if (it->shortDescription != NULL) {
     for (i=0; i<strlen(it->shortDescription); i++) {
@@ -589,6 +640,30 @@ printTexi1(FILE *fp, struct item *it) {
   printTexi_common(fp,it);  
 }
 
+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;}
+	  else if (s[i+1] == '}') {fprintf(fp,"%s","@}"); i += 1;}
+	  else if (s[i+1] == '@') {fprintf(fp,"%s","@@"); i += 1;}
+	  else if (strncmp(&(s[i+1]),"colon",5)==0) {
+		fprintf(fp,":"); i += 5;
+	  }else fprintf(fp,"@@");
+    }else{
+	  if (s[i] == '{') {fprintf(fp,"%s","@{"); }
+	  else if (s[i] == '}') {fprintf(fp,"%s","@}");}
+	  else fputc(s[i],fp);
+    }
+  }
+}
+
 outputOfExample(char *com) {
   FILE *fp2;
   int c;
@@ -616,4 +691,39 @@ outputOfExample(char *com) {
   putchar('\n');
 }
 
+printTitlePage(char *title, char *author,char *infoName) {
+  printf("\\input texinfo\n");
+  printf("@def@colon{:}\n\n");
+  printf("@iftex\n");
+  printf("@catcode`@#=6\n");
+  printf("@def@b#1{{@bf@gt #1}}\n");
+  printf("@catcode`@#=@other\n");
+  printf("@end iftex\n");
+  printf("@overfullrule=0pt\n");
+
+  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");
+  printf("@title %s\n",Title);
+  printf("@subtitle Edition : auto generated by oxgentexi on @today{}\n");
+  if (author != NULL) printf("@author %s\n",author);
+  printf("@end titlepage\n\n");
+  printf("@synindex vr fn\n");
+  printf("@node Top,, (dir), (dir)\n\n");
+}
+
+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 */