diff options
| author | Michael Williamson <mike@zwobble.org> | 2017-07-21 12:31:11 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2017-07-21 12:31:11 +0100 |
| commit | 87d8554726e81add059b211c6b120dc8d5003849 (patch) | |
| tree | ea5c0eeb934d5adc8dc74dcf87836a7ba7a8770b /src/main/java/org/zwobble/mammoth/internal/styles | |
| parent | 3c4b3a32c440a47454a941865cd0bab34ade0d52 (diff) | |
Add style mapping for small caps
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/styles')
3 files changed, 28 insertions, 1 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java index 9856d70..7959acb 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java @@ -23,6 +23,7 @@ public class StyleMap { Optionals.first(high.italic, low.italic), Optionals.first(high.underline, low.underline), Optionals.first(high.strikethrough, low.strikethrough), + Optionals.first(high.smallCaps, low.smallCaps), Optionals.first(high.commentReference, low.commentReference), Lists.eagerConcat(high.paragraphStyles, low.paragraphStyles), Lists.eagerConcat(high.runStyles, low.runStyles), @@ -36,6 +37,7 @@ public class StyleMap { private final Optional<HtmlPath> italic; private final Optional<HtmlPath> underline; private final Optional<HtmlPath> strikethrough; + private final Optional<HtmlPath> smallCaps; private final Optional<HtmlPath> commentReference; private final List<StyleMapping<Paragraph>> paragraphStyles; private final List<StyleMapping<Run>> runStyles; @@ -46,6 +48,7 @@ public class StyleMap { Optional<HtmlPath> italic, Optional<HtmlPath> underline, Optional<HtmlPath> strikethrough, + Optional<HtmlPath> smallCaps, Optional<HtmlPath> commentReference, List<StyleMapping<Paragraph>> paragraphStyles, List<StyleMapping<Run>> runStyles, @@ -56,6 +59,7 @@ public class StyleMap { this.italic = italic; this.underline = underline; this.strikethrough = strikethrough; + this.smallCaps = smallCaps; this.commentReference = commentReference; this.paragraphStyles = paragraphStyles; this.runStyles = runStyles; @@ -83,6 +87,10 @@ public class StyleMap { return strikethrough; } + public Optional<HtmlPath> getSmallCaps() { + return smallCaps; + } + public Optional<HtmlPath> getCommentReference() { return commentReference; } diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java index 4972883..4e6e27b 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java @@ -11,6 +11,7 @@ import java.util.Optional; public class StyleMapBuilder { private Optional<HtmlPath> underline; private Optional<HtmlPath> strikethrough; + private Optional<HtmlPath> smallCaps; private Optional<HtmlPath> bold; private Optional<HtmlPath> italic; private Optional<HtmlPath> commentReference; @@ -22,6 +23,7 @@ public class StyleMapBuilder { this.bold = Optional.empty(); this.underline = Optional.empty(); this.strikethrough = Optional.empty(); + this.smallCaps = Optional.empty(); this.italic = Optional.empty(); this.commentReference = Optional.empty(); } @@ -46,6 +48,11 @@ public class StyleMapBuilder { return this; } + public StyleMapBuilder smallCaps(HtmlPath path) { + this.smallCaps = Optional.of(path); + return this; + } + public StyleMapBuilder commentReference(HtmlPath path) { this.commentReference = Optional.of(path); return this; @@ -67,6 +74,16 @@ public class StyleMapBuilder { } public StyleMap build() { - return new StyleMap(bold, italic, underline, strikethrough, commentReference, paragraphStyles, runStyles, breakStyles); + return new StyleMap( + bold, + italic, + underline, + strikethrough, + smallCaps, + commentReference, + paragraphStyles, + runStyles, + breakStyles + ); } } 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 db0b1bb..9f8d32b 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 @@ -27,6 +27,8 @@ public class DocumentMatcherParser { return StyleMapBuilder::underline; case "strike": return StyleMapBuilder::strikethrough; + case "small-caps": + return StyleMapBuilder::smallCaps; case "comment-reference": return StyleMapBuilder::commentReference; case "br": |
