lynx-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

lynx-dev color styles and TagSoup - patch


From: Klaus Weide
Subject: lynx-dev color styles and TagSoup - patch
Date: Tue, 15 Dec 1998 08:20:21 -0600 (CST)

With the patch below, color styles for elements which are faked
as SGML_EMPTY (<A>, <B>, <EM>, ...) in TagSoup mode work; but
I haven't done any testing for documents with invalid nesting or
missing end tags.

   Klaus


* Made color styles code work much better with TagSoup parsing mode.
  A new flag bit is set for some tags in HTMLDTD which indicates that,
  even though they may be otherwise handled as SGML_EMPTY, this emptiness
  is fake.  This can only work reasonably for elements that require an
  end tag (not for LI, for example).
* Added SUMMARY attribute for TABLE element to HTMLDTD (but we don't do
  anything with it).

*** lynx2-8-1.orig/WWW/Library/Implementation/SGML.h    Thu Aug  6 07:28:22 1998
--- lynx2-8-1/WWW/Library/Implementation/SGML.h Tue Dec 15 07:47:28 1998
***************
*** 90,95 ****
--- 90,97 ----
                                      (if found invalid) */
  #define Tgf_strict    0x00008 /* Ignore contained invalid elements,
                                      don't pass them on */
+ #define Tgf_nreie     0x00010 /* Not Really Empty If Empty,
+                                     used by color style code */
  
  /*              A tag structure describes an SGML element.
  **              -----------------------------------------
*** lynx2-8-1.orig/WWW/Library/Implementation/HTMLDTD.h Thu Aug  6 07:28:22 1998
--- lynx2-8-1/WWW/Library/Implementation/HTMLDTD.h      Tue Dec 15 07:41:17 1998
***************
*** 871,880 ****
  #define HTML_TABLE_NOWRAP      14
  #define HTML_TABLE_RULES       15
  #define HTML_TABLE_STYLE       16
! #define HTML_TABLE_TITLE       17
! #define HTML_TABLE_UNITS       18
! #define HTML_TABLE_WIDTH       19
! #define HTML_TABLE_ATTRIBUTES  20
  
  #define HTML_TD_ALIGN           0
  #define HTML_TD_AXES            1
--- 871,881 ----
  #define HTML_TABLE_NOWRAP      14
  #define HTML_TABLE_RULES       15
  #define HTML_TABLE_STYLE       16
! #define HTML_TABLE_SUMMARY     17
! #define HTML_TABLE_TITLE       18
! #define HTML_TABLE_UNITS       19
! #define HTML_TABLE_WIDTH       20
! #define HTML_TABLE_ATTRIBUTES  21
  
  #define HTML_TD_ALIGN           0
  #define HTML_TD_AXES            1
*** lynx2-8-1.orig/WWW/Library/Implementation/HTMLDTD.c Thu Jun  4 11:19:50 1998
--- lynx2-8-1/WWW/Library/Implementation/HTMLDTD.c      Tue Dec 15 07:45:19 1998
***************
*** 941,946 ****
--- 941,947 ----
        { "NOWRAP" },
        { "RULES" },
        { "STYLE" },
+       { "SUMMARY" },
        { "TITLE" },
        { "UNITS" },
        { "WIDTH" },
***************
*** 1085,1091 ****
  
  /*                    self    contain icont'n contn'd icont'd canclos omit */
   /* { "A"     , a_attr,       HTML_A_ATTRIBUTES,      SGML_MIXED }, */
! #define T_A           0x0008, 0x0B007,0x0FF17,0x37787,0x77BA7,0x8604F,0x00004
   /* { "ABBREV"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_ABBREV      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
   /* { "ACRONYM" , gen_attr,   HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
--- 1086,1092 ----
  
  /*                    self    contain icont'n contn'd icont'd canclos omit */
   /* { "A"     , a_attr,       HTML_A_ATTRIBUTES,      SGML_MIXED }, */
! #define T_A           0x0008, 0x0B007,0x0FF17,0x37787,0x77BA7,0x8604F,0x00014
   /* { "ABBREV"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_ABBREV      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
   /* { "ACRONYM" , gen_attr,   HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
***************
*** 1101,1107 ****
   /* { "AUTHOR"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_AUTHOR      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
   /* { "B"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_B           0x0001, 0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00004
   /* { "BANNER"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_BANNER      0x0200, 0x0FB8F,0x0FFFF,0x30000,0x30000,0x8031F,0x00000
   /* { "BASE"  , base_attr,    HTML_BASE_ATTRIBUTES,   SGML_EMPTY }, */
