diff options
Diffstat (limited to 'src/main/java/org/zwobble')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java | 11 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java | 4 |
2 files changed, 12 insertions, 3 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 f2222a9..0e8ed6d 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java @@ -1,5 +1,6 @@ package org.zwobble.mammoth.internal.styles; +import org.zwobble.mammoth.internal.documents.Break; import org.zwobble.mammoth.internal.documents.Paragraph; import org.zwobble.mammoth.internal.documents.Run; import org.zwobble.mammoth.internal.util.Lists; @@ -24,7 +25,9 @@ public class StyleMap { Optionals.first(high.strikethrough, low.strikethrough), Optionals.first(high.commentReference, low.commentReference), Lists.eagerConcat(high.paragraphStyles, low.paragraphStyles), - Lists.eagerConcat(high.runStyles, low.runStyles)); + Lists.eagerConcat(high.runStyles, low.runStyles), + Lists.eagerConcat(high.breakStyles, low.breakStyles) + ); } public static final StyleMap EMPTY = new StyleMapBuilder().build(); @@ -36,6 +39,7 @@ public class StyleMap { private final Optional<HtmlPath> commentReference; private final List<StyleMapping<Paragraph>> paragraphStyles; private final List<StyleMapping<Run>> runStyles; + private final List<StyleMapping<Break>> breakStyles; public StyleMap( Optional<HtmlPath> bold, @@ -44,7 +48,9 @@ public class StyleMap { Optional<HtmlPath> strikethrough, Optional<HtmlPath> commentReference, List<StyleMapping<Paragraph>> paragraphStyles, - List<StyleMapping<Run>> runStyles) + List<StyleMapping<Run>> runStyles, + List<StyleMapping<Break>> breakStyles + ) { this.bold = bold; this.italic = italic; @@ -53,6 +59,7 @@ public class StyleMap { this.commentReference = commentReference; this.paragraphStyles = paragraphStyles; this.runStyles = runStyles; + this.breakStyles = breakStyles; } public StyleMap update(StyleMap styleMap) { 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 e834715..2d66f2a 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java @@ -1,5 +1,6 @@ package org.zwobble.mammoth.internal.styles; +import org.zwobble.mammoth.internal.documents.Break; import org.zwobble.mammoth.internal.documents.Paragraph; import org.zwobble.mammoth.internal.documents.Run; @@ -15,6 +16,7 @@ public class StyleMapBuilder { private Optional<HtmlPath> commentReference; private final List<StyleMapping<Paragraph>> paragraphStyles = new ArrayList<>(); private final List<StyleMapping<Run>> runStyles = new ArrayList<>(); + private final List<StyleMapping<Break>> breakStyles = new ArrayList<>(); public StyleMapBuilder() { this.bold = Optional.empty(); @@ -60,6 +62,6 @@ public class StyleMapBuilder { } public StyleMap build() { - return new StyleMap(bold, italic, underline, strikethrough, commentReference, paragraphStyles, runStyles); + return new StyleMap(bold, italic, underline, strikethrough, commentReference, paragraphStyles, runStyles, breakStyles); } } |
