===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxgentexi.c,v
retrieving revision 1.1
retrieving revision 1.8
diff -u -p -r1.1 -r1.8
--- OpenXM/src/util/oxgentexi.c	2005/04/04 06:10:58	1.1
+++ OpenXM/src/util/oxgentexi.c	2005/04/14 02:21:49	1.8
@@ -1,9 +1,9 @@
-/*  $OpenXM$ */
+/*  $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.7 2005/04/11 11:13:32 takayama Exp $ */
 
 #include <stdio.h>
 int Debug = 0;
 #define VMAX 20
-#define LIMIT 1024
+#define LIMIT   65536
 #define ITEMMAX 1024
 struct item {
   char *category;  /* base */
@@ -22,6 +22,8 @@ struct item {
   int refc;
   char *refv[VMAX];
   char *author;
+  char *sortKey;
+  int type;
 };
 struct item *getItem(void);
 char *str(char *key);
@@ -36,6 +38,11 @@ char *Category=NULL;
 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;
@@ -61,6 +68,16 @@ main(int argc,char *argv[]) {
       GenExample = 1;
     }else if (strcmp(argv[i],"--debug") == 0) {
       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);
     }
@@ -97,15 +114,29 @@ 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++) {
+	  printItem(items[i]);
+	}
+	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);  
 }
 
