texinfo/makeinfo cmds.c,1.19,1.20 html.c,1.7,1.8

[dirt]

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

Modified Files:
        cmds.c html.c 
Log Message:
2004-01-13  Alper Ersoy  <address@hidden>

        * makeinfo/cmds.c (cm_r): changed add_word_args with insert_html_tag,
        and changed inline style with a class attribute.

        * makeinfo/html.c (insert_html_tag): when the current element is the
        same with the last in the stack, do not return if it's span.
        (html_output_head): new CSS class roman (for @r.)



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** cmds.c      9 Jan 2004 09:08:54 -0000       1.19
--- cmds.c      13 Jan 2004 19:05:01 -0000      1.20
***************
*** 1193,1200 ****
    else if (html)
      {
        if (arg == START)
!         add_word ("<span style=\"font-family: serif; font-weight: 
normal;\">");
!       else
!         add_word ("</span>");
      }
    else
--- 1193,1204 ----
    else if (html)
      {
+       insert_html_tag (arg, "span");
+ 
+       /* We overwrite the closing '>' with the class attribute.  */
        if (arg == START)
!         {
!           output_paragraph_offset--;
!           add_word (" class=\"roman\">");
!         }
      }
    else

Index: html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** html.c      10 Jan 2004 13:51:47 -0000      1.7
--- html.c      13 Jan 2004 19:05:01 -0000      1.8
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 2,7 ----
     $Id$
  
!    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
!    Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 152,155 ****
--- 153,160 ----
      add_word_args ("  span.sc { %s }\n", CSS_FONT_SMALL_CAPS);
  
+     /* Roman font class.  */
+ #define CSS_FONT_ROMAN "font-family: serif; font-weight: normal;"
+     add_word ("  span.roman { %s } \n", CSS_FONT_ROMAN);
+ 
      /* Write out any css code from the user's --css-file.  */
      if (css_inline)
***************
*** 476,480 ****
  
    if (htmlstack
!       && (strcmp (htmlstack->tag, tag) == 0))
      do_return = 1;
  
--- 481,486 ----
  
    if (htmlstack
!       && STREQ (htmlstack->tag, tag)
!       && !STREQ (tag, "span"))
      do_return = 1;