From 9085e20dfdc9883e4eafebdac342fc5ade851659 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 28 Nov 2016 12:29:34 +0000 Subject: Add break styles to StyleMap --- .../java/org/zwobble/mammoth/internal/styles/StyleMap.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java') 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 commentReference; private final List> paragraphStyles; private final List> runStyles; + private final List> breakStyles; public StyleMap( Optional bold, @@ -44,7 +48,9 @@ public class StyleMap { Optional strikethrough, Optional commentReference, List> paragraphStyles, - List> runStyles) + List> runStyles, + List> 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) { -- cgit v1.2.3