texinfo/makeinfo cmds.c,1.46,1.47 cmds.h,1.4,1.5

[karl]

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

Modified Files:
        cmds.c cmds.h 
Log Message:
@url->@indicateurl

Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** cmds.c      6 Apr 2004 21:43:23 -0000       1.46
--- cmds.c      7 Apr 2004 20:17:38 -0000       1.47
***************
*** 229,232 ****
--- 229,233 ----
    { "include", cm_include, NO_BRACE_ARGS },
    { "indent", cm_indent, NO_BRACE_ARGS },
+   { "indicateurl", cm_indicate_url, BRACE_ARGS },
    { "inforef", cm_inforef, BRACE_ARGS },
    { "insertcopying", cm_insert_copying, NO_BRACE_ARGS },
***************
*** 329,333 ****
    { "unnumberedsubsubsec", cm_unnumberedsubsubsec, NO_BRACE_ARGS },
    { "uref", cm_uref, BRACE_ARGS },
!   { "url", cm_url, BRACE_ARGS },
    { "v", cm_accent, MAYBE_BRACE_ARGS },
    { "value", cm_value, BRACE_ARGS },
--- 330,334 ----
    { "unnumberedsubsubsec", cm_unnumberedsubsubsec, NO_BRACE_ARGS },
    { "uref", cm_uref, BRACE_ARGS },
!   { "url", cm_uref, BRACE_ARGS },
    { "v", cm_accent, MAYBE_BRACE_ARGS },
    { "value", cm_value, BRACE_ARGS },
***************
*** 843,848 ****
  }
  
  void
! cm_url (int arg, int start, int end)
  {
    if (xml)
--- 844,850 ----
  }
  
+ /* Just show a url (http://example.org/..., for example), don't link to it.  
*/
  void
! cm_indicate_url (int arg, int start, int end)
  {
    if (xml)
***************
*** 1204,1225 ****
      {
        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.  */
          insert_string ("<!-- /@w -->");
          
--- 1206,1211 ----
      {
        if (docbook || html || xml)
!         /* This is so @w{$}Log$ doesn't end up as <dollar>Log<dollar>
!            in the output.  */
          insert_string ("<!-- /@w -->");
          

Index: cmds.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cmds.h      24 Feb 2004 22:52:52 -0000      1.4
--- cmds.h      7 Apr 2004 20:17:38 -0000       1.5
***************
*** 126,130 ****
    cm_strong (int arg, int start_pos, int end_pos),
    cm_tt (int arg),
!   cm_url (int arg, int start, int end),
    cm_var (int arg, int start_pos, int end_pos),
    cm_verb (int arg);
--- 126,130 ----
    cm_strong (int arg, int start_pos, int end_pos),
    cm_tt (int arg),
!   cm_indicate_url (int arg, int start, int end),
    cm_var (int arg, int start_pos, int end_pos),
    cm_verb (int arg);