@@ -129,7 +160,7 @@ genInclude(char *name) {
 }
 
 cmpItem(struct item *it,struct item *it2) {
-  return strcmp(it->name,it2->name);
+  return strcmp(it->sortKey,it2->sortKey);
 }
 struct item * newItem(){
   struct item *a;
@@ -139,8 +170,9 @@ struct item * newItem(){
     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 = NULL; 
+    = a->description = a->author = a->algorithm = a->sortKey = NULL; 
   return a;
 }
   
@@ -208,6 +240,8 @@ printItem(struct item *it) {
     printf("  refv[%d]=%s\n",i,it->refv[i]);
   if (it->author != NULL)
     printf("author=%s\n",it->author);
+  if (it->sortKey != NULL)
+    printf("sortKey=%s\n",it->sortKey);
   printf("\n");
 }
 
@@ -269,6 +303,7 @@ struct item *getItem() {
   int pp,pOld;
   int argc;
   int examplec = 0;
+  int i;
   it = newItem();
   do {
     p = nextToken(key,LIMIT);
@@ -280,43 +315,46 @@ struct item *getItem() {
     return NULL;
   }
   p = nextToken(key,LIMIT);
-  it->name = str(key);
+  it->name = it->sortKey = str(key);
   it->category = getCategory(key);
   it->category2 = getCategory2(key);
   nextToken(key,LIMIT);
   if (strcmp(key,"(") != 0) {
-    fprintf(stderr," ( is expected at %s\n",it->name);
-    exit(10);
-  }
-  argc = 0; 
-  while ((pp=nextToken(key,LIMIT)) >= 0) {
-    if (strcmp(key,"|") == 0) {
-      /* options */
-      argc = 0;
-      while ((pp=nextToken(key,LIMIT)) >= 0) {
-        if (strcmp(key,")") == 0) {
-          break;
+    pp = p+1;
+    it->type = 1; /* For non-functions */
+    goto LL ;
+  }else{
+    it->type = 0; /* For functions */
+    argc = 0; 
+    while ((pp=nextToken(key,LIMIT)) >= 0) {
+      if (strcmp(key,"|") == 0) {
+        /* options */
+        argc = 0;
+        while ((pp=nextToken(key,LIMIT)) >= 0) {
+          if (strcmp(key,")") == 0) {
+            break;
+          }
+          if (strcmp(key,",") != 0) {
+            it->optv[argc] = str(key);
+            argc++; it->optc = argc;
+          }
+          if (argc >+ VMAX -1) {
+            fprintf(stderr,"Too many opt args at %s\n",it->name);
+            exit(10);
+          }
         }
-        if (strcmp(key,",") != 0) {
-          it->optv[argc] = str(key);
-          argc++; it->optc = argc;
-        }
-        if (argc >+ VMAX -1) {
-          fprintf(stderr,"Too many opt args at %s\n",it->name);
-          exit(10);
-        }
       }
+      if (strcmp(key,")") == 0) {
+        break;
+      }else if (strcmp(key,",") != 0) {
+        it->argv[argc] = str(key); 
+        argc++; it->argc=argc;
+      }
+      if (argc >= VMAX-1) {
+        fprintf(stderr,"Too many args at %s\n",it->name);
+        exit(10);
+      }
     }
-    if (strcmp(key,")") == 0) {
-      break;
-    }else if (strcmp(key,",") != 0) {
-      it->argv[argc] = str(key); 
-      argc++; it->argc=argc;
-    }
-    if (argc >= VMAX-1) {
-      fprintf(stderr,"Too many args at %s\n",it->name);
-      exit(10);
-    }
   }
 
   /* Getting the short Description */
@@ -329,22 +367,27 @@ 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,"sortKey:") == 0 ||
         strcmp(key,"example:") == 0 ||
-		strcmp(key,"example_description:") ==0 ) {
+        strcmp(key,"example_description:") ==0 ) {
       pp = p;
       strcpy(key2,key);
       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);
@@ -364,6 +407,10 @@ struct item *getItem() {
       if (strcmp(key2,"author:") == 0) {
         it->author = str2(&(S[pp]),pOld-pp);
       }
+      if (strcmp(key2,"sortKey:") == 0) {
+		while (S[pp] <= ' ') pp++;
+        it->sortKey = str2(&(S[pp]),pOld-pp);
+      }
       if (strcmp(key2,"algorithm:") == 0) {
         it->algorithm = str2(&(S[pp]),pOld-pp);
       }
@@ -382,7 +429,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);
@@ -406,21 +457,78 @@ shell(struct item *v[],int n) {
 }
 
 printMenu(FILE *fp, struct item **it, int n) {
-  int i;
+  int i,m;
 
-  fprintf(fp,"@menu\n");
+  m = 0;
   for ( i = 0; i < n; i++ )
-  	fprintf(fp,"* %s::\n",it[i]->name);
-  fprintf(fp,"@end menu\n");
+    if (it[i]->type != 1) m++;
+  if (m != 0) {
+    fprintf(fp,"@menu\n");
+    for ( i = 0; i < n; i++ )
+      if (it[i]->type != 1) fprintf(fp,"* %s::\n",it[i]->name);
+    fprintf(fp,"@end menu\n");
+  }
 }
 
 printTexi(FILE *fp, struct item *it) {
   int i;
-  fprintf(fp,"@c DO NOT EDIT THIS FILE. Generated by gentexi.\n");
+  if (it->type == 1) return printTexi1(fp,it);
+  else return printTexi0(fp,it);
+}
+
+printTexi_common(FILE *fp,struct item *it) {
+  int i;
+  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);
+  }
+
+  if (it->examplec > 0) {
+    for (i=0; i<it->examplec; i++) {
+      if (it->examplec == 1) {
+        fprintf(fp,"Example:\n");
+      }else{
+        fprintf(fp,"Example %d:\n",i);
+      }
+      fprintf(fp,"@example\n");
+      outputExample(fp,it->examplev[i]);
+      if (GenExample) {
+        outputOfExample(it->examplev[i]);
+      }
+      fprintf(fp,"@end example\n");
+      if (it->exampleDescv[i] != NULL && strlen(it->exampleDescv[i]) > 0) {
+        fprintf(fp,"%s\n\n",it->exampleDescv[i]);
+      }
+    }
+  }
+  if (it->author != NULL) {
+    fprintf(fp,"Author : %s\n\n",it->author);
+  }
+  if (it->refc > 0) {
+    fprintf(fp,"@table @t\n");
+    fprintf(fp,"@item References\n");
+    for (i=0; i <it->refc; i++) {
+      fprintf(fp,"@code{%s} ",it->refv[i]);
+      if (i != it->refc-1) fprintf(fp,", ");
+    }
+    fprintf(fp,"\n@end table\n");
+  }
+  fprintf(fp,"\n");
+}
+
+printTexi0(FILE *fp, struct item *it) {
+  int i;
+
+  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 ;
@@ -481,47 +589,53 @@ printTexi(FILE *fp, struct item *it) {
   fprintf(fp,"@c @itemize @bullet \n");
   fprintf(fp,"@c @item \n");
   fprintf(fp,"@c @end itemize\n");
-  
-  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);
+  printTexi_common(fp,it);  
+}
+
+printTexi1(FILE *fp, struct item *it) {
+  int i;
+  /* For  it->type == 1 */
+
+  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->examplec > 0) {
-    for (i=0; i<it->examplec; i++) {
-	  if (it->examplec == 1) {
-        fprintf(fp,"Example:\n");
-	  }else{
-        fprintf(fp,"Example %d:\n",i);
-	  }
-      fprintf(fp,"@example\n");
-      fprintf(fp,"%s\n",it->examplev[i]);
-      if (GenExample) {
-        outputOfExample(it->examplev[i]);
-      }
-      fprintf(fp,"@end example\n");
-	  if (it->exampleDescv[i] != NULL && strlen(it->exampleDescv[i]) > 0) {
-		fprintf(fp,"%s\n\n",it->exampleDescv[i]);
-	  }
+  if (it->shortDescription != NULL) {
+    for (i=0; i<strlen(it->shortDescription); i++) {
+      fprintf(fp,"%c",it->shortDescription[i]);
     }
+    fprintf(fp," \n");
   }
-  if (it->author != NULL) {
-    fprintf(fp,"Author : %s\n\n",it->author);
+
+  /* include file */
+  if (Include) {
+    if (genInclude(it->name)) 
+      fprintf(fp,"@c @include tmp/%s-auto-en.texi\n",it->name);
   }
-  if (it->refc > 0) {
-    fprintf(fp,"@table @t\n");
-    fprintf(fp,"@item References\n");
-    for (i=0; i <it->refc; i++) {
-      fprintf(fp,"@code{%s} ",it->refv[i]);
-      if (i != it->refc-1) fprintf(fp,", ");
+  
+  printTexi_common(fp,it);  
+}
+
+outputExample(FILE *fp,char *s) {
+  int i;
+  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);
     }
-    fprintf(fp,"\n@end table\n");
   }
-  fprintf(fp,"\n");
 }
 
 outputOfExample(char *com) {
@@ -551,4 +665,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 */