From 56dad2617a86aeb83cf4f7f56519af621979851d Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 24 Feb 2016 21:56:31 +0000
Subject: Use Set instead of List for warnings

---
 .../mammoth/internal/DocumentToHtmlOptions.java       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/DocumentToHtmlOptions.java')

diff --git a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtmlOptions.java b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtmlOptions.java
index 4cd6372..05218a9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtmlOptions.java
+++ b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtmlOptions.java
@@ -1,27 +1,30 @@
 package org.zwobble.mammoth.internal;
 
+import org.zwobble.mammoth.internal.styles.DefaultStyles;
 import org.zwobble.mammoth.internal.styles.StyleMap;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
 
 public class DocumentToHtmlOptions {
-    public static final DocumentToHtmlOptions DEFAULT = new DocumentToHtmlOptions("", false, StyleMap.EMPTY);
+    public static final DocumentToHtmlOptions DEFAULT = new DocumentToHtmlOptions("", false, StyleMap.EMPTY, false);
 
     private final String idPrefix;
     private final boolean preserveEmptyParagraphs;
     private final StyleMap styleMap;
+    private final boolean disableDefaultStyleMap;
 
-    public DocumentToHtmlOptions(String idPrefix, boolean preserveEmptyParagraphs, StyleMap styleMap) {
+    public DocumentToHtmlOptions(String idPrefix, boolean preserveEmptyParagraphs, StyleMap styleMap, boolean disableDefaultStyleMap) {
         this.idPrefix = idPrefix;
         this.preserveEmptyParagraphs = preserveEmptyParagraphs;
         this.styleMap = styleMap;
+        this.disableDefaultStyleMap = disableDefaultStyleMap;
     }
 
     public DocumentToHtmlOptions idPrefix(String prefix) {
-        return new DocumentToHtmlOptions(prefix, preserveEmptyParagraphs, styleMap);
+        return new DocumentToHtmlOptions(prefix, preserveEmptyParagraphs, styleMap, disableDefaultStyleMap);
     }
 
     public DocumentToHtmlOptions preserveEmptyParagraphs() {
-        return new DocumentToHtmlOptions(idPrefix, true, styleMap);
+        return new DocumentToHtmlOptions(idPrefix, true, styleMap, disableDefaultStyleMap);
     }
 
     public DocumentToHtmlOptions addStyleMap(String styleMap) {
@@ -29,7 +32,11 @@ public class DocumentToHtmlOptions {
     }
 
     public DocumentToHtmlOptions addStyleMap(StyleMap styleMap) {
-        return new DocumentToHtmlOptions(idPrefix, preserveEmptyParagraphs, this.styleMap.update(styleMap));
+        return new DocumentToHtmlOptions(idPrefix, preserveEmptyParagraphs, this.styleMap.update(styleMap), disableDefaultStyleMap);
+    }
+
+    public DocumentToHtmlOptions disableDefaultStyleMap() {
+        return new DocumentToHtmlOptions(idPrefix, preserveEmptyParagraphs, styleMap, true);
     }
 
     public String idPrefix() {
@@ -41,6 +48,6 @@ public class DocumentToHtmlOptions {
     }
 
     public StyleMap styleMap() {
-        return styleMap;
+        return disableDefaultStyleMap ? styleMap : DefaultStyles.DEFAULT_STYLE_MAP.update(styleMap);
     }
 }
-- 
cgit v1.2.3