From 61600d17480dc6efff890e91f98bbf6a49c4dd53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Larch?= <renelarch@gmail.com>
Date: Tue, 9 Jul 2024 15:49:08 +0200
Subject: [PATCH 1/3] feat: add paragraph alignment

---
 .../mammoth/internal/documents/Alignment.java | 13 +++++++
 .../mammoth/internal/documents/Paragraph.java |  7 ++++
 .../internal/docx/StatefulBodyXmlReader.java  | 18 ++++++++-
 .../internal/styles/ParagraphMatcher.java     | 22 +++++++----
 .../styles/parsing/DocumentMatcherParser.java | 39 ++++++++++++++++++-
 .../documents/DocumentElementMakers.java      |  6 +++
 6 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/org/zwobble/mammoth/internal/documents/Alignment.java

diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Alignment.java b/src/main/java/org/zwobble/mammoth/internal/documents/Alignment.java
new file mode 100644
index 00000000..c9d45f89
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Alignment.java
@@ -0,0 +1,13 @@
+package org.zwobble.mammoth.internal.documents;
+
+public class Alignment {
+    private final String value;
+    
+    public Alignment(String value){
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java b/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java
index 58c3453e..3f44da01 100644
--- a/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java
@@ -5,17 +5,20 @@
 
 public class Paragraph implements DocumentElement, HasChildren {
     private final Optional<Style> style;
+    private final Optional<Alignment> alignment;
     private final Optional<NumberingLevel> numbering;
     private final ParagraphIndent indent;
     private final List<DocumentElement> children;
 
     public Paragraph(
         Optional<Style> style,
+        Optional<Alignment> alignment,
         Optional<NumberingLevel> numbering,
         ParagraphIndent indent,
         List<DocumentElement> children
     ) {
         this.style = style;
+        this.alignment = alignment;
         this.numbering = numbering;
         this.indent = indent;
         this.children = children;
@@ -25,6 +28,10 @@ public Optional<Style> getStyle() {
         return style;
     }
 
+    public Optional<Alignment> getAlignment() {
+        return alignment;
+    }
+
     public Optional<NumberingLevel> getNumbering() {
         return numbering;
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
index d17a404f..e897600d 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -269,6 +269,7 @@ private ReadResult readParagraph(XmlElement element) {
             return ReadResult.success(list());
         } else {
             ParagraphIndent indent = readParagraphIndent(properties);
+            Optional<Alignment> alignment = readParagraphAlignment(properties);
             List<XmlNode> childrenXml = element.getChildren();
             if (!deletedParagraphContents.isEmpty()) {
                 childrenXml = eagerConcat(deletedParagraphContents, childrenXml);
@@ -277,7 +278,7 @@ private ReadResult readParagraph(XmlElement element) {
             return ReadResult.map(
                 readParagraphStyle(properties),
                 readElements(childrenXml),
-                (style, children) -> new Paragraph(style, readNumbering(style, properties), indent, children)).appendExtra();
+                (style, children) -> new Paragraph(style, alignment, readNumbering(style, properties), indent, children)).appendExtra();
         }
     }
 
@@ -388,6 +389,21 @@ private ParagraphIndent readParagraphIndent(XmlElementLike properties) {
         );
     }
 
+    private Optional<Alignment> readParagraphAlignment(XmlElementLike properties) {
+        String align = properties
+        .findChild("w:jc")
+        .map(jc -> jc.getAttributeOrNone("w:val").orElse(""))
+        .orElse("");
+
+        switch (align) {
+            case "left": return Optional.of(new Alignment("left"));
+            case "center": return Optional.of(new Alignment("center"));
+            case "right": return Optional.of(new Alignment("right"));
+            case "both": return Optional.of(new Alignment("justify"));
+            default: return Optional.empty();
+        }
+    }
+
     private ReadResult readSymbol(XmlElement element) {
         Optional<String> font = element.getAttributeOrNone("w:font");
         Optional<String> charValue = element.getAttributeOrNone("w:char");
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java b/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java
index 914d7de7..16bbe333 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java
@@ -1,15 +1,16 @@
 package org.zwobble.mammoth.internal.styles;
 
+import org.zwobble.mammoth.internal.documents.Alignment;
 import org.zwobble.mammoth.internal.documents.NumberingLevel;
 import org.zwobble.mammoth.internal.documents.Paragraph;
 
 import java.util.Optional;
 
 public class ParagraphMatcher implements DocumentElementMatcher<Paragraph> {
-    public static final ParagraphMatcher ANY = new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.empty());
+    public static final ParagraphMatcher ANY = new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
 
     public static ParagraphMatcher styleId(String styleId) {
-        return new ParagraphMatcher(Optional.of(styleId), Optional.empty(), Optional.empty());
+        return new ParagraphMatcher(Optional.of(styleId), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     public static ParagraphMatcher styleName(String styleName) {
@@ -17,30 +18,32 @@ public static ParagraphMatcher styleName(String styleName) {
     }
 
     public static ParagraphMatcher styleName(StringMatcher styleName) {
-        return new ParagraphMatcher(Optional.empty(), Optional.of(styleName), Optional.empty());
+        return new ParagraphMatcher(Optional.empty(), Optional.of(styleName), Optional.empty(), Optional.empty());
     }
 
     public static ParagraphMatcher orderedList(String level) {
-        return new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.of(NumberingLevel.ordered(level)));
+        return new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.of(NumberingLevel.ordered(level)), Optional.empty());
     }
 
     public static ParagraphMatcher unorderedList(String level) {
-        return new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.of(NumberingLevel.unordered(level)));
+        return new ParagraphMatcher(Optional.empty(), Optional.empty(), Optional.of(NumberingLevel.unordered(level)), Optional.empty());
     }
 
     private final Optional<String> styleId;
     private final Optional<StringMatcher> styleName;
     private final Optional<NumberingLevel> numbering;
+    private final Optional<StringMatcher> textAlign;
 
-    public ParagraphMatcher(Optional<String> styleId, Optional<StringMatcher> styleName, Optional<NumberingLevel> numbering) {
+    public ParagraphMatcher(Optional<String> styleId, Optional<StringMatcher> styleName, Optional<NumberingLevel> numbering, Optional<StringMatcher> textAlign) {
         this.styleId = styleId;
         this.styleName = styleName;
         this.numbering = numbering;
+        this.textAlign = textAlign;
     }
 
     @Override
     public boolean matches(Paragraph paragraph) {
-        return matchesStyle(paragraph) && matchesNumbering(paragraph);
+        return matchesStyle(paragraph) && matchesNumbering(paragraph) && matchesTextAlign(paragraph);
     }
 
     private boolean matchesStyle(Paragraph paragraph) {
@@ -51,4 +54,9 @@ private boolean matchesNumbering(Paragraph paragraph) {
         return DocumentElementMatching.matches(numbering, paragraph.getNumbering(), (first, second) ->
             first.isOrdered() == second.isOrdered() && first.getLevelIndex().equalsIgnoreCase(second.getLevelIndex()));
     }
+
+    private boolean matchesTextAlign(Paragraph paragraph) {
+        Optional<String> alignment = paragraph.getAlignment().map(x -> x.getValue());
+        return DocumentElementMatching.matches(textAlign, alignment, (first, second) -> first.matches(second));
+    }
 }
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 fdd2797f..15e93971 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
@@ -4,10 +4,15 @@
 import org.zwobble.mammoth.internal.styles.*;
 
 import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.function.Function;
 
 import static org.zwobble.mammoth.internal.styles.parsing.LineParseException.lineParseException;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DocumentMatcherParser {
     public static BiConsumer<StyleMapBuilder, HtmlPath> parse(TokenIterator<TokenType> tokens) {
@@ -46,9 +51,11 @@ public static BiConsumer<StyleMapBuilder, HtmlPath> parse(TokenIterator<TokenTyp
 
     private static ParagraphMatcher parseParagraphMatcher(TokenIterator<TokenType> tokens) {
         Optional<String> styleId = parseStyleId(tokens);
-        Optional<StringMatcher> styleName = parseStyleName(tokens);
+        Function<String, Optional<StringMatcher>> options = parseOptions(tokens, list("style-name", "text-align"));
+        Optional<StringMatcher> styleName = options.apply("style-name");
+        Optional<StringMatcher> textAlign = options.apply("text-align");
         Optional<NumberingLevel> numbering = parseNumbering(tokens);
-        return new ParagraphMatcher(styleId, styleName, numbering);
+        return new ParagraphMatcher(styleId, styleName, numbering, textAlign);
     }
 
     private static RunMatcher parseRunMatcher(TokenIterator<TokenType> tokens) {
@@ -67,6 +74,34 @@ private static Optional<String> parseStyleId(TokenIterator<TokenType> tokens) {
         return TokenParser.parseClassName(tokens);
     }
 
+    private static Function<String, Optional<StringMatcher>> parseOptions(TokenIterator<TokenType> tokens, List<String> properties) {
+        if (tokens.trySkip(TokenType.SYMBOL, "[")) {
+            Map<String, StringMatcher> options = new HashMap<String, StringMatcher>();
+            Function<String, Optional<StringMatcher>> result = property -> options.containsKey(property) ? Optional.of(options.get(property)) : Optional.empty();
+            while (tokens.peekTokenType() == TokenType.IDENTIFIER) {
+                String identifier = tokens.nextValue(TokenType.IDENTIFIER);
+                if (properties.contains(identifier)) {
+                    StringMatcher stringMatcher = parseStringMatcher(tokens);
+                    options.put(identifier, stringMatcher);
+                }
+                else {
+                    throw lineParseException(tokens.next(), "Expected " + String.join(" or ", properties) + " but got token " + tokens.next().getValue());
+                }
+                if (tokens.peekTokenType() == TokenType.WHITESPACE) tokens.skip(TokenType.WHITESPACE);
+                if (tokens.isNext(TokenType.SYMBOL, ",")) tokens.skip(TokenType.SYMBOL, ",");
+                else {
+                    tokens.skip(TokenType.SYMBOL, "]");
+                    return result;
+                }
+                if (tokens.peekTokenType() == TokenType.WHITESPACE) tokens.skip(TokenType.WHITESPACE);
+            }
+            tokens.skip(TokenType.SYMBOL, "]");
+            return result;
+        } else {
+            return property -> Optional.empty();
+        }
+    }
+
     private static Optional<StringMatcher> parseStyleName(TokenIterator<TokenType> tokens) {
         if (tokens.trySkip(TokenType.SYMBOL, "[")) {
             tokens.skip(TokenType.IDENTIFIER, "style-name");
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
index 510e7765..ac35a9c9 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -21,6 +21,7 @@ public class DocumentElementMakers {
     private static final ArgumentKey<Boolean> STRIKETHROUGH = new ArgumentKey<>("strikethrough");
     private static final ArgumentKey<Boolean> ALL_CAPS = new ArgumentKey<>("allCaps");
     private static final ArgumentKey<Boolean> SMALL_CAPS = new ArgumentKey<>("smallCaps");
+    private static final ArgumentKey<Optional<Alignment>> ALIGNMENT = new ArgumentKey<>("Alignment");
     private static final ArgumentKey<VerticalAlignment> VERTICAL_ALIGNMENT = new ArgumentKey<>("verticalAlignment");
     private static final ArgumentKey<List<DocumentElement>> CHILDREN = new ArgumentKey<>("children");
     private static final ArgumentKey<Boolean> IS_HEADER = new ArgumentKey<>("isHeader");
@@ -55,6 +56,10 @@ public static Argument<Boolean> withStrikethrough(boolean strikethrough) {
         return arg(STRIKETHROUGH, strikethrough);
     }
 
+    public static Argument<Optional<Alignment>> withAlignment(Optional<Alignment> alignment) {
+        return arg(ALIGNMENT, alignment);
+    }
+
     public static Argument<Boolean> withAllCaps(boolean allCaps) {
         return arg(ALL_CAPS, allCaps);
     }
@@ -100,6 +105,7 @@ public static Paragraph paragraph(Object... args) {
         Arguments arguments = new Arguments(args);
         return new Paragraph(
             arguments.get(STYLE, Optional.empty()),
+            arguments.get(ALIGNMENT, Optional.empty()),
             arguments.get(NUMBERING, Optional.empty()),
             new ParagraphIndent(
                 Optional.empty(),

From 466ad86324f1538ec5b399ac2ff4d06dadbf738e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Larch?= <renelarch@gmail.com>
Date: Tue, 9 Jul 2024 17:47:32 +0200
Subject: [PATCH 2/3] feat: fix style map tokenizer - allow ',' symbol

---
 .../mammoth/internal/styles/parsing/DocumentMatcherParser.java  | 1 +
 .../mammoth/internal/styles/parsing/StyleMappingTokeniser.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 15e93971..ed0e763e 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
@@ -90,6 +90,7 @@ private static Function<String, Optional<StringMatcher>> parseOptions(TokenItera
                 if (tokens.peekTokenType() == TokenType.WHITESPACE) tokens.skip(TokenType.WHITESPACE);
                 if (tokens.isNext(TokenType.SYMBOL, ",")) tokens.skip(TokenType.SYMBOL, ",");
                 else {
+                    // can not use break because couscous fails converting it.
                     tokens.skip(TokenType.SYMBOL, "]");
                     return result;
                 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
index 9625d24a..d7322c40 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
@@ -20,7 +20,7 @@ public static List<Token<TokenType>> tokeniseToList(String line) {
             TokenType.UNKNOWN,
             list(
                 RegexTokeniser.rule(TokenType.IDENTIFIER, identifierCharacter + "(?:" + identifierCharacter + "|[0-9])*"),
-                RegexTokeniser.rule(TokenType.SYMBOL, ":|>|=>|\\^=|=|\\(|\\)|\\[|\\]|\\||!|\\."),
+                RegexTokeniser.rule(TokenType.SYMBOL, ":|>|=>|\\^=|=|\\(|\\)|\\[|\\]|\\||!|\\.|,"),
                 RegexTokeniser.rule(TokenType.WHITESPACE, "\\s+"),
                 RegexTokeniser.rule(TokenType.STRING, stringPrefix + "'"),
                 RegexTokeniser.rule(TokenType.UNTERMINATED_STRING, stringPrefix),

From 11d4458878bb88bdf72020ad1c78e924dd627233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Larch?= <renelarch@gmail.com>
Date: Tue, 9 Jul 2024 17:57:51 +0200
Subject: [PATCH 3/3] chore: update readme

---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 2f60c8db..1e293046 100644
--- a/README.md
+++ b/README.md
@@ -505,6 +505,20 @@ Modifiers must be used in the correct order:
 h1.section-title:fresh
 ```
 
+#### Text Alignment
+
+To convert text alignment, it is possible to match paragraphs with text-align attribute.
+
+```
+p[text-align='center'] => p.center:fresh
+p[text-align='right'] => p.right:fresh
+p[text-align='justify'] => p.justify:fresh
+p[style-name='Heading 1', text-align='center'] => h1.center:fresh
+p[style-name='Heading 1', text-align='right'] => h1.right:fresh
+```
+
+Note: Order is important. Last selector wins!
+
 #### Separators
 
 To specify a separator to place between the contents of paragraphs that are collapsed together,