Fix counter issue #637

asciidocfx · May 5, 2024 · 297a31e · 297a31e
1 parent c85f79d
commit 297a31e
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/src/main/java/com/kodedu/config/AsciidoctorConfigBase.java b/src/main/java/com/kodedu/config/AsciidoctorConfigBase.java
@@ -37,6 +37,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.kodedu.other.Constants.DOC_FILE_ATTR;
 import static com.kodedu.service.AsciidoctorFactory.getPlainDoctor;
@@ -346,8 +347,13 @@ public Attributes getAsciiDocAttributes(Map<String, Object> originalDocAttribute
             }
         }
         Map<String, Object> cloneMap = new LinkedHashMap<>(map);
+        List<String> ignoredAttributes = getIgnoredAttributes(originalDocAttributes);
         for (Map.Entry<String, Object> entry : originalDocAttributes.entrySet()) {
-            cloneMap.put(entry.getKey(), entry.getValue());
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (!ignoredAttributes.contains(key)) {
+                cloneMap.put(key, value);
+            }
         }
 
         String docdir = (String) originalDocAttributes.get("docdir");
@@ -366,6 +372,24 @@ public Attributes getAsciiDocAttributes(Map<String, Object> originalDocAttribute
         return attributesBuilder.build();
     }
 
+    private List<String> getIgnoredAttributes(Map<String, Object> attributes) {
+        return attributes.entrySet().stream().flatMap(e -> {
+            String attr = e.getKey();
+            Object value = e.getValue();
+            List<String> attrs = new ArrayList<>();
+            if (attr.contains("count") && value instanceof Number) {
+                attrs.add(attr);
+            }
+            if (attr.contains("count") && value instanceof String s) {
+                String[] split = s.split(":");
+                if (split.length > 0) {
+                    attrs.add(split[0].trim());
+                }
+            }
+            return attrs.stream();
+        }).collect(Collectors.toList());
+    }
+
     List<String> node_extensions = List.of("mmdc","vg2png","vg2svg","nomnoml","bytefield");
     Map<String, Path> extensionPathMap = new HashMap<>();
     private Map<String, Object> resolveExtensionBuilderAttributes(String docdir, Map<String, Object> docAttributes) {