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

Diff for /Amaya/amaya/styleparser.c between versions 1.347 and 1.348

version 1.347, 2006/02/03 14:55:37 version 1.348, 2006/02/21 08:18:38
Line 65  typedef struct CSSProperty Line 65  typedef struct CSSProperty
 }  }
 CSSProperty;  CSSProperty;
   
 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 int           RedisplayImages = 0; /* number of BG images loading */  static int           RedisplayImages = 0; /* number of BG images loading */
Line 180  static void CSSPrintError (char *msg, ch Line 179  static void CSSPrintError (char *msg, ch
       if (ParsedCSS > 0 && !CSSErrFile)        if (ParsedCSS > 0 && !CSSErrFile)
         OpenParsingErrors (ParsedCSS);          OpenParsingErrors (ParsedCSS);
   
       if (DocURL)        if (Error_DocURL)
         {          {
           fprintf (ErrFile, "\n*** Errors/warnings in %s\n", DocURL);            fprintf (ErrFile, "\n*** Errors/warnings in %s\n", Error_DocURL);
           /* set to NULL as long as the CSS file doesn't change */            /* set to NULL as long as the CSS file doesn't change */
           DocURL = NULL;            Error_DocURL = NULL;
         }          }
       CSSErrorsFound = TRUE;        CSSErrorsFound = TRUE;
       if (LineNumber < 0)        if (LineNumber < 0)
Line 5437  void  ParseHTMLSpecificStyle (Element el Line 5436  void  ParseHTMLSpecificStyle (Element el
     {      {
       /* update the context for reported errors */        /* update the context for reported errors */
       ParsedDoc = doc;        ParsedDoc = doc;
       DocURL = DocumentURLs[doc];        Error_DocURL = DocumentURLs[doc];
     }      }
   isHTML = (strcmp (TtaGetSSchemaName (elType.ElSSchema), "HTML") == 0);    isHTML = (strcmp (TtaGetSSchemaName (elType.ElSSchema), "HTML") == 0);
   /* create the context of the Specific presentation driver */    /* create the context of the Specific presentation driver */
Line 6837  char ReadCSSRules (Document docRef, CSSI Line 6836  char ReadCSSRules (Document docRef, CSSI
   TtaFreeMemory (refcss->class_list);    TtaFreeMemory (refcss->class_list);
   refcss->class_list = NULL;    refcss->class_list = NULL;
   if (url)    if (url)
     DocURL = url;      Error_DocURL = url;
   else    else
     /* the CSS source in within the document itself */      /* the CSS source in within the document itself */
     DocURL = DocumentURLs[docRef];      Error_DocURL = DocumentURLs[docRef];
   LineNumber = numberOfLinesRead + 1;    LineNumber = numberOfLinesRead + 1;
   NewLineSkipped = 0;    NewLineSkipped = 0;
   newlines = 0;    newlines = 0;
Line 7143  char ReadCSSRules (Document docRef, CSSI Line 7142  char ReadCSSRules (Document docRef, CSSI
                   if (!ignoreImport)                    if (!ignoreImport)
                     {                      {
                       /* save the displayed URL when an error is reported */                        /* save the displayed URL when an error is reported */
                       saveDocURL = DocURL;                        saveDocURL = Error_DocURL;
                       ptr = TtaStrdup (base);                        ptr = TtaStrdup (base);
                       /* get the CSS URI in UTF-8 */                        /* get the CSS URI in UTF-8 */
                       /*ptr = ReallocUTF8String (ptr, docRef);*/                        /*ptr = ReallocUTF8String (ptr, docRef);*/
Line 7151  char ReadCSSRules (Document docRef, CSSI Line 7150  char ReadCSSRules (Document docRef, CSSI
                                       url, pInfo->PiMedia,                                        url, pInfo->PiMedia,
                                       pInfo->PiCategory == CSS_USER_STYLE);                                        pInfo->PiCategory == CSS_USER_STYLE);
                       /* restore the displayed URL when an error is reported */                        /* restore the displayed URL when an error is reported */
                       DocURL = saveDocURL;                        Error_DocURL = saveDocURL;
                       TtaFreeMemory (ptr);                        TtaFreeMemory (ptr);
                     }                      }
                   /* restore the number of lines */                    /* restore the number of lines */
Line 7190  char ReadCSSRules (Document docRef, CSSI Line 7189  char ReadCSSRules (Document docRef, CSSI
     TtaSetDisplayMode (docRef, dispMode);      TtaSetDisplayMode (docRef, dispMode);
   
   /* Prepare the context for style attributes */    /* Prepare the context for style attributes */
   DocURL = DocumentURLs[docRef];    Error_DocURL = DocumentURLs[docRef];
   LineNumber = -1;    LineNumber = -1;
   return (c);    return (c);
 }  }
Removed from v.1.347  
changed lines
  Added in v.1.348

Webmaster