texinfo/makeinfo makeinfo.c,1.57,1.58

[dirt]

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

Modified Files:
        makeinfo.c 
Log Message:
2004-03-01  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (reader_loop): disable multiple dashes and
        quotes entity substitution for HTML and XML, if escape_html is not
        true.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** makeinfo.c  29 Feb 2004 23:13:08 -0000      1.57
--- makeinfo.c  1 Mar 2004 17:30:00 -0000       1.58
***************
*** 2060,2063 ****
--- 2060,2064 ----
           everything else intact.  */
        if (!only_macro_expansion && !in_fixed_width_font
+           && ((!html && !xml) || escape_html)
            && (character == '\'' || character == '`')
            && input_text[input_text_offset + 1] == character)
***************
*** 2083,2087 ****
  
        /* Convert --- to --.  */
!       if (!only_macro_expansion && character == '-' && !in_fixed_width_font)
          {
            int dash_count = 0;
--- 2084,2089 ----
  
        /* Convert --- to --.  */
!       if (!only_macro_expansion && character == '-' && !in_fixed_width_font
!           && ((!html && !xml) || escape_html))
          {
            int dash_count = 0;