texinfo/makeinfo cmds.c,1.45,1.46

[dirt]

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

Modified Files:
        cmds.c 
Log Message:
2004-04-07  Alper Ersoy  <address@hidden>

        * makeinfo/cmds.c (cm_colon): check if the character we are erasing
        from the output belongs to an XML tag.



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** cmds.c      4 Apr 2004 01:48:05 -0000       1.45
--- cmds.c      6 Apr 2004 21:43:23 -0000       1.46
***************
*** 1205,1211 ****
        if (docbook || html || xml)
          /* This is so @w{$}Log$ doesn't end up as $Log$
          /* This is so @w{$}Log$ doesn't end up as Revision 1.45  2004/04/04 
01:48:05  karl
          /* This is so @w{$}Log$ doesn't end up as (cm_w): insert a comment at 
the end of @w, so that
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
$Log$ in the output.
          /* This is so @w{$}Log$ doesn't end up as Report from rms.
          /* This is so @w{$}Log$ doesn't end up as in the output.  */
--- 1205,1223 ----
        if (docbook || html || xml)
          /* This is so @w{$}Log$ doesn't end up as $Log$
+         /* This is so @w{$}Log$ doesn't end up as Revision 1.46  2004/04/06 
21:43:23  dirt
+         /* This is so @w{$}Log$ doesn't end up as 2004-04-07  Alper Ersoy  
<address@hidden>
+         /* This is so @w{$}Log$ doesn't end up as
+         /* This is so @w{$}Log$ doesn't end up as     * makeinfo/cmds.c 
(cm_colon): check if the character we are erasing
+         /* This is so @w{$}Log$ doesn't end up as     from the output belongs 
to an XML tag.
+         /* This is so @w{$}Log$ doesn't end up as
          /* This is so @w{$}Log$ doesn't end up as Revision 1.45  2004/04/04 
01:48:05  karl
          /* This is so @w{$}Log$ doesn't end up as (cm_w): insert a comment at 
the end of @w, so that
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
$Log$
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
Revision 1.46  2004/04/06 21:43:23  dirt
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
2004-04-07  Alper Ersoy  <address@hidden>
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
        * makeinfo/cmds.c (cm_colon): check if the character we are erasing
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
        from the output belongs to an XML tag.
!         /* This is so @w{$}Log$ doesn't end up as @w{$}Log$ doesn't end up as 
in the output.
          /* This is so @w{$}Log$ doesn't end up as Report from rms.
          /* This is so @w{$}Log$ doesn't end up as in the output.  */
***************
*** 1768,1772 ****
        if (strchr (".?!:", input_text[input_text_offset-3]) != NULL)
          {
!           output_paragraph_offset--;   /* erase literal character that's 
there */
            switch (input_text[input_text_offset-3])
              {
--- 1780,1788 ----
        if (strchr (".?!:", input_text[input_text_offset-3]) != NULL)
          {
!           /* Erase literal character that's there, except `>', which is
!              part of the XML tag.  */
!           if (output_paragraph[output_paragraph_offset-1] != '>')
!             output_paragraph_offset--;
! 
            switch (input_text[input_text_offset-3])
              {