X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=asciidoc-pve.in;h=83a6c5c33f9d42872041936205702b0f554d5694;hb=c5bca1ae4caa9c3c9f4dcd0a0f22f2dbf61f4508;hp=e298abfed0551e1e447754ddd7816dbdef00635d;hpb=fd02ab9033cacd7a6f0e2e2c5a5db0638564069b;p=pve-docs.git

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index e298abf..83a6c5c 100644
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -28,8 +28,8 @@ my $tmpprefix = ".asciidoc-pve-tmp_";
 my $adoc_source_dir = "/usr/share/pve-doc-generator";
 
 # inside pve-docs source dir?
-if (-f "attributes.txt" && -f "pve-admin-guide.adoc") {
-    $adoc_source_dir = "."
+if (-f "asciidoc-pve.in" && -f "pve-admin-guide.adoc") {
+    $adoc_source_dir = getcwd();
 }
 
 my $prepared_files = {};
@@ -234,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;
 
@@ -262,7 +268,7 @@ sub compile_asciidoc {
 	die "too many arguments...\n";
 
     my $outfilemap = $fileinfo->{outfile}->{$env}->{$infile} ||
-	die "no output file mapping '$infile => $outfile' ($env)";
+	die "no output file mapping for '$infile' ($env)";
 
     if ($man_target eq 'html') {
 	$outfilemap .= '.html';
@@ -270,8 +276,12 @@ sub compile_asciidoc {
 	$outfilemap .= '-plain.html';
     }
 
-    die "wrong output file name '$outfile != $outfilemap' ($env)"
-	if $outfile ne $outfilemap;
+    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'";
@@ -331,7 +341,9 @@ sub compile_asciidoc {
 	# section like footnotes, so we cannot use a2x.
 	# We use xmlto instead.
 
-	my $cmd = ['asciidoc', '-dmanpage', '-bdocbook', '-a', 'docinfo1'];
+	my $cmd = ['asciidoc', '-dmanpage', '-bdocbook',
+		   '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+		   '-a', 'docinfo1'];
 
 	foreach my $key (keys %$attributes) {
 	    my $value = $attributes->{$key};
@@ -373,19 +385,16 @@ sub compile_asciidoc {
 	$attributes->{icons} = undef;
 	$attributes->{'data-uri'} = undef;
 
-	my $cmd = ['asciidoc'];
+	my $cmd = ['asciidoc',
+		   '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+	    ];
 
 	if (($env eq 'wiki') ||
 	    (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
 
-	    push @$cmd, '-s';
-
-	    if (-f "./asciidoc/mediawiki.conf") {
-		my $cwd = getcwd();
-		push @$cmd, '-b', "$cwd/asciidoc/mediawiki";
-	    } else {
-		push @$cmd, '-b', "mediawiki";
-	    }
+	    push @$cmd, '-b', "$adoc_source_dir/asciidoc/mediawiki";
+	} else {
+	    push @$cmd, '-b', "$adoc_source_dir/asciidoc/pve-html";
 	}
 
 	foreach my $key (keys %$attributes) {