From 2c8eb41429855af4ffba5b72fca11e08d699c08c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 4 Nov 2017 11:59:23 +0000 Subject: Include table style mapping parsing in document matching parsing --- .../mammoth/internal/styles/parsing/DocumentMatcherParser.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/org') 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 tokens) { + private static ParagraphMatcher parseParagraphMatcher(TokenIterator tokens) { Optional styleId = parseStyleId(tokens); Optional styleName = parseStyleName(tokens); Optional numbering = parseNumbering(tokens); return new ParagraphMatcher(styleId, styleName, numbering); } - public static RunMatcher parseRunMatcher(TokenIterator tokens) { + private static RunMatcher parseRunMatcher(TokenIterator tokens) { Optional styleId = parseStyleId(tokens); Optional styleName = parseStyleName(tokens); return new RunMatcher(styleId, styleName); } - public static TableMatcher parseTableMatcher(TokenIterator tokens) { + private static TableMatcher parseTableMatcher(TokenIterator tokens) { Optional styleId = parseStyleId(tokens); Optional styleName = parseStyleName(tokens); return new TableMatcher(styleId, styleName); -- cgit v1.2.3