• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1585 (tree)
Time2019-03-27 10:43:42
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/trunk/homare/pom.xml (revision 1584)
+++ copper/trunk/homare/pom.xml (revision 1585)
@@ -9,7 +9,7 @@
99 <groupId>net.zamasoft</groupId>
1010 <artifactId>homare</artifactId>
1111 <packaging>jar</packaging>
12- <version>3.2.4</version>
12+ <version>3.2.5</version>
1313 <name>Homare</name>
1414 <description>印刷向けのHTML/CSSレンダリングエンジンです。</description>
1515 <url>http://copper.osdn.jp/homare/</url>
@@ -18,7 +18,7 @@
1818 <dependency>
1919 <groupId>net.zamasoft</groupId>
2020 <artifactId>sakae-pdf</artifactId>
21- <version>0.9.6</version>
21+ <version>0.9.7</version>
2222 </dependency>
2323 <dependency>
2424 <groupId>net.zamasoft</groupId>
--- copper/trunk/sakae/pom.xml (revision 1584)
+++ copper/trunk/sakae/pom.xml (revision 1585)
@@ -9,7 +9,7 @@
99 <groupId>net.zamasoft</groupId>
1010 <artifactId>sakae</artifactId>
1111 <packaging>pom</packaging>
12- <version>0.9.6</version>
12+ <version>0.9.7</version>
1313 <name>Sakae</name>
1414 <description>縦書きテキストに対応した、シンプルなグラフィックコンテキストです。</description>
1515 <url>http://copper.osdn.jp/sakae/</url>
--- copper/trunk/sakae/sakae-core/pom.xml (revision 1584)
+++ copper/trunk/sakae/sakae-core/pom.xml (revision 1585)
@@ -106,6 +106,6 @@
106106 <parent>
107107 <groupId>net.zamasoft</groupId>
108108 <artifactId>sakae</artifactId>
109- <version>0.9.6</version>
109+ <version>0.9.7</version>
110110 </parent>
111111 </project>
\ No newline at end of file
--- copper/trunk/sakae/sakae-pdf/pom.xml (revision 1584)
+++ copper/trunk/sakae/sakae-pdf/pom.xml (revision 1585)
@@ -16,7 +16,7 @@
1616 <dependency>
1717 <groupId>net.zamasoft</groupId>
1818 <artifactId>sakae-core</artifactId>
19- <version>0.9.6</version>
19+ <version>0.9.7</version>
2020 </dependency>
2121 <dependency>
2222 <groupId>org.apache.xmlgraphics</groupId>
@@ -168,6 +168,6 @@
168168 <parent>
169169 <groupId>net.zamasoft</groupId>
170170 <artifactId>sakae</artifactId>
171- <version>0.9.6</version>
171+ <version>0.9.7</version>
172172 </parent>
173173 </project>
\ No newline at end of file
--- copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/PdfFontSourceManagerConfigurationHandler.java (revision 1584)
+++ copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/PdfFontSourceManagerConfigurationHandler.java (revision 1585)
@@ -230,6 +230,7 @@
230230 Source source = null;
231231 try {
232232 source = this.resolver.resolve(URIHelper.resolve("UTF-8", this.base, warraySrc));
233+
233234 FontFace face = FontLoader.toFontFace(atts);
234235 PdfFontSource[] sources = FontLoader.readCIDKeyedFont(source, face, this.nameToCMap);
235236 this.fontSources = new PdfFontSourceWrapper[sources.length];
--- copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/cid/keyed/CIDKeyedFont.java (revision 1584)
+++ copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/cid/keyed/CIDKeyedFont.java (revision 1585)
@@ -18,6 +18,7 @@
1818 import jp.cssj.sakae.pdf.font.cid.CIDTable;
1919 import jp.cssj.sakae.pdf.font.cid.CIDUtils;
2020 import jp.cssj.sakae.pdf.font.cid.CMap;
21+import jp.cssj.sakae.pdf.font.cid.WArray;
2122 import jp.cssj.sakae.pdf.font.util.PdfFontUtils;
2223 import jp.cssj.sakae.pdf.gc.PdfGC;
2324
@@ -239,7 +240,8 @@
239240
240241 public short getWidth(int gid) {
241242 CIDKeyedFontSource source = (CIDKeyedFontSource) this.source;
242- short w = source.getWArray().getWidth(gid);
243+ WArray wa = source.getWArray();
244+ short w = wa.getWidth(gid);
243245 return w;
244246 }
245247
--- copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/cid/keyed/CIDKeyedFontSource.java (revision 1584)
+++ copper/trunk/sakae/sakae-pdf/src/main/java/jp/cssj/sakae/pdf/font/cid/keyed/CIDKeyedFontSource.java (revision 1585)
@@ -125,6 +125,9 @@
125125 }
126126
127127 public void setWArray(WArray warray) {
128+ if (warray == null) {
129+ throw new NullPointerException();
130+ }
128131 this.warray = warray;
129132 this.spaceAdvance = warray.getWidth(this.hcmap.getCIDTable().toCID(' '));
130133 }
--- copper/trunk/sakae/sakae-pdf/src/main/resources/jp/cssj/sakae/pdf/font/builtin/fonts.xml (revision 1584)
+++ copper/trunk/sakae/sakae-pdf/src/main/resources/jp/cssj/sakae/pdf/font/builtin/fonts.xml (revision 1585)
@@ -112,10 +112,10 @@
112112 <cid-keyed-font name="EUC-Gothic" panose="8 1 2 11 6 9 7 2 5 8 2 4"
113113 cmap="EUC-H" vcmap="EUC-V" warray="warrays/monospace_jis.txt" />
114114
115- <!-- Adobe Japan 1 6 -->
116- <cid-keyed-font name="AJ16UniJIS-Mincho" panose="1 5 2 2 6 9 4 2 5 8 3 4"
115+ <!-- Adobe Japan 1 7 -->
116+ <cid-keyed-font name="AJ17UniJIS-Mincho" panose="1 5 2 2 6 9 4 2 5 8 3 4"
117117 cmap="UniJIS-UTF16-H" vcmap="UniJIS-UTF16-V" warray="warrays/monospace_jis.txt" />
118- <cid-keyed-font name="AJ16UniJIS-Gothic" panose="8 1 2 11 6 9 7 2 5 8 2 4"
118+ <cid-keyed-font name="AJ17UniJIS-Gothic" panose="8 1 2 11 6 9 7 2 5 8 2 4"
119119 cmap="UniJIS-UTF16-H" vcmap="UniJIS-UTF16-V" warray="warrays/monospace_jis.txt" />
120120
121121 <!-- JIS 2004 -->
Show on old repository browser