support reftext for block IDs

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index 1d0c7912185d88a5bf580721603ea820cc9a64d4..ab6edef67e21afe580fa097bccfd9f610ac1f687 100644 (file)
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -65,10 +65,13 @@ sub replace_wiki_xref {
     my ($blockid, $text) = @_;
 
     my $link = $fileinfo->{blockid_target}->{wiki}->{$blockid};
+    my $reftext = $fileinfo->{reftext}->{wiki}->{$blockid};
 
     die "unable to resolve wiki link (xref:$blockid)\n"
        if !defined($link);
 
+    $text = $reftext if !length($text);
+
     return "$link\[$text\]";
 }
 

diff --git a/scan-adoc-refs b/scan-adoc-refs
index 296f05e8a241b3a697e586ee3dd66f01befd04e2..613f282c6b72aa0abdc8c3efd0a3c9032a53d35c 100755 (executable)
--- a/scan-adoc-refs
+++ b/scan-adoc-refs
@@ -83,13 +83,15 @@ sub register_include {
 }
 
 sub register_blockid {
-    my ($filename, $blockid, $env_list) = @_;
+    my ($filename, $blockid, $reftext, $env_list) = @_;
 
     foreach my $e (@$env_list) {
        my $fn = $fileinfo->{blockid}->{$e}->{$blockid};
        die "blockid '$blockid' already defined in $fn"
            if defined($fn);
        $fileinfo->{blockid}->{$e}->{$blockid} = $filename;
+       $fileinfo->{reftext}->{$e}->{$blockid} = $reftext
+           if defined($reftext);
     }
 }
 
@@ -142,14 +144,15 @@ sub scan_adoc_file {
        if ($line =~ m/^\[\[(.*)\]\]\s*$/) {
            my $blockid = $1;
            die "implement me" if $blockid =~m/,/;
-           register_blockid($filename, $blockid, $env_stack->[-1]);
+           my $reftext = '';
+           register_blockid($filename, $blockid, $reftext, $env_stack->[-1]);
        }
        # fixme: "anchor:"
        # bibliography anchors
        if ($line =~ m/\[\[\[([^\]]*)\]\]\]/) {
            my $blockid = $1;
            die "implement me" if $blockid =~m/,/;
-           register_blockid($filename, $blockid, $env_stack->[-1]);
+           register_blockid($filename, $blockid, "[$blockid]", $env_stack->[-1]);
        }
     }
 }