[adoc] enable table last cell to be multiple in inline rows + drop legacy passthorugh symbols in macro (51188) as well as macro quoting surronding (__) since it is not in the theme for now

Author: rmannibucau

asciidoc-java/src/main/java/io/yupiik/asciidoc/parser/Parser.java

@@ -500,6 +500,26 @@ private Table parseTable(final Path enclosingDocument, final Reader reader,
         while (!Objects.equals(token, next = reader.skipCommentsAndEmptyLines()) && next != null) {
             next = next.strip();
             final var cells = new ArrayList<Element>();
+            if (!next.startsWith("|") && !rows.isEmpty() && !rows.get(rows.size() - 1).isEmpty()) {
+                final var lastRow = rows.get(rows.size() - 1);
+                final var line = cellParser.size() > lastRow.size() - 1
+                        ? cellParser.get(lastRow.size() - 1).apply(List.of(next))
+                        : new Text(List.of(), next, Map.of());
+                final var last = lastRow.get(lastRow.size() - 1);
+                final Element replacement;
+                if (last instanceof Text lt && line instanceof Text le) {
+                    replacement = mergeTexts(List.of(lt, le));
+                } else if (last instanceof Paragraph lt && line instanceof Paragraph le) {
+                    replacement = new Paragraph(Stream.concat(lt.children().stream(), le.children().stream()).toList(), lt.options());
+                } else if (last instanceof Paragraph lp) {
+                    replacement = new Paragraph(Stream.concat(lp.children().stream(), Stream.of(line)).toList(), lp.options());
+                } else {
+                    replacement = unwrapElementIfPossible(new Paragraph(List.of(last, line), Map.of("nowrap", "true")));
+                }
+                lastRow.set(lastRow.size() - 1, replacement);
+                continue;
+            }
+
             if (next.indexOf("|", 2) > 0) { // single line row
                 int cellIdx = 0;
                 int last = 1; // line starts with '|'
@@ -854,13 +874,19 @@ private List<Element> parseLine(final Path enclosingDocument, final Reader reade
                             backward = -1;
                         }
 
+                        var offset = 0;
                         if (backward >= 0 && backward < i) { // start by assuming it a link then fallback on a macro
-                            final var optionsPrefix = line.substring(backward, i);
+                            var optionsPrefix = line.substring(backward, i);
                             var options = parseOptions(line.substring(i + 1, end).strip());
                             if (start < backward) {
                                 flushText(elements, line.substring(start, backward));
                             }
 
+                            if (optionsPrefix.startsWith("__") && line.substring(end).startsWith("]__")) {
+                                optionsPrefix = optionsPrefix.substring(2);
+                                offset = 2;
+                            }
+
                             final int macroMarker = optionsPrefix.indexOf(":");
                             if (macroMarker > 0 && !isLink(optionsPrefix)) {
                                 final boolean inlined = optionsPrefix.length() <= macroMarker + 1 || optionsPrefix.charAt(macroMarker + 1) != ':';
@@ -931,8 +957,8 @@ enclosingDocument, new Reader(List.of(label)),
                                         linkLabel,
                                         removeEmptyKey(options)));
                             }
-                            i = end;
-                            start = end + 1;
+                            i = end + offset;
+                            start = i + 1;
                             continue;
                         }
 
@@ -1485,17 +1511,25 @@ private void flushOption(final String defaultKey,
         final var keyValue = key.toString();
         if (value.isEmpty()) {
             if (keyValue.startsWith(".")) {
-                collector.put("role", keyValue.substring(1));
+                collector.put("role", keyValue.substring(1).replace('.', ' '));
             } else if (keyValue.startsWith("#")) {
                 collector.put("id", keyValue.substring(1));
             } else {
-                collector.put(defaultKey, keyValue);
+                collector.put(defaultKey, dropLegacyPassthroughMarkers(keyValue));
             }
         } else {
-            collector.put(keyValue, value.toString());
+            collector.put(
+                    keyValue,
+                    dropLegacyPassthroughMarkers(value.toString()));
         }
     }
 
+    private static String dropLegacyPassthroughMarkers(final String v) {
+        return v.length() > 3 && v.startsWith("$$") && v.endsWith("$$") ?
+                v.substring(2, v.length() - 2) :
+                v;
+    }
+
     private Element parseSection(final Path enclosingDocument, final Reader reader, final Map<String, String> options,
                                  final ContentResolver resolver, final Map<String, String> currentAttributes) {
         final var title = reader.skipCommentsAndEmptyLines();

asciidoc-java/src/test/java/io/yupiik/asciidoc/parser/ParserTest.java

@@ -60,8 +60,51 @@
 import static java.util.Map.entry;
 import static java.util.stream.Collectors.toMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 class ParserTest {
+    @Test
+    public void doubleDollarAndQuotingForMacro() {
+        final var body = new Parser()
+                .parseBody("xref:foo[$$bar$$]\n__link:https://foo.bar[$$dummy$$]__", new Parser.ParserContext(null));
+        assertEquals(
+                List.of(
+                        new Paragraph(
+                                List.of(
+                                        new Macro("xref", "foo", Map.of("", "bar"), true),
+                                        new Link("https://foo.bar", new Text(List.of(), "dummy", Map.of("nowrap", "true", "", "dummy")), Map.of("", "dummy", "nowrap", "true"))
+                                ), Map.of())),
+                body.children());
+    }
+
+    // crd-ref-docs uses this kind of formatting
+    @Test
+    public void tableWithContinuation() {
+        var body = new Parser().parseBody(
+                """
+                        [cols="20a,50a,15a,15a", options="header"]
+                        |===
+                        | Field | Description | Default | Validation
+                        | *`foo`* string | Foo. |  | MaxLength: 10
+                        MinLength: 3
+                        Pattern: `^[A-Z]$`
+                        
+                        | *`bar`* string | Bar. |  | MaxLength: 10
+                        MinLength: 3
+                        Pattern: `^[A-Z]$`
+                        
+                        |===
+                        """,
+                new Parser.ParserContext(null)
+        );
+        assertEquals(1, body.children().size());
+        final var table = assertInstanceOf(Table.class, body.children().get(0));
+        assertEquals(3, table.elements().size());
+        for (final var it : table.elements()) {
+            assertEquals(4, it.size());
+        }
+    }
+
     @Test
     void definitionList() {
         final var body = new Parser().parseBody(new Reader(List.of("""