texinfo/makeinfo insertion.c,1.34,1.35

[dirt]

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

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

        * makeinfo/insertion.c (begin_insertion, end_insertion): for rawxml,
        rawhtml and rawdocbook blocks, change the state of escaping depending
        on raw_output_block in order to avoid problems when these blocks are
        used within a @rmacro.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** insertion.c 28 Feb 2004 13:13:06 -0000      1.34
--- insertion.c 28 Feb 2004 13:33:26 -0000      1.35
***************
*** 73,76 ****
--- 73,80 ----
  static int float_active = 0;
  
+ /* Unsetting escape_html blindly causes text inside @html/etc. to be escaped 
if
+    used within a rmacro.  */
+ static int raw_output_block = 0;
+ 
  /* Non-zero if a <dl> element has a <dt> element in it.  We use this when
     deciding whether to insert a <br> or not.  */
***************
*** 871,877 ****
      case rawhtml:
      case rawxml:
!       xml_no_para = 1;
!       escape_html = 0;
!       xml_keep_space++;
  
        {
--- 875,886 ----
      case rawhtml:
      case rawxml:
!       raw_output_block++;
! 
!       if (raw_output_block > 0)
!         {
!           xml_no_para = 1;
!           escape_html = 0;
!           xml_keep_space++;
!         }
  
        {
***************
*** 1062,1070 ****
      case rawhtml:
      case rawxml:
!       xml_no_para = 0;
!       escape_html = 1;
!       xml_keep_space--;
  
!       if (xml && output_paragraph[output_paragraph_offset-1] == '\n')
          output_paragraph_offset--;
        break;
--- 1071,1084 ----
      case rawhtml:
      case rawxml:
!       raw_output_block--;
  
!       if (raw_output_block <= 0)
!         {
!           xml_no_para = 0;
!           escape_html = 1;
!           xml_keep_space--;
!         }
! 
!       if ((xml || html) && output_paragraph[output_paragraph_offset-1] == 
'\n')
          output_paragraph_offset--;
        break;