[BACK]Return to styleparser.c CVS log [TXT] [DIR] Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/styleparser.c between versions 1.309 and 1.310

version 1.309, 2005/05/23 08:26:35 version 1.310, 2005/05/23 12:26:56
Line 68  CSSProperty; Line 68  CSSProperty;
 static char         *DocURL = NULL; /* The parsed CSS file */  static char         *DocURL = NULL; /* The parsed CSS file */
 static int           LineNumber = -1; /* The line where the error occurs */  static int           LineNumber = -1; /* The line where the error occurs */
 static int           NewLineSkipped = 0;  static int           NewLineSkipped = 0;
   static ThotBool      Style_parsing = FALSE; /* TRUE when parsing a set of CSS rules */
   static ThotBool      RedisplayBGImage = FALSE; /* TRUE when a BG image is inserted */
 static ThotBool      DoApply = TRUE;  static ThotBool      DoApply = TRUE;
   
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
    SkipWord:                                                       SkipWord:                                                  
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
Line 1833  void ParseCSSImageCallback (Document doc Line 1834  void ParseCSSImageCallback (Document doc
       if (dispMode == DisplayImmediately)        if (dispMode == DisplayImmediately)
         TtaSetDisplayMode (doc, dispMode);          TtaSetDisplayMode (doc, dispMode);
     }      }
   else if (css)    else if (css && !Style_parsing)
     {      {
         /* all background images are now loaded */
       for (doc = 1; doc < DocumentTableLength; doc++)        for (doc = 1; doc < DocumentTableLength; doc++)
         if (css->infos[doc] &&          if (css->infos[doc] &&
             /* don't manage a document used by make book */              /* don't manage a document used by make book */
Line 1860  void ParseCSSImageCallback (Document doc Line 1862  void ParseCSSImageCallback (Document doc
              }               }
           }            }
     }      }
     else
       RedisplayBGImage = TRUE;
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 6215  char ReadCSSRules (Document docRef, CSSI Line 6219  char ReadCSSRules (Document docRef, CSSI
   c = SPACE;    c = SPACE;
   index = 0;    index = 0;
   base = NULL;    base = NULL;
     /* entering the CSS parsing */
     Style_parsing = TRUE;
   screentype = TtaGetEnvString ("SCREEN_TYPE");    screentype = TtaGetEnvString ("SCREEN_TYPE");
   /* number of new lines parsed */    /* number of new lines parsed */
   newlines = 0;    newlines = 0;
Line 6558  char ReadCSSRules (Document docRef, CSSI Line 6564  char ReadCSSRules (Document docRef, CSSI
           CSSindex = 0;            CSSindex = 0;
         }          }
     }      }
     /* closing the CSS parsing */
     Style_parsing = FALSE;
   
   /* restore the display mode */    /* restore the display mode */
     if (RedisplayBGImage)
       {
         RedisplayBGImage = FALSE;
         TtaSetDisplayMode (docRef, NoComputedDisplay);
       }
   if (dispMode == DisplayImmediately)    if (dispMode == DisplayImmediately)
     TtaSetDisplayMode (docRef, dispMode);      {
         TtaSetDisplayMode (docRef, dispMode);
       }
   
   /* Prepare the context for style attributes */    /* Prepare the context for style attributes */
   DocURL = DocumentURLs[docRef];    DocURL = DocumentURLs[docRef];
Removed from v.1.309  
changed lines
  Added in v.1.310

Webmaster