--- 1102,1108 ----
   /* { "AUTHOR"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_AUTHOR      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
   /* { "B"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_B           0x0001, 0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00014
   /* { "BANNER"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_BANNER      0x0200, 0x0FB8F,0x0FFFF,0x30000,0x30000,0x8031F,0x00000
   /* { "BASE"  , base_attr,    HTML_BASE_ATTRIBUTES,   SGML_EMPTY }, */
***************
*** 1113,1121 ****
   /* { "BGSOUND" , bgsound_attr, HTML_BGSOUND_ATTRIBUTES, SGML_EMPTY }, */
  #define T_BGSOUND     0x1000, 0x00000,0x00000,0x777AF,0x77FAF,0x8730F,0x00001
   /* { "BIG"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_BIG         0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00004
   /* { "BLINK" , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_BLINK       0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00001,0x00004
   /* { "BLOCKQUOTE", bq_attr,  HTML_BQ_ATTRIBUTES,     SGML_MIXED }, */
  #define T_BLOCKQUOTE  0x0200, 0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
   /* { "BODY"  , body_attr,    HTML_BODY_ATTRIBUTES,   SGML_MIXED }, */
--- 1114,1122 ----
   /* { "BGSOUND" , bgsound_attr, HTML_BGSOUND_ATTRIBUTES, SGML_EMPTY }, */
  #define T_BGSOUND     0x1000, 0x00000,0x00000,0x777AF,0x77FAF,0x8730F,0x00001
   /* { "BIG"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_BIG         0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
   /* { "BLINK" , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_BLINK       0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00001,0x00014
   /* { "BLOCKQUOTE", bq_attr,  HTML_BQ_ATTRIBUTES,     SGML_MIXED }, */
  #define T_BLOCKQUOTE  0x0200, 0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
   /* { "BODY"  , body_attr,    HTML_BODY_ATTRIBUTES,   SGML_MIXED }, */
***************
*** 1132,1138 ****
   /* { "CENTER"        , div_attr,     HTML_DIV_ATTRIBUTES,    SGML_MIXED }, */
  #define T_CENTER      0x0200, 0x8FBCF,0x8FFFF,0xB6680,0xB6FA7,0x8071F,0x00000
   /* { "CITE"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_CITE                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
   /* { "CODE"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_CODE                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
   /* { "COL"   , col_attr,     HTML_COL_ATTRIBUTES,    SGML_EMPTY }, */
--- 1133,1139 ----
   /* { "CENTER"        , div_attr,     HTML_DIV_ATTRIBUTES,    SGML_MIXED }, */
  #define T_CENTER      0x0200, 0x8FBCF,0x8FFFF,0xB6680,0xB6FA7,0x8071F,0x00000
   /* { "CITE"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_CITE                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
   /* { "CODE"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_CODE                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
   /* { "COL"   , col_attr,     HTML_COL_ATTRIBUTES,    SGML_EMPTY }, */
***************
*** 1160,1166 ****
   /* { "DT"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
  #define T_DT          0x0400, 0x0B04F,0x0B1FF,0x00800,0x17FFF,0x8071F,0x00001
   /* { "EM"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_EM          0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00000
   /* { "EMBED" , embed_attr,   HTML_EMBED_ATTRIBUTES,  SGML_EMPTY }, */
  #define T_EMBED       0x2000, 0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
   /* { "FIELDSET", fieldset_attr,HTML_FIELDSET_ATTRIBUTES, SGML_MIXED }, */
--- 1161,1167 ----
   /* { "DT"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
  #define T_DT          0x0400, 0x0B04F,0x0B1FF,0x00800,0x17FFF,0x8071F,0x00001
   /* { "EM"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_EM          0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00010
   /* { "EMBED" , embed_attr,   HTML_EMBED_ATTRIBUTES,  SGML_EMPTY }, */
  #define T_EMBED       0x2000, 0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
   /* { "FIELDSET", fieldset_attr,HTML_FIELDSET_ATTRIBUTES, SGML_MIXED }, */
***************
*** 1170,1176 ****
   /* { "FN"    , fn_attr,      HTML_FN_ATTRIBUTES,     SGML_MIXED }, */
  #define T_FN          0x0200, 0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
   /* { "FONT"  , font_attr,    HTML_FONT_ATTRIBUTES,   SGML_EMPTY }, */
