[asciidoc] enable to have adoc in description list keys

yupiik · Jan 30, 2024 · 4285f41 · 4285f41
1 parent afd1b03
commit 4285f41
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/asciidoc-java/src/main/java/io/yupiik/asciidoc/model/DescriptionList.java b/asciidoc-java/src/main/java/io/yupiik/asciidoc/model/DescriptionList.java
@@ -19,7 +19,7 @@
 
 import static io.yupiik.asciidoc.model.Element.ElementType.DESCRIPTION_LIST;
 
-public record DescriptionList(Map<String, Element> children, Map<String, String> options) implements Element {
+public record DescriptionList(Map<Element, Element> children, Map<String, String> options) implements Element {
     @Override
     public ElementType type() {
         return DESCRIPTION_LIST;

diff --git a/asciidoc-java/src/main/java/io/yupiik/asciidoc/parser/Parser.java b/asciidoc-java/src/main/java/io/yupiik/asciidoc/parser/Parser.java
@@ -1072,7 +1072,7 @@ private Optional<Admonition> parseAdmonition(final Reader reader,
     private DescriptionList parseDescriptionList(final Reader reader, final String prefix,
                                                  final ContentResolver resolver,
                                                  final Map<String, String> currentAttributes) {
-        final var children = new LinkedHashMap<String, Element>(2);
+        final var children = new LinkedHashMap<Element, Element>(2);
         String next;
         final var buffer = new ArrayList<String>();
         Matcher matcher;
@@ -1099,7 +1099,8 @@ private DescriptionList parseDescriptionList(final Reader reader, final String p
                 }
                 final var element = parseParagraph(new Reader(buffer), Map.of(), resolver, currentAttributes, true);
                 final var unwrapped = unwrapElementIfPossible(element);
-                children.put(matcher.group("name"), unwrapped);
+                final var key = doParse(new Reader(List.of(matcher.group("name"))), l -> true, resolver, currentAttributes, false);
+                children.put(key.size() == 1 ? key.get(0) : new Paragraph(key, Map.of("nowrap", "true")), unwrapped);
                 last = unwrapped;
             } else { // nested
                 reader.rewind();

diff --git a/asciidoc-java/src/main/java/io/yupiik/asciidoc/renderer/Visitor.java b/asciidoc-java/src/main/java/io/yupiik/asciidoc/renderer/Visitor.java
@@ -153,7 +153,10 @@ default void visitOrderedList(final OrderedList element) {
     }
 
     default void visitDescriptionList(final DescriptionList element) {
-        element.children().values().forEach(this::visitElement);
+        element.children().forEach((key, value) -> {
+            visitElement(key);
+            visitElement(value);
+        });
     }
 
     default void visitMacro(final Macro element) {

diff --git a/...idoc-java/src/main/java/io/yupiik/asciidoc/renderer/html/AsciidoctorLikeHtmlRenderer.java b/...idoc-java/src/main/java/io/yupiik/asciidoc/renderer/html/AsciidoctorLikeHtmlRenderer.java
@@ -434,7 +434,9 @@ public void visitDescriptionList(final DescriptionList element) {
             writeCommonAttributes(element.options(), null);
             builder.append(">\n");
             for (final var elt : element.children().entrySet()) {
-                builder.append("  <dt>").append(escape(elt.getKey())).append("</dt>\n");
+                builder.append("  <dt>");
+                visitElement(elt.getKey());
+                builder.append("</dt>\n");
                 builder.append("  <dd>\n");
                 visitElement(elt.getValue());
                 builder.append("</dd>\n");

diff --git a/asciidoc-java/src/test/java/io/yupiik/asciidoc/parser/ParserTest.java b/asciidoc-java/src/test/java/io/yupiik/asciidoc/parser/ParserTest.java
@@ -637,7 +637,7 @@ void descriptionList() {
                                         entry("CPU", new Text(List.of(), "The brain of the computer.", Map.of())),
                                         entry("Hard drive", new Text(List.of(), "Permanent storage for operating system and/or user files.", Map.of())),
                                         entry("RAM", new Text(List.of(), "Temporarily stores information the CPU uses during operation.", Map.of())))
-                                .collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new)),
+                                .collect(toMap(e -> new Text(List.of(), e.getKey(), Map.of()), Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new)),
                                 Map.of())),
                 body.children());
     }
@@ -665,7 +665,7 @@ void descriptionListWithList() {
                                         new Text(List.of(), "Bananas", Map.of())),
                                         Map.of()
                                 )))
-                        .collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new)),
+                        .collect(toMap(e -> new Text(List.of(), e.getKey(), Map.of()), Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new)),
                         Map.of())),
                 body.children());
     }