texinfo/makeinfo cmds.c,1.37,1.38 insertion.c,1.30,1.31 makeinfo.h,1.6,1.7

[dirt]

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

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

        * makeinfo/makeinfo.h: new variable example_indentation_increment.

        * makeinfo/cmds.c (set_default_indentation_increment): renamed to
        set_example_indentation_increment.
        (cm_exampleindent): call set_example_indentation_increment.

        * makeinfo/insertion.c (begin_insertion, end_insertion): @example,
        @display and the like now rely on example_indentation_increment.



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** cmds.c      23 Feb 2004 20:29:58 -0000      1.37
--- cmds.c      24 Feb 2004 21:14:39 -0000      1.38
***************
*** 1677,1687 ****
  /* @exampleindent: change indentation of example-like environments.   */
  static int
! set_default_indentation_increment (char *string)
  {
    if (strcmp (string, "asis") == 0 || strcmp (string, _("asis")) == 0)
      ;
    else if (strcmp (string, "none") == 0 || strcmp (string, _("none")) == 0)
!     default_indentation_increment = 0;
!   else if (sscanf (string, "%d", &default_indentation_increment) != 1)
      return -1;
    return 0;
--- 1677,1687 ----
  /* @exampleindent: change indentation of example-like environments.   */
  static int
! set_example_indentation_increment (char *string)
  {
    if (strcmp (string, "asis") == 0 || strcmp (string, _("asis")) == 0)
      ;
    else if (strcmp (string, "none") == 0 || strcmp (string, _("none")) == 0)
!     example_indentation_increment = 0;
!   else if (sscanf (string, "%d", &example_indentation_increment) != 1)
      return -1;
    return 0;
***************
*** 1694,1698 ****
    
    get_rest_of_line (1, &arg);
!   if (set_default_indentation_increment (arg) != 0)
      line_error (_("Bad argument to @%s"), command);
  
--- 1694,1698 ----
    
    get_rest_of_line (1, &arg);
!   if (set_example_indentation_increment (arg) != 0)
      line_error (_("Bad argument to @%s"), command);
  

Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** insertion.c 24 Feb 2004 20:43:14 -0000      1.30
--- insertion.c 24 Feb 2004 21:14:39 -0000      1.31
***************
*** 583,587 ****
        if (type != format && type != smallformat)
          {
!           current_indent += default_indentation_increment;
            if (html)
              {
--- 583,587 ----
        if (type != format && type != smallformat)
          {
!           current_indent += example_indentation_increment;
            if (html)
              {
***************
*** 1188,1192 ****
           without a change in indentation. */
        if (type != format && type != smallformat)
!         current_indent -= default_indentation_increment;
  
        if ((type != quotation && !docbook)
--- 1188,1192 ----
           without a change in indentation. */
        if (type != format && type != smallformat)
!         current_indent -= example_indentation_increment;
  
        if ((type != quotation && !docbook)

Index: makeinfo.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makeinfo.h  13 Feb 2004 22:01:39 -0000      1.6
--- makeinfo.h  24 Feb 2004 21:14:39 -0000      1.7
***************
*** 92,95 ****
--- 92,98 ----
  
  /* Amount by which @example indentation increases/decreases. */
+ DECLARE (int, example_indentation_increment, 5);
+ 
+ /* Amount by which @table, @defun, etc. indentation increases/decreases.  */
  DECLARE (int, default_indentation_increment, 5);