Diff for /Amaya/amaya/styleparser.c between versions 1.39 and 1.40

version 1.39, 1999/12/24 11:46:40 version 1.40, 2000/01/03 17:12:30
Line 1810  ThotBool            isHTML; Line 1810  ThotBool            isHTML;
   cssRule = ParseCSSUnit (cssRule, &margin);    cssRule = ParseCSSUnit (cssRule, &margin);
   if (margin.typed_data.unit != STYLE_UNIT_INVALID && margin.typed_data.value != 0)    if (margin.typed_data.unit != STYLE_UNIT_INVALID && margin.typed_data.value != 0)
     {      {
       TtaSetStylePresentation (PRTMargin, element, tsch, context, margin);        TtaSetStylePresentation (PRMarginTop, element, tsch, context, margin);
       if (margin.typed_data.value < 0)        if (margin.typed_data.value < 0)
         TtaSetStylePresentation (PRVertOverflow, element, tsch, context, margin);          TtaSetStylePresentation (PRVertOverflow, element, tsch, context, margin);
     }      }
Line 1841  ThotBool            isHTML; Line 1841  ThotBool            isHTML;
   cssRule = ParseCSSUnit (cssRule, &margin);    cssRule = ParseCSSUnit (cssRule, &margin);
   margin.typed_data.value = - margin.typed_data.value;    margin.typed_data.value = - margin.typed_data.value;
   /*if (margin.typed_data.unit != STYLE_UNIT_INVALID)    /*if (margin.typed_data.unit != STYLE_UNIT_INVALID)
     TtaSetStylePresentation (PRBMargin, element, tsch, context, margin)*/;      TtaSetStylePresentation (PRMarginBottom, element, tsch, context, margin)*/;
   return (cssRule);    return (cssRule);
 }  }
   
Line 1869  ThotBool            isHTML; Line 1869  ThotBool            isHTML;
   cssRule = ParseCSSUnit (cssRule, &margin);    cssRule = ParseCSSUnit (cssRule, &margin);
   if (margin.typed_data.unit != STYLE_UNIT_INVALID && margin.typed_data.value != 0)    if (margin.typed_data.unit != STYLE_UNIT_INVALID && margin.typed_data.value != 0)
     {      {
       TtaSetStylePresentation (PRLMargin, element, tsch, context, margin);        TtaSetStylePresentation (PRMarginLeft, element, tsch, context, margin);
       if (margin.typed_data.value < 0)        if (margin.typed_data.value < 0)
         TtaSetStylePresentation (PRHorizOverflow, element, tsch, context, margin);          TtaSetStylePresentation (PRHorizOverflow, element, tsch, context, margin);
       TtaSetStylePresentation (PRRMargin, element, tsch, context, margin);        TtaSetStylePresentation (PRMarginRight, element, tsch, context, margin);
     }      }
   return (cssRule);    return (cssRule);
 }  }
Line 1900  ThotBool            isHTML; Line 1900  ThotBool            isHTML;
   /* first parse the attribute string */    /* first parse the attribute string */
   cssRule = ParseCSSUnit (cssRule, &margin);    cssRule = ParseCSSUnit (cssRule, &margin);
   /*if (margin.typed_data.unit != STYLE_UNIT_INVALID)    /*if (margin.typed_data.unit != STYLE_UNIT_INVALID)
       TtaSetStylePresentation (PRRMargin, element, tsch, context, margin)*/;        TtaSetStylePresentation (PRMarginRight, element, tsch, context, margin)*/;
   return (cssRule);    return (cssRule);
 }  }
   
Line 2999  int                  len Line 2999  int                  len
       TtaGiveThotRGB (settings->value.typed_data.value, &red, &green, &blue);        TtaGiveThotRGB (settings->value.typed_data.value, &red, &green, &blue);
       usprintf (buffer, TEXT("color: #%02X%02X%02X"), red, green, blue);        usprintf (buffer, TEXT("color: #%02X%02X%02X"), red, green, blue);
       break;        break;
     case PRTMargin:      case PRMarginTop:
       if (real)        if (real)
         usprintf (buffer, TEXT("marging-top: %g"), fval);          usprintf (buffer, TEXT("marging-top: %g"), fval);
       else        else
         usprintf (buffer, TEXT("marging-top: %d"), settings->value.typed_data.value);          usprintf (buffer, TEXT("marging-top: %d"), settings->value.typed_data.value);
       add_unit = 1;        add_unit = 1;
       break;        break;
     case PRLMargin:      case PRMarginLeft:
       if (real)        if (real)
         usprintf (buffer, TEXT("margin-left: %g"), fval);          usprintf (buffer, TEXT("margin-left: %g"), fval);
       else        else

Removed from v.1.39  
changed lines
  Added in v.1.40


Webmaster