(empty log message)
copper/trunk/homare/src/main/java/jp/cssj/homare/css/property/ElementPropertySet.java (diff) copper/trunk/homare/src/main/java/jp/cssj/homare/impl/css/property/css3/TextStrokeColor.java (diff) copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/gc/PdfGC.java (diff)| @@ -330,6 +330,7 @@ | ||
| 330 | 330 | this.nameToInfo.put("-webkit-text-stroke-color", TextStrokeColor.INFO); |
| 331 | 331 | this.nameToInfo.put("-webkit-text-fill-color", TextFillColor.INFO); |
| 332 | 332 | this.nameToInfo.put("-webkit-text-stroke", TextStrokeShorthand.INFO); |
| 333 | + this.nameToInfo.put("-webkit-background-clip", BackgroundClip.INFO); | |
| 333 | 334 | |
| 334 | 335 | this.nameToInfo.put("oeb-column-number", ColumnCount.INFO); |
| 335 | 336 | this.nameToInfo.put("-epub-writing-mode", WritingModeShorthand.INFO); |
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | import jp.cssj.homare.css.util.ColorValueUtils; |
| 10 | 10 | import jp.cssj.homare.css.value.ColorValue; |
| 11 | 11 | import jp.cssj.homare.css.value.DefaultValue; |
| 12 | -import jp.cssj.homare.css.value.TransparentValue; | |
| 13 | 12 | import jp.cssj.homare.css.value.Value; |
| 14 | 13 | import jp.cssj.homare.impl.css.property.CSSColor; |
| 15 | 14 | import jp.cssj.homare.ua.UserAgent; |
| @@ -24,9 +23,6 @@ | ||
| 24 | 23 | |
| 25 | 24 | public static jp.cssj.sakae.gc.paint.Color get(CSSStyle style) { |
| 26 | 25 | Value value = style.get(TextStrokeColor.INFO); |
| 27 | - if (value.getValueType() == Value.TYPE_TRANSPARENT) { | |
| 28 | - return null; | |
| 29 | - } | |
| 30 | 26 | if (value == DefaultValue.DEFAULT_VALUE) { |
| 31 | 27 | return CSSColor.get(style); |
| 32 | 28 | } |
| @@ -53,9 +49,6 @@ | ||
| 53 | 49 | if (lu.getLexicalUnitType() == LexicalUnit.SAC_IDENT && lu.getStringValue().equalsIgnoreCase("currentcolor")) { |
| 54 | 50 | return DefaultValue.DEFAULT_VALUE; |
| 55 | 51 | } |
| 56 | - if (ColorValueUtils.isTransparent(lu)) { | |
| 57 | - return TransparentValue.TRANSPARENT_VALUE; | |
| 58 | - } | |
| 59 | 52 | Value value = ColorValueUtils.toColor(ua, lu); |
| 60 | 53 | if (value == null) { |
| 61 | 54 | throw new PropertyException(); |
| @@ -896,7 +896,7 @@ | ||
| 896 | 896 | default: |
| 897 | 897 | throw new IllegalStateException(); |
| 898 | 898 | } |
| 899 | - if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR) { | |
| 899 | + if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR && this.fillAlpha == 1) { | |
| 900 | 900 | this.q(); |
| 901 | 901 | localContext = true; |
| 902 | 902 | this.out.writeReal(enlargement); |
| @@ -1004,7 +1004,7 @@ | ||
| 1004 | 1004 | // テキスト終了 |
| 1005 | 1005 | this.out.writeOperator("ET"); |
| 1006 | 1006 | |
| 1007 | - if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR) { | |
| 1007 | + if (enlargement > 0 && this.fillPaint.getPaintType() == Paint.COLOR && this.fillAlpha == 1) { | |
| 1008 | 1008 | // Bold終了 |
| 1009 | 1009 | this.out.writeInt(TEXT_MODE_FILL); |
| 1010 | 1010 | this.out.writeOperator("Tr"); |