• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1598 (tree)
Time2020-02-25 10:30:01
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/branches/3.1/homare/pom.xml (revision 1597)
+++ copper/branches/3.1/homare/pom.xml (revision 1598)
@@ -9,7 +9,7 @@
99 <groupId>net.zamasoft</groupId>
1010 <artifactId>homare</artifactId>
1111 <packaging>jar</packaging>
12- <version>3.1.13</version>
12+ <version>3.1.15</version>
1313 <name>Homare</name>
1414 <description>印刷向けのHTML/CSSレンダリングエンジンです。</description>
1515 <url>http://copper.sourceforge.jp/homare/</url>
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/css/html/HTMLStyle.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/css/html/HTMLStyle.java (revision 1598)
@@ -563,6 +563,7 @@
563563 case HTMLCodes.WBR:
564564 // <WBR>
565565 style.set(Content.INFO, WBR);
566+ style.set(WhiteSpace.INFO, WhiteSpaceValue.NORMAL_VALUE);
566567 break;
567568 case HTMLCodes.SELECT: {
568569 // <SELECT>
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/impl/objects/barcode/BarcodeImage.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/impl/objects/barcode/BarcodeImage.java (revision 1598)
@@ -211,4 +211,8 @@
211211 this.buffer.add(this.text);
212212 }
213213 }
214+
215+ public void finish() {
216+ this.flush();
217+ }
214218 }
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/impl/ua/svg/SVGUserAgentFactory.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/impl/ua/svg/SVGUserAgentFactory.java (revision 1598)
@@ -14,7 +14,7 @@
1414 }
1515
1616 public Iterator<Type> types() {
17- return Arrays.asList(new Type[] { new Type("SVG", MIME_TYPE, "pdf") }).iterator();
17+ return Arrays.asList(new Type[] { new Type("SVG", MIME_TYPE, "svg") }).iterator();
1818 }
1919
2020 public UserAgent createUserAgent() {
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/box/impl/TextBlockBox.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/box/impl/TextBlockBox.java (revision 1598)
@@ -356,7 +356,7 @@
356356 line.box.restyle(textUnitizer, i == 0);
357357 }
358358 // System.err.println("*** end");
359- textUnitizer.flush();
359+ textUnitizer.finish();
360360 }
361361
362362 public final boolean avoidBreakAfter() {
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/BuilderGlyphHandler.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/BuilderGlyphHandler.java (revision 1598)
@@ -20,7 +20,7 @@
2020 /**
2121 * 改行を処理し、インラインボックスの幅を確定します。
2222 *
23- * @author <a href="tatsuhiko at miya.be">MIYABE Tatsuhiko</a>
23+ * @author MIYABE Tatsuhiko
2424 * @version $Id$
2525 */
2626 public class BuilderGlyphHandler implements GlyphHandler {
@@ -231,6 +231,7 @@
231231 }
232232
233233 public void flush() {
234+ //System.err.println("BGH FLUSH: "+this.wrap);
234235 if (!this.wrap && !this.toLineFeed) {
235236 return;
236237 }
@@ -237,4 +238,8 @@
237238 this.toLineFeed = false;
238239 this.builder.flush();
239240 }
241+
242+ public void finish() {
243+ this.builder.flush();
244+ }
240245 }
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/StyledTextUnitizer.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/StyledTextUnitizer.java (revision 1598)
@@ -135,7 +135,7 @@
135135 final AbstractTextParams params = (AbstractTextParams) this.textParamsStack
136136 .remove(this.textParamsStack.size() - 1);
137137 if (this.glypher != null) {
138- this.glypher.flush();
138+ this.glypher.finish();
139139 this.glypher = null;
140140 this.gh.builder.endTextBlock();
141141 }
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/TextBuilder.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/TextBuilder.java (revision 1598)
@@ -1005,7 +1005,7 @@
10051005 if (this.textBuffer.isEmpty()) {
10061006 return false;
10071007 }
1008- if (this.wrap && this.lineAxis > 0) {
1008+ if (this.lineAxis > 0) {
10091009 if (this.firstUnit) {
10101010 this.locateLine();
10111011 this.firstUnit = false;
--- copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/TwoPassBlockBuilder.java (revision 1597)
+++ copper/branches/3.1/homare/src/main/java/jp/cssj/homare/style/builder/impl/TwoPassBlockBuilder.java (revision 1598)
@@ -634,7 +634,7 @@
634634 if (DEBUG) {
635635 System.err.println("END_TEXT_BLOCK");
636636 }
637- textUnitizer.flush();
637+ textUnitizer.finish();
638638 textUnitizer = null;
639639 builder.endTextBlock();
640640 break;
@@ -923,6 +923,10 @@
923923 this.clearFloatAdvance(Types.CLEAR_BOTH);
924924 }
925925 }
926+
927+ public void finish() {
928+ this.flush();
929+ }
926930
927931 public void endTextBlock() {
928932 this.recordTypes.add(TYPE_END_TEXT_BLOCK);
--- copper/branches/3.1/sakae/sakae-core/pom.xml (revision 1597)
+++ copper/branches/3.1/sakae/sakae-core/pom.xml (revision 1598)
@@ -18,7 +18,7 @@
1818 <dependency>
1919 <groupId>net.zamasoft</groupId>
2020 <artifactId>zs-font</artifactId>
21- <version>1.0.1</version>
21+ <version>1.0.2</version>
2222 </dependency>
2323 <dependency>
2424 <groupId>net.zamasoft</groupId>
--- copper/branches/3.1/sakae/zs-font/pom.xml (revision 1597)
+++ copper/branches/3.1/sakae/zs-font/pom.xml (revision 1598)
@@ -6,7 +6,7 @@
66 <groupId>net.zamasoft</groupId>
77 <artifactId>zs-font</artifactId>
88 <packaging>jar</packaging>
9- <version>1.0.1</version>
9+ <version>1.0.2</version>
1010 <name>Font Library</name>
1111 <description>
1212 Apache Batik 1.7 のフォント読み込みライブラリ(org.apache.batik.svggen.font)から派生したフォントライブラリです。
Show on old repository browser