texinfo/makeinfo makeinfo.c,1.17,1.18

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv7900/makeinfo

Modified Files:
        makeinfo.c 
Log Message:
2003-12-30  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (main): new option --plaintext.
        (usage): added short forms of --html, --xml, --docbook and --plaintext
        to the help text.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** makeinfo.c  2003/12/30 11:42:52     1.17
--- makeinfo.c  2003/12/30 15:02:45     1.18
***************
*** 403,409 ****
      puts (_("\
  Output format selection (default is to produce Info):\n\
!       --docbook             output Docbook XML rather than Info.\n\
!       --html                output HTML rather than Info.\n\
!       --xml                 output Texinfo XML rather than Info.\n\
  "));
  
--- 403,410 ----
      puts (_("\
  Output format selection (default is to produce Info):\n\
!   -d, --docbook             output Docbook XML rather than Info.\n\
!   -w, --html                output HTML rather than Info.\n\
!   -x, --xml                 output Texinfo XML rather than Info.\n\
!   -t, --plaintext           output plain text rather than Info.\n\
  "));
  
***************
*** 538,541 ****
--- 539,543 ----
    { "output", 1, 0, 'o' },
    { "paragraph-indent", 1, 0, 'p' },
+   { "plaintext", 0, 0, 't' },
    { "reference-limit", 1, 0, 'r' },
    { "split-size", 1, 0, 'S'},
***************
*** 613,617 ****
  
    /* Parse argument flags from the input line. */
!   while ((c = getopt_long (argc, argv, "D:de:E:f:hI:o:p:P:r:s:U:vV:wx",
                             long_options, &ind)) != EOF)
      {
--- 615,619 ----
  
    /* Parse argument flags from the input line. */
!   while ((c = getopt_long (argc, argv, "D:de:E:f:hI:o:p:P:r:s:t:U:vV:wx",
                             long_options, &ind)) != EOF)
      {
***************
*** 756,759 ****
--- 758,770 ----
                usage (1);
              }
+           break;
+ 
+         case 't': /* --plaintext */
+           splitting = 0;
+           no_headers = 1;
+           html = 0;
+           docbook = 0;
+           xml = 0;
+           process_plaintext = 1;
            break;