Merge remote-tracking branch 'origin/master'

vsch · vsch · commit ffaef34fd68d · 2022-01-24T06:05:34.000-05:00
diff --git a/flexmark-ext-yaml-front-matter/src/main/java/com/vladsch/flexmark/ext/yaml/front/matter/internal/YamlFrontMatterBlockParser.java b/flexmark-ext-yaml-front-matter/src/main/java/com/vladsch/flexmark/ext/yaml/front/matter/internal/YamlFrontMatterBlockParser.java
@@ -21,7 +21,7 @@
 import java.util.regex.Pattern;
 
 public class YamlFrontMatterBlockParser extends AbstractBlockParser {
-    final private static Pattern REGEX_METADATA = Pattern.compile("^[ ]{0,3}([A-Za-z0-9_-]+):\\s*(.*)");
+    final private static Pattern REGEX_METADATA = Pattern.compile("^[ ]{0,3}([A-Za-z0-9_\\-.]+):\\s*(.*)");
     final private static Pattern REGEX_METADATA_LIST = Pattern.compile("^[ ]+-\\s*(.*)");
     final private static Pattern REGEX_METADATA_LITERAL = Pattern.compile("^\\s*(.*)");
     final private static Pattern REGEX_BEGIN = Pattern.compile("^-{3}(\\s.*)?");
diff --git a/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/FlexmarkHtmlConverter.java b/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/FlexmarkHtmlConverter.java
@@ -74,6 +74,7 @@ public class FlexmarkHtmlConverter {
     final public static DataKey<Character> UNORDERED_LIST_DELIMITER = new DataKey<>("UNORDERED_LIST_DELIMITER", '*');
     final public static DataKey<Integer> DEFINITION_MARKER_SPACES = new DataKey<>("DEFINITION_MARKER_SPACES", 3);
     final public static DataKey<Integer> MIN_SETEXT_HEADING_MARKER_LENGTH = new DataKey<>("MIN_SETEXT_HEADING_MARKER_LENGTH", 3);
+    final public static DataKey<Integer> LIST_ITEM_INDENT = new DataKey<>("LIST_ITEM_INDENT", 4);
     final public static DataKey<String> CODE_INDENT = new DataKey<>("CODE_INDENT", "    ");
     final public static DataKey<String> NBSP_TEXT = new DataKey<>("NBSP_TEXT", " ");
     final public static DataKey<String> EOL_IN_TITLE_ATTRIBUTE = new DataKey<>("EOL_IN_TITLE_ATTRIBUTE", " ");
diff --git a/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/HtmlConverterOptions.java b/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/HtmlConverterOptions.java
@@ -55,6 +55,7 @@ public class HtmlConverterOptions implements MutableDataSetter {
     public char unorderedListDelimiter;
     public int definitionMarkerSpaces;
     public int minSetextHeadingMarkerLength;
+    public int listItemIndent;
     public String codeIndent;
     public String eolInTitleAttribute;
     public String nbspText;
@@ -118,6 +119,7 @@ public HtmlConverterOptions(HtmlConverterOptions other) {
         unorderedListDelimiter = other.unorderedListDelimiter;
         definitionMarkerSpaces = other.definitionMarkerSpaces;
         minSetextHeadingMarkerLength = other.minSetextHeadingMarkerLength;
+        listItemIndent = other.listItemIndent;
         codeIndent = other.codeIndent;
         eolInTitleAttribute = other.eolInTitleAttribute;
         nbspText = other.nbspText;
@@ -184,6 +186,7 @@ public HtmlConverterOptions(DataHolder options) {
         unorderedListDelimiter = FlexmarkHtmlConverter.UNORDERED_LIST_DELIMITER.get(options);
         definitionMarkerSpaces = FlexmarkHtmlConverter.DEFINITION_MARKER_SPACES.get(options);
         minSetextHeadingMarkerLength = Utils.minLimit(FlexmarkHtmlConverter.MIN_SETEXT_HEADING_MARKER_LENGTH.get(options), 3);
+        listItemIndent = FlexmarkHtmlConverter.LIST_ITEM_INDENT.get(options);
         codeIndent = FlexmarkHtmlConverter.CODE_INDENT.get(options);
         eolInTitleAttribute = FlexmarkHtmlConverter.EOL_IN_TITLE_ATTRIBUTE.get(options);
         nbspText = FlexmarkHtmlConverter.NBSP_TEXT.get(options);
diff --git a/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/internal/HtmlConverterCoreNodeRenderer.java b/flexmark-html2md-converter/src/main/java/com/vladsch/flexmark/html2md/converter/internal/HtmlConverterCoreNodeRenderer.java
@@ -799,7 +799,7 @@ private void handleListItem(HtmlNodeConverterContext context, HtmlMarkdownWriter
 
         listState.itemCount++;
         CharSequence itemPrefix = listState.getItemPrefix(this.myHtmlConverterOptions);
-        int count = myHtmlConverterOptions.listContentIndent ? itemPrefix.length() : 4;
+        int count = myHtmlConverterOptions.listContentIndent ? itemPrefix.length() : myHtmlConverterOptions.listItemIndent;
         CharSequence childPrefix = RepeatedSequence.repeatOf(" ", count);
 
         out.line().append(itemPrefix);
