(empty log message)
copper/trunk/homare/pom.xml (diff)
copper/trunk/sakae/sakae-core/src/main/java/jp/cssj/sakae/font/otf/OpenTypeFont.java (diff)| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | <groupId>net.zamasoft</groupId> |
| 10 | 10 | <artifactId>homare</artifactId> |
| 11 | 11 | <packaging>jar</packaging> |
| 12 | - <version>3.2.24</version> | |
| 12 | + <version>3.2.27</version> | |
| 13 | 13 | <name>Homare</name> |
| 14 | 14 | <description>印刷向けのHTML/CSSレンダリングエンジンです。</description> |
| 15 | 15 | <url>https://copper.osdn.jp/homare/</url> |
| @@ -183,14 +183,13 @@ | ||
| 183 | 183 | } |
| 184 | 184 | } else if (CL02.contains((char) scid) && this.getWidth(sgid) > 500) { |
| 185 | 185 | int cid = this.toChar(gid); |
| 186 | - if ((CL01.contains((char) cid) && this.getWidth(gid) > 500) | |
| 187 | - || (CL02.contains((char) cid) && this.getWidth(gid) > 500) || CL0607.contains((char) cid)) { | |
| 186 | + if ((CL01.contains((char) cid) || CL02.contains((char) cid) || CL0607.contains((char) cid)) | |
| 187 | + && this.getWidth(gid) > 500) { | |
| 188 | 188 | return 500; |
| 189 | 189 | } |
| 190 | - } else if (CL0607.contains((char) scid)) { | |
| 190 | + } else if (CL0607.contains((char) scid) && this.getWidth(sgid) > 500) { | |
| 191 | 191 | int cid = this.toChar(gid); |
| 192 | - if ((CL01.contains((char) cid) && this.getWidth(gid) > 500) | |
| 193 | - || (CL02.contains((char) cid) && this.getWidth(gid) > 500)) { | |
| 192 | + if ((CL01.contains((char) cid) || (CL02.contains((char) cid)) && this.getWidth(gid) > 500)) { | |
| 194 | 193 | return 500; |
| 195 | 194 | } |
| 196 | 195 | } |