From aea775cbc6b98e33ed0b020c77a655c2ee3392df Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 29 Nov 2020 08:48:16 +0100 Subject: [PATCH] Cmake docbook5 tests: Use absolute path-hints for 'bibfiles' entries in lyx-file --- development/autotests/lyxStatus.pm | 2 +- development/autotests/useSystemFonts.pl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm index 99c1f6d293..699626746f 100644 --- a/development/autotests/lyxStatus.pm +++ b/development/autotests/lyxStatus.pm @@ -335,7 +335,7 @@ sub checkForLatexCommand($) if ($param eq "bibtex") { my $rElem1 = newMatch("ext" => ".bib", "filetype" => "prefix_for_list", - "search" => qr/^bibfiles\s+\"(.+)\"/, + "search" => qr/^bibfiles\s+\"([^\"]+)\"/, "result" => ["bibfiles \"", "1", "\""]); my $rElem2 = newMatch("ext" => ".bst", "filetype" => "prefix_for_list", diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl index 2eae022693..c3e6a80274 100644 --- a/development/autotests/useSystemFonts.pl +++ b/development/autotests/useSystemFonts.pl @@ -203,6 +203,10 @@ sub interpretedCopy($$$$) my $ext = $isrel[1]; if ($rStatus->{"filetype"} eq "prefix_only") { $f = getNewNameOf("$sourcedir/$f", $rFiles); + if ($format eq "docbook5") { + $rF->[1] = join(',', @{$filelist}); + $l = join('', @$rF); + } } else { my ($newname, $res1);