Amaya/amaya/styleparser.c - diff

Return to styleparser.c CVS log

Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/styleparser.c between versions 1.350 and 1.351

-version 1.350, 2006/03/08 12:02:58
+version 1.351, 2006/03/27 11:01:06
  Line 3079  static char *ParseACSSFontWeight (Elemen
    weight.typed_data.unit = UNIT_REL;
    weight.typed_data.real = FALSE;
    cssRule = SkipBlanksAndComments (cssRule);
-   if (!strncasecmp (cssRule, "100", 3) && cssRule[3] != '%' &&
+   if (isdigit (*cssRule) && *cssRule != '0' &&
-       !isalpha (cssRule[3]))
+       cssRule[1] == '0' && cssRule[2] == '0' &&
-     {
+       (cssRule[3] == EOS || cssRule[3] == SPACE || cssRule[3] == '/' ||
-       weight.typed_data.value = -3;
+        cssRule[3] == ';' || cssRule[3] == '}' || cssRule[3] == EOL ||
-       cssRule = SkipWord (cssRule);
+        cssRule[3] == TAB || cssRule[3] ==  __CR__))
-     }
+     {
-   else if (!strncasecmp (cssRule, "200", 3) && !isalpha (cssRule[3]))
+       if (!strncasecmp (cssRule, "100", 3))
-     {
+         {
-       weight.typed_data.value = -2;
+           weight.typed_data.value = -3;
-       cssRule = SkipWord (cssRule);
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "200", 3))
+         {
+           weight.typed_data.value = -2;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "300", 3))
+         {
+           weight.typed_data.value = -1;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "400", 3))
+         {
+           weight.typed_data.value = 0;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "500", 3))
+         {
+           weight.typed_data.value = +1;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "600", 3))
+         {
+           weight.typed_data.value = +2;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "700", 3))
+         {
+           weight.typed_data.value = +3;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "800", 3))
+         {
+           weight.typed_data.value = +4;
+           cssRule = SkipWord (cssRule);
+         }
+       else if (!strncasecmp (cssRule, "900", 3))
+         {
+           weight.typed_data.value = +5;
+           cssRule = SkipWord (cssRule);
+         }
      }
-   else if (!strncasecmp (cssRule, "300", 3) && ! isalpha(cssRule[3]))
+   else if (!strncasecmp (cssRule, "normal", 6))
-     {
-       weight.typed_data.value = -1;
-       cssRule = SkipWord (cssRule);
-     }
-   else if (!strncasecmp (cssRule, "normal", 6) ||
-            (!strncasecmp (cssRule, "400", 3) && !isalpha (cssRule[3])))
      {
        weight.typed_data.value = 0;
        cssRule = SkipWord (cssRule);
      }
-   else if (!strncasecmp (cssRule, "500", 3) && !isalpha (cssRule[3]))
+   else if (!strncasecmp (cssRule, "bold", 4))
-     {
-       weight.typed_data.value = +1;
-       cssRule = SkipWord (cssRule);
-     }
-   else if (!strncasecmp (cssRule, "600", 3) && !isalpha (cssRule[3]))
-     {
-       weight.typed_data.value = +2;
-       cssRule = SkipWord (cssRule);
-     }
-   else if (!strncasecmp (cssRule, "bold", 4) ||
-            (!strncasecmp (cssRule, "700", 3) && !isalpha (cssRule[3])))
      {
        weight.typed_data.value = +3;
        cssRule = SkipWord (cssRule);
      }
-   else if (!strncasecmp (cssRule, "800", 3) && !isalpha (cssRule[3]))
-     {
-       weight.typed_data.value = +4;
-       cssRule = SkipWord (cssRule);
-     }
-   else if (!strncasecmp (cssRule, "900", 3) && !isalpha (cssRule[3]))
-     {
-       weight.typed_data.value = +5;
-       cssRule = SkipWord (cssRule);
-     }
    else if (!strncasecmp (cssRule, "inherit", 7))
      {
        weight.typed_data.unit = VALUE_INHERIT;

Webmaster

Removed from v.1.350
changed lines
	Added in v.1.351