X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=scan-adoc-refs;h=9252701634d239e832bac4f72c14c4fac30edb8b;hp=70547e2dcc173132a26c89382b702db1c5203efd;hb=effd6c43413600787db1997160cd9926ed431b0a;hpb=2c84b9cac8674824d7bfe7a487d9b9fee95efec3 diff --git a/scan-adoc-refs b/scan-adoc-refs index 70547e2..9252701 100755 --- a/scan-adoc-refs +++ b/scan-adoc-refs @@ -161,16 +161,16 @@ sub scan_adoc_file { # try to detect titles foreach my $e (@{$env_stack->[-1]}) { - if ($line =~ m/^=====+$/) { + if ($line =~ m/^===+$/) { register_title($filename, $e, 0, $env_last_line->{$e}, $env_last_blockid->{$e}); - } elsif ($line =~ m/^-----+$/) { + } elsif ($line =~ m/^---+$/) { register_title($filename, $e, 1, $env_last_line->{$e}, $env_last_blockid->{$e}); - } elsif ($line =~ m/^~~~~~+$/) { + } elsif ($line =~ m/^~~~+$/) { register_title($filename, $e, 2, $env_last_line->{$e}, $env_last_blockid->{$e}); - } elsif ($line =~ m/^\^\^\^\^\^+$/) { + } elsif ($line =~ m/^\^\^\^+$/) { register_title($filename, $e, 3, $env_last_line->{$e}, $env_last_blockid->{$e}); } elsif ($line =~ m/^= +(\S.*?)( +=)?$/) { @@ -373,9 +373,21 @@ if ($generate_depends) { my $depends = {}; foreach my $e (@$start_env) { my $env_data = $fileinfo->{include}->{$e}; + + my $add_depends; + + $add_depends = sub { + my ($fn, $dep) = @_; + + $depends->{$fn}->{$dep} = 1; + foreach my $nd (keys %{$env_data->{$dep}}) { + &$add_depends($fn, $nd); + } + }; + foreach my $fn (keys %$env_data) { foreach my $dep (keys %{$env_data->{$fn}}) { - $depends->{$fn}->{$dep} = 1; + &$add_depends($fn, $dep); } } } @@ -455,6 +467,7 @@ if ($generate_depends) { my $filelist = $fileinfo->{outfile}->{$e}; foreach my $sourcefile (sort keys %$filelist) { my $varname = $depend_varname_hash->{$sourcefile}; + next if !defined($varname); my $target = $filelist->{$sourcefile}; my $dep = "\$\{$varname\}"; $make_targets->{$target} = $dep;