Version 1.8.6

asciidocfx · Oct 14, 2023 · 3c23f20 · 3c23f20
1 parent bce0efb
commit 3c23f20
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/main/java/com/kodedu/service/extension/processor/XrefIncludeProcessor.java b/src/main/java/com/kodedu/service/extension/processor/XrefIncludeProcessor.java
@@ -8,6 +8,7 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -26,7 +27,7 @@ public boolean handles(String target) {
     public void process(Document document, PreprocessorReader reader, String target, Map<String, Object> attributes) {
 
         Path dirPath = Paths.get(reader.getDir());
-        Path targetPath = dirPath.resolve(target);
+        Path targetPath = resolveTargetPath(document, dirPath, target);
         String targetString = targetPath.toString();
         String readed = reader.read();
         String content = IOHelper.readFile(targetPath);
@@ -41,4 +42,17 @@ public void process(Document document, PreprocessorReader reader, String target,
         reader.pushInclude(content, target, target, lineNumber, attributes);
     }
 
+    private Path resolveTargetPath(Document document, Path dirPath, String target) {
+        Path resolvedPath = dirPath.resolve(target);
+        if (Files.exists(resolvedPath)) {
+            return resolvedPath;
+        }
+        // Alternative resolution for attributes-{lang}.adoc
+        Path alternatePath = Paths.get((String) document.getAttribute("docdir")).resolve(resolvedPath);
+        if (Files.exists(alternatePath)) {
+            return alternatePath;
+        }
+        return resolvedPath;
+    }
+
 }