texinfo/makeinfo cmds.c,1.38,1.39 insertion.c,1.31,1.32

[dirt]

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

Modified Files:
        cmds.c insertion.c 
Log Message:
2004-02-25  Alper Ersoy  <address@hidden>

        * makeinfo/insertion.c (cm_author): new function.
        (cm_titlepage_cmds): removed @author parts.

        * makeinfo/cmds.c: made @author call cm_author.



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** cmds.c      24 Feb 2004 21:14:39 -0000      1.38
--- cmds.c      24 Feb 2004 22:52:10 -0000      1.39
***************
*** 97,101 ****
    { "appendixsubsubsec", cm_appendixsubsubsec, NO_BRACE_ARGS },
    { "asis", cm_no_op, BRACE_ARGS },
!   { "author", cm_titlepage_cmds, NO_BRACE_ARGS },
    { "b", cm_b, BRACE_ARGS },
    { "bullet", cm_bullet, BRACE_ARGS },
--- 97,101 ----
    { "appendixsubsubsec", cm_appendixsubsubsec, NO_BRACE_ARGS },
    { "asis", cm_no_op, BRACE_ARGS },
!   { "author", cm_author, NO_BRACE_ARGS },
    { "b", cm_b, BRACE_ARGS },
    { "bullet", cm_bullet, BRACE_ARGS },

Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** insertion.c 24 Feb 2004 21:14:39 -0000      1.31
--- insertion.c 24 Feb 2004 22:52:10 -0000      1.32
***************
*** 1933,1941 ****
    begin_insertion (detailmenu);
  }
! 
  /* Title page commands. */
  
  void
! cm_titlepage (int arg)
  {
    titlepage_cmd_present = 1;
--- 1933,1941 ----
    begin_insertion (detailmenu);
  }
! 
  /* Title page commands. */
  
  void
! cm_titlepage (void)
  {
    titlepage_cmd_present = 1;
***************
*** 1947,1950 ****
--- 1947,1989 ----
  
  void
+ cm_author (void)
+ {
+   char *rest;
+   get_rest_of_line (1, &rest);
+ 
+   if (is_in_insertion_of_type (quotation))
+     {
+       if (html)
+         {
+           add_word ("&mdash;");
+           add_word ("&mdash;");
+         }
+       else if (xml)
+         {
+           xml_insert_entity ("mdash");
+           xml_insert_entity ("mdash");
+         }
+       else
+         add_word ("--");
+ 
+         add_word (rest);
+     }
+   else if (is_in_insertion_of_type (titlepage))
+     {
+       if (xml && !docbook)
+         {
+           xml_insert_element (AUTHOR, START);
+           add_word (rest);
+           xml_insert_element (AUTHOR, END);
+         }
+     }
+   else
+     line_error (_("@%s not meaningful outside address@hidden' and 
address@hidden' environments"),
+         command);
+ 
+   free (rest);
+ }
+ 
+ void
  cm_titlepage_cmds (void)
  {
***************
*** 1954,1959 ****
  
    if (!is_in_insertion_of_type (titlepage))
!     line_error (_("%c%s not meaningful outside `%ctitlepage' environment"),
!         COMMAND_PREFIX, command, COMMAND_PREFIX);
  
    if (xml && !docbook)
--- 1993,1998 ----
  
    if (!is_in_insertion_of_type (titlepage))
!     line_error (_("@%s not meaningful outside address@hidden' environment"),
!         command);
  
    if (xml && !docbook)
***************
*** 1961,1969 ****
        int elt = 0;
  
!       if (strcmp (command, "author") == 0)
!         elt = AUTHOR;
!       else if (strcmp (command, "title") == 0)
          elt = BOOKTITLE;
!       else if (strcmp (command, "subtitle") == 0)
          elt = BOOKSUBTITLE;
  
--- 2000,2006 ----
        int elt = 0;
  
!       if (STREQ (command, "title"))
          elt = BOOKTITLE;
!       else if (STREQ (command, "subtitle"))
          elt = BOOKSUBTITLE;