Moxkiriyaプロジェクト事前開発用の作業部屋
| Revision | c36a06b3e18cf09ff464f3a059784e41da19a59f (tree) |
|---|---|
| Time | 2018-08-19 11:37:18 |
| Author |  Harold_Andoh <andolloyd@gmai...> |
| Commiter | Harold_Andoh |
[Moxkiriya7]
src/com/wiki/standalone/moxkiriya/parser/blockparser/WikiTableBlockParser.java (diff)
src/com/wiki/standalone/moxkiriya/resources/defaultstylesheet.css (diff)| @@ -18,22 +18,21 @@ import com.wiki.standalone.moxkiriya.parser.inlineparser.WikiThTdInlineParser; | ||
| 18 | 18 | |
| 19 | 19 | public class WikiTableBlockParser extends WikiBlockParserBase { |
| 20 | 20 | /** startタグ */ |
| 21 | - private static final String START_TAG = "<table>"; | |
| 21 | + private static final String START_TAG = "<table"; | |
| 22 | 22 | |
| 23 | 23 | /** endタグ*/ |
| 24 | 24 | private static final String END_TAG = "</table>\n"; |
| 25 | 25 | |
| 26 | 26 | /** WIKI記法の正規表現文字列 行頭パターン */ |
| 27 | 27 | private static final String NOTATION_REGEX_LINEHEAD = "^[ \t]*" |
| 28 | - + Pattern.quote("{|") | |
| 29 | - + ".*"; | |
| 28 | + + Pattern.quote("{|"); | |
| 30 | 29 | |
| 31 | 30 | /** WIKI記法の正規表現文字列 行末パターン */ |
| 32 | 31 | private static final String NOTATION_REGEX_LINETAIL = "^[ \t]*" |
| 33 | 32 | + Pattern.quote("|}"); |
| 34 | 33 | |
| 35 | 34 | /** WIKI記法の正規表現文字列 */ |
| 36 | - public static final String NOTATION_REGEX = NOTATION_REGEX_LINEHEAD; | |
| 35 | + public static final String NOTATION_REGEX = NOTATION_REGEX_LINEHEAD + ".*"; | |
| 37 | 36 | |
| 38 | 37 | /** CSSセレクターマップ */ |
| 39 | 38 | private static final LinkedHashMap<String, String> selectorMap_ = new LinkedHashMap<String, String>() { |
| @@ -87,15 +86,18 @@ public class WikiTableBlockParser extends WikiBlockParserBase { | ||
| 87 | 86 | for(String key: selectorMap_.keySet()) { |
| 88 | 87 | if(style.startsWith(key) == true) { |
| 89 | 88 | selector = selectorMap_.get(key); |
| 89 | + style = style.substring(style.indexOf(key) + key.length()); | |
| 90 | 90 | break; |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | if(selector.isEmpty() != true) { |
| 95 | + buf.append(" "); | |
| 95 | 96 | buf.append(selector); |
| 96 | 97 | buf.append("\"" + style + "\""); |
| 97 | 98 | } |
| 98 | 99 | } |
| 100 | + buf.append(">\n"); | |
| 99 | 101 | |
| 100 | 102 | return ""; |
| 101 | 103 | } |
| @@ -37,7 +37,7 @@ code { | ||
| 37 | 37 | |
| 38 | 38 | table { |
| 39 | 39 | border-collapse: collapse; |
| 40 | - border: solid 2px #c0c0c0; | |
| 40 | + border: solid 1px #c0c0c0; | |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | table th { |
| @@ -54,5 +54,20 @@ table td { | ||
| 54 | 54 | padding-left: 1em; |
| 55 | 55 | padding-right: 1em; |
| 56 | 56 | padding-top: 0.5em; |
| 57 | - padding-bottom: 0.5em; | |
| 58 | -} | |
| \ No newline at end of file | ||
| 57 | + padding-bottom: 0.5em; | |
| 58 | +} | |
| 59 | + | |
| 60 | +table.transparent { | |
| 61 | + border-collapse: collapse; | |
| 62 | + border: solid 0px; | |
| 63 | +} | |
| 64 | + | |
| 65 | +table.transparent th, table.transparent td { | |
| 66 | + background: #ffffff; | |
| 67 | + border: solid 0px #000000; | |
| 68 | + padding-left: 1em; | |
| 69 | + padding-right: 1em; | |
| 70 | + padding-top: 0.5em; | |
| 71 | + padding-bottom: 0.5em; | |
| 72 | +} | |
| 73 | + |
Fork