diff options
| author | Michael Williamson <mike@zwobble.org> | 2017-11-04 11:59:23 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2017-11-04 11:59:23 +0000 |
| commit | 2c8eb41429855af4ffba5b72fca11e08d699c08c (patch) | |
| tree | 5b9e2c26a0feb8e868d277957aef5a59936662cc /src/main/java/org/zwobble/mammoth | |
| parent | 97d89378d24b46742c38c1b74159537da45769ad (diff) | |
Include table style mapping parsing in document matching parsing
Diffstat (limited to 'src/main/java/org/zwobble/mammoth')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/styles/parsing/DocumentMatcherParser.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/DocumentMatcherParser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/DocumentMatcherParser.java index c49096b..f955431 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/DocumentMatcherParser.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/DocumentMatcherParser.java @@ -19,6 +19,9 @@ public class DocumentMatcherParser { case "r": RunMatcher run = parseRunMatcher(tokens); return (builder, path) -> builder.mapRun(run, path); + case "table": + TableMatcher table = parseTableMatcher(tokens); + return (builder, path) -> builder.mapTable(table, path); case "b": return StyleMapBuilder::bold; case "i": @@ -39,20 +42,20 @@ public class DocumentMatcherParser { } } - public static ParagraphMatcher parseParagraphMatcher(TokenIterator<TokenType> tokens) { + private static ParagraphMatcher parseParagraphMatcher(TokenIterator<TokenType> tokens) { Optional<String> styleId = parseStyleId(tokens); Optional<StringMatcher> styleName = parseStyleName(tokens); Optional<NumberingLevel> numbering = parseNumbering(tokens); return new ParagraphMatcher(styleId, styleName, numbering); } - public static RunMatcher parseRunMatcher(TokenIterator<TokenType> tokens) { + private static RunMatcher parseRunMatcher(TokenIterator<TokenType> tokens) { Optional<String> styleId = parseStyleId(tokens); Optional<StringMatcher> styleName = parseStyleName(tokens); return new RunMatcher(styleId, styleName); } - public static TableMatcher parseTableMatcher(TokenIterator<TokenType> tokens) { + private static TableMatcher parseTableMatcher(TokenIterator<TokenType> tokens) { Optional<String> styleId = parseStyleId(tokens); Optional<StringMatcher> styleName = parseStyleName(tokens); return new TableMatcher(styleId, styleName); |
