• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1630 (tree)
Time2022-05-12 16:40:11
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/trunk/homare/src/main/java/jp/cssj/homare/css/property/ElementPropertySet.java (revision 1629)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/css/property/ElementPropertySet.java (revision 1630)
@@ -330,6 +330,7 @@
330330 this.nameToInfo.put("-webkit-text-stroke-color", TextStrokeColor.INFO);
331331 this.nameToInfo.put("-webkit-text-fill-color", TextFillColor.INFO);
332332 this.nameToInfo.put("-webkit-text-stroke", TextStrokeShorthand.INFO);
333+ this.nameToInfo.put("-webkit-background-clip", BackgroundClip.INFO);
333334
334335 this.nameToInfo.put("oeb-column-number", ColumnCount.INFO);
335336 this.nameToInfo.put("-epub-writing-mode", WritingModeShorthand.INFO);
--- copper/trunk/homare/src/main/java/jp/cssj/homare/impl/css/property/css3/TextStrokeColor.java (revision 1629)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/impl/css/property/css3/TextStrokeColor.java (revision 1630)
@@ -9,7 +9,6 @@
99 import jp.cssj.homare.css.util.ColorValueUtils;
1010 import jp.cssj.homare.css.value.ColorValue;
1111 import jp.cssj.homare.css.value.DefaultValue;
12-import jp.cssj.homare.css.value.TransparentValue;
1312 import jp.cssj.homare.css.value.Value;
1413 import jp.cssj.homare.impl.css.property.CSSColor;
1514 import jp.cssj.homare.ua.UserAgent;
@@ -24,9 +23,6 @@
2423
2524 public static jp.cssj.sakae.gc.paint.Color get(CSSStyle style) {
2625 Value value = style.get(TextStrokeColor.INFO);
27- if (value.getValueType() == Value.TYPE_TRANSPARENT) {
28- return null;
29- }
3026 if (value == DefaultValue.DEFAULT_VALUE) {
3127 return CSSColor.get(style);
3228 }
@@ -53,9 +49,6 @@
5349 if (lu.getLexicalUnitType() == LexicalUnit.SAC_IDENT && lu.getStringValue().equalsIgnoreCase("currentcolor")) {
5450 return DefaultValue.DEFAULT_VALUE;
5551 }
56- if (ColorValueUtils.isTransparent(lu)) {
57- return TransparentValue.TRANSPARENT_VALUE;
58- }
5952 Value value = ColorValueUtils.toColor(ua, lu);
6053 if (value == null) {
6154 throw new PropertyException();
--- copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/gc/PdfGC.java (revision 1629)
+++ copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/gc/PdfGC.java (revision 1630)
@@ -896,7 +896,7 @@
896896 default:
897897 throw new IllegalStateException();
898898 }
899- if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR) {
899+ if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR && this.fillAlpha == 1) {
900900 this.q();
901901 localContext = true;
902902 this.out.writeReal(enlargement);
@@ -1004,7 +1004,7 @@
10041004 // テキスト終了
10051005 this.out.writeOperator("ET");
10061006
1007- if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR) {
1007+ if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR && this.fillAlpha == 1) {
10081008 // Bold終了
10091009 this.out.writeInt(TEXT_MODE_FILL);
10101010 this.out.writeOperator("Tr");
Show on old repository browser