OSDN > Find Software > Catalpa > SCM > SVN > Commit

Catalpa

catalpa: Commit

0.9.3
DT, H1, H2, H3, H4, H5, H6 内での日本語組版をスキップするようにしました。
列を複数行に分けて記述するテーブル記法のバグを修正しました。

--- catalpa/trunk/src/main/java/net/osdn/catalpa/handler/BlockHandler.java (revision 130)

+++ catalpa/trunk/src/main/java/net/osdn/catalpa/handler/BlockHandler.java (revision 131)

		@@ -15,7 +15,7 @@
15	15
16	16	public class BlockHandler implements Handler {
17	17
18		- private static Pattern TABLE_BLOCK_PATTERN = Pattern.compile("(^\\\|[^\r\n]\r\n)+(^\\{[^\r\n]\\}\s\r\n)?(^\s)\r\n", Pattern.MULTILINE \| Pattern.DOTALL);
	18	+ private static Pattern TABLE_BLOCK_PATTERN = Pattern.compile("(^\\\|[^\r\n]\r\n)(^(\\\|\| )[^\r\n]\r\n)(^\\\|[^\r\n]\r\n)(^\\{[^\r\n]\\}\s\r\n)?(^\s*)\r\n", Pattern.MULTILINE \| Pattern.DOTALL);
19	19
20	20	protected static final String[] APPLICABLE_EXTENSIONS = new String[] {
21	21	".markdown",

		@@ -89,10 +89,15 @@
89	89	output.append(table);
90	90	}
91	91	for(String line : m.group(0).split("\r\n")) {
92		- if(line.lastIndexOf('\|') == 0 && line.trim().length() > 1) {
	92	+ String trim = line.trim();
	93	+ if(trim.length() > 1 && line.charAt(0) == '\|' && trim.charAt(trim.length() - 1) != '\|') {
93	94	output.append(line);
94	95	continue;
95	96	}
	97	+ if(line.startsWith(" ")) {
	98	+ output.append(line.substring(2));
	99	+ continue;
	100	+ }
96	101	output.append(line);
97	102	output.append('\r');
98	103	output.append('\n');

--- catalpa/trunk/src/main/java/net/osdn/catalpa/html/JapaneseTextLayouter.java (revision 130)

+++ catalpa/trunk/src/main/java/net/osdn/catalpa/html/JapaneseTextLayouter.java (revision 131)

		@@ -47,7 +47,7 @@
47	47	"WBR"));
48	48
49	49	private static final Set<String> ELEMENTS_TO_SKIP = new HashSet<String>(Arrays.asList(
50		- "CODE", "KBD", "PRE", "SAMP", "SCRIPT", "STYLE", "SVG", "TT", "RT", "RP"));
	50	+ "CODE", "DT", "H1", "H2", "H3", "H4", "H5", "H6", "KBD", "PRE", "SAMP", "SCRIPT", "STYLE", "SVG", "TT", "RT", "RP"));
51	51
52	52	private static final Set<String> ELEMENTS_WITH_BOUNDARY = new HashSet<String>(Arrays.asList(
53	53	"CODE", "KBD", "SAMP", "TT"));