X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=asciidoc-pve.in;h=8550bac19327bc52ef06c39f282ec7d9ac5534d9;hb=3bd9d0cfd637873207e1c28d530caca0ff0d9d42;hp=e7a6afba049d8834eb438133cb2ed347149f56b3;hpb=a297b96efb178509e72a30be9d0eb670d39582b4;p=pve-docs.git

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index e7a6afb..8550bac 100644
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -6,6 +6,7 @@ use Getopt::Long;
 use File::Path;
 use File::Basename;
 use IO::File;
+use Cwd;
 
 use JSON;
 
@@ -233,6 +234,12 @@ sub prepare_adoc_file {
 	    next;
 	}
 
+	if ($line =~ m/xref:\S+?\[[^\]]*$/) {
+	    die "possible xref spanning multiple lines in '$filename':\n(line $.): $line\n";
+	}
+	if ($line =~ m/<<((?!\>\>).)*$/) {
+	    die "possible xref spanning multiple lines in '$filename':\n(line $.): $line\n";
+	}
 	# fix xrefs
 	$line =~ s/xref:([^\s\[\]]+)\[([^\]]*)\]/replace_xref(${target_env},$1,$2)/ge;
 
@@ -260,6 +267,22 @@ sub compile_asciidoc {
     scalar(@ARGV) == 0 or
 	die "too many arguments...\n";
 
+    my $outfilemap = $fileinfo->{outfile}->{$env}->{$infile} ||
+	die "no output file mapping for '$infile' ($env)";
+
+    if ($man_target eq 'html') {
+	$outfilemap .= '.html';
+    } elsif ($man_target eq 'wiki') {
+	$outfilemap .= '-plain.html';
+    }
+
+    if (defined($outfile)) {
+	die "wrong output file name '$outfile != $outfilemap' ($env)"
+	    if $outfile ne $outfilemap;
+    } else {
+	$outfile = $outfilemap;
+    }
+
     defined($fileinfo->{titles}->{$env}) ||
 	die "unknown environment '$env'";
 
@@ -362,8 +385,16 @@ sub compile_asciidoc {
 
 	my $cmd = ['asciidoc'];
 
-	push @$cmd, '-s' if ($env eq 'wiki') ||
-	    (($env eq 'manvolnum') && ($man_target eq 'wiki'));
+	if (($env eq 'wiki') ||
+	    (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
+
+	    if (-f "./asciidoc/mediawiki.conf") {
+		my $cwd = getcwd();
+		push @$cmd, '-b', "$cwd/asciidoc/mediawiki";
+	    } else {
+		push @$cmd, '-b', "mediawiki";
+	    }
+	}
 
 	foreach my $key (keys %$attributes) {
 	    my $value = $attributes->{$key};
@@ -540,6 +571,47 @@ if ($clicmd eq 'compile-wiki') {
 
     print "var pveOnlineHelpInfo = ${data_str};\n";
 
+} elsif ($clicmd eq 'chapter-table') {
+    
+    print '[width="100%",options="header"]' . "\n";
+    print "|====\n";
+    print "|Title|Link\n";
+    
+    my $filelist = $fileinfo->{outfile}->{default};
+    foreach my $sourcefile (sort keys %$filelist) {
+	my $target = $filelist->{$sourcefile};
+	next if $target eq 'pve-admin-guide.html';
+	my $title = $fileinfo->{titles}->{default}->{$sourcefile} ||
+	    die "not title for '$sourcefile'";
+	print "|$title|link:$target\[\]\n";
+    }
+    
+    print "|====\n";
+
+} elsif ($clicmd =~ m/^man([158])page-table$/) {
+    
+    my $section = $1;
+    print '[width="100%",cols="5*d",options="header"]' . "\n";
+    print "|====\n";
+    print "|Name 3+|Title|Link\n";
+    
+    my $filelist = $fileinfo->{outfile}->{manvolnum};
+    foreach my $manpage (sort keys %$filelist) {
+	next if $section ne $fileinfo->{mansection}->{manvolnum}->{$manpage};
+	my $mantitle = $fileinfo->{titles}->{manvolnum}->{$manpage} ||
+	    die "not manual title for '$manpage'";
+	my $title = $fileinfo->{titles}->{default}->{$manpage} ||
+	    die "not title for '$manpage'";
+
+	# hack - remove command name prefix from titles
+	$title =~ s/^[a-z]+\s*-\s*//;
+	
+	my $target = $filelist->{$manpage};
+	print "|$mantitle 3+|$title|link:$target.html\[$target\]\n";
+    }  
+    
+    print "|====\n";
+
 } else {
 
     die "unknown command '$clicmd'\n";