! #define T_FONT                0x0001, 
0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00004
   /* { "FORM"  , form_attr,    HTML_FORM_ATTRIBUTES,   SGML_EMPTY }, */
  #define T_FORM                0x0080, 
0x0FF6F,0x0FF7F,0x36E07,0x33F07,0x88DFF,0x00000
   /* { "FRAME" , frame_attr,   HTML_FRAME_ATTRIBUTES,  SGML_EMPTY }, */
--- 1171,1177 ----
   /* { "FN"    , fn_attr,      HTML_FN_ATTRIBUTES,     SGML_MIXED }, */
  #define T_FN          0x0200, 0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
   /* { "FONT"  , font_attr,    HTML_FONT_ATTRIBUTES,   SGML_EMPTY }, */
! #define T_FONT                0x0001, 
0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
   /* { "FORM"  , form_attr,    HTML_FORM_ATTRIBUTES,   SGML_EMPTY }, */
  #define T_FORM                0x0080, 
0x0FF6F,0x0FF7F,0x36E07,0x33F07,0x88DFF,0x00000
   /* { "FRAME" , frame_attr,   HTML_FRAME_ATTRIBUTES,  SGML_EMPTY }, */
***************
*** 1197,1203 ****
  #define T_HTML                
0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
  #define T_HY          0x1000, 0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
   /* { "I"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_I           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00004
  #define T_IFRAME      0x2000, 0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0xD335F,0x00000
   /* { "IMG"   , img_attr,     HTML_IMG_ATTRIBUTES,    SGML_EMPTY }, */
  #define T_IMG         0x1000, 0x00000,0x00000,0x3779F,0x37FBF,0x80000,0x00001
--- 1198,1204 ----
  #define T_HTML                
0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
  #define T_HY          0x1000, 0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
   /* { "I"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_I           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
  #define T_IFRAME      0x2000, 0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0xD335F,0x00000
   /* { "IMG"   , img_attr,     HTML_IMG_ATTRIBUTES,    SGML_EMPTY }, */
  #define T_IMG         0x1000, 0x00000,0x00000,0x3779F,0x37FBF,0x80000,0x00001
***************
*** 1259,1272 ****
   /* { "S"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_S           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
   /* { "SAMP"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_SAMP                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
   /* { "SCRIPT"        , script_attr,  HTML_SCRIPT_ATTRIBUTES, SGML_LITTERAL 
}, */
  #define T_SCRIPT      0x2000, 0x00000,0x00000,0x77F9F,0x77FFF,0x87F5F,0x00000
   /* { "SELECT"        , select_attr,  HTML_SELECT_ATTRIBUTES, SGML_MIXED }, */
  #define T_SELECT      0x0040, 0x08000,0x08000,0x03FAF,0x13FBF,0x80F5F,0x00008
  #define T_SHY         0x1000, 0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
   /* { "SMALL" , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_SMALL       0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00004
   /* { "SPAN"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_SPAN                0x0002, 
0x0B04F,0x0FFFF,0x2778F,0x77FBF,0x80003,0x00000
   /* { "SPOT"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
--- 1260,1273 ----
   /* { "S"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_S           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
   /* { "SAMP"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_SAMP                0x0002, 
0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
   /* { "SCRIPT"        , script_attr,  HTML_SCRIPT_ATTRIBUTES, SGML_LITTERAL 
}, */
  #define T_SCRIPT      0x2000, 0x00000,0x00000,0x77F9F,0x77FFF,0x87F5F,0x00000
   /* { "SELECT"        , select_attr,  HTML_SELECT_ATTRIBUTES, SGML_MIXED }, */
  #define T_SELECT      0x0040, 0x08000,0x08000,0x03FAF,0x13FBF,0x80F5F,0x00008
  #define T_SHY         0x1000, 0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
   /* { "SMALL" , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_SMALL       0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
   /* { "SPAN"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_SPAN                0x0002, 
0x0B04F,0x0FFFF,0x2778F,0x77FBF,0x80003,0x00000
   /* { "SPOT"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
***************
*** 1274,1280 ****
   /* { "STRIKE"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_STRIKE      0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
   /* { "STRONG"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_STRONG      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00000
   /* { "STYLE" , style_attr,   HTML_STYLE_ATTRIBUTES,  SGML_LITTERAL }, */
  #define T_STYLE       0x40000,0x00000,0x00000,0x7638F,0x76FAF,0x8001F,0x00000
   /* { "SUB"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
--- 1275,1281 ----
   /* { "STRIKE"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
  #define T_STRIKE      0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
   /* { "STRONG"        , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_STRONG      0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00010
   /* { "STYLE" , style_attr,   HTML_STYLE_ATTRIBUTES,  SGML_LITTERAL }, */
  #define T_STYLE       0x40000,0x00000,0x00000,0x7638F,0x76FAF,0x8001F,0x00000
   /* { "SUB"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
***************
*** 1304,1312 ****
   /* { "TR"    , tr_attr,      HTML_TR_ATTRIBUTES,     SGML_EMPTY }, */
  #define T_TR          0x0020, 0x00400,0x8FFFF,0x00820,0xB7FB7,0x8C75F,0x00001
   /* { "TT"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_TT          0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
   /* { "U"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_U           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00004
   /* { "UL"    , ulist_attr,   HTML_UL_ATTRIBUTES,     SGML_MIXED }, */
  #define T_UL          0x0800, 0x0C480,0x8FFFF,0x36680,0xB7FFF,0x8075F,0x00000
   /* { "VAR"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
--- 1305,1313 ----
   /* { "TR"    , tr_attr,      HTML_TR_ATTRIBUTES,     SGML_EMPTY }, */
  #define T_TR          0x0020, 0x00400,0x8FFFF,0x00820,0xB7FB7,0x8C75F,0x00001
   /* { "TT"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_TT          0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00010
   /* { "U"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
! #define T_U           0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
   /* { "UL"    , ulist_attr,   HTML_UL_ATTRIBUTES,     SGML_MIXED }, */
  #define T_UL          0x0800, 0x0C480,0x8FFFF,0x36680,0xB7FFF,0x8075F,0x00000
   /* { "VAR"   , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
*** lynx2-8-1.orig/src/HTML.c   Sat Oct 17 16:20:41 1998
--- lynx2-8-1/src/HTML.c        Tue Dec 15 07:38:01 1998
***************
*** 5204,5213 ****
  
      } /* end switch */
  
! #if defined(DICKEY_TEST)
!     if (HTML_dtd.tags[ElementNumber].contents != SGML_EMPTY)
! #endif
!     {
        if (me->skip_stack > 0) {
            CTRACE(tfp, "HTML:begin_element: internal call (level %d), leaving 
on stack - %s\n",
                        me->skip_stack, me->sp->style->name);
--- 5204,5210 ----
  
      } /* end switch */
  
!     if (HTML_dtd.tags[ElementNumber].contents != SGML_EMPTY) {
        if (me->skip_stack > 0) {
            CTRACE(tfp, "HTML:begin_element: internal call (level %d), leaving 
on stack - %s\n",
                        me->skip_stack, me->sp->style->name);
***************
*** 5237,5245 ****
        me->sp[0].tag_number = ElementNumber;
      }
  
! #if defined(DICKEY_TEST) && defined(USE_COLOR_STYLE)
! /* end empty tags straight away */
!       if (HTML_dtd.tags[ElementNumber].contents == SGML_EMPTY)
        {
                CTRACE(tfp, "STYLE:begin_element:ending EMPTY element style\n");
  #if !defined(USE_HASH)
--- 5234,5245 ----
        me->sp[0].tag_number = ElementNumber;
      }
  
! #if defined(USE_COLOR_STYLE)
! /* end really empty tags straight away */
! #define REALLY_EMPTY(e) ((HTML_dtd.tags[e].contents == SGML_EMPTY) && \
!                        !(HTML_dtd.tags[e].flags & Tgf_nreie))
! 
!       if (REALLY_EMPTY(element_number))
        {
                CTRACE(tfp, "STYLE:begin_element:ending EMPTY element style\n");
  #if !defined(USE_HASH)
***************
*** 6635,6643 ****
        CTRACE(tfp, "CSS:%s (trimmed %s, END_ELEMENT)\n", Style_className, tmp);
      }
  
! #if defined(DICKEY_TEST)
!     if (HTML_dtd.tags[element_number].contents != SGML_EMPTY)
! #endif
      {
        CTRACE(tfp, "STYLE:end_element: ending non-EMPTY style\n");
  #if !defined(USE_HASH)
--- 6635,6641 ----
        CTRACE(tfp, "CSS:%s (trimmed %s, END_ELEMENT)\n", Style_className, tmp);
      }
  
!     if (!REALLY_EMPTY(element_number))
      {
        CTRACE(tfp, "STYLE:end_element: ending non-EMPTY style\n");
  #if !defined(USE_HASH)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]