44 lines
1.5 KiB
Plaintext
44 lines
1.5 KiB
Plaintext
|
|
||
|
|
# HG changeset patch
|
||
|
|
# User Rik <rik@octave.org>
|
||
|
|
# Date 1668451079 28800
|
||
|
|
# Node ID ab6d276f6fcb90631131eeb6668efd4f54a36204
|
||
|
|
# Parent 662499ba0d21173006f99fc3b14b9a76a0e8670a
|
||
|
|
build: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648).
|
||
|
|
|
||
|
|
* doc/interpreter/mk-qthelp.pl: Update regular expressions that find the start
|
||
|
|
of data in index.html and Function-index.html to include additional pattern
|
||
|
|
generated by Texinfo 7.0.
|
||
|
|
|
||
|
|
diff --git a/doc/interpreter/mk-qthelp.pl b/doc/interpreter/mk-qthelp.pl
|
||
|
|
--- a/doc/interpreter/mk-qthelp.pl
|
||
|
|
+++ b/doc/interpreter/mk-qthelp.pl
|
||
|
|
@@ -26,8 +26,11 @@
|
||
|
|
open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
|
||
|
|
|
||
|
|
# Skip through preamble of file to find start of list
|
||
|
|
-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
|
||
|
|
-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
|
||
|
|
+while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
|
||
|
|
+while (defined ($_ = <$HTML>)
|
||
|
|
+ and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
|
||
|
|
+
|
||
|
|
+die "index.html: reached EOF without finding data start pattern" if eof ($HTML);
|
||
|
|
|
||
|
|
$level = 0;
|
||
|
|
while (<$HTML>)
|
||
|
|
@@ -68,7 +71,11 @@
|
||
|
|
open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
|
||
|
|
|
||
|
|
# Skip through preamble of file to find start of list
|
||
|
|
-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
|
||
|
|
+while (defined ($_ = <$HTML>)
|
||
|
|
+ and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
|
||
|
|
+
|
||
|
|
+die "Function-Index.html: reached EOF without finding data start pattern"
|
||
|
|
+ if eof ($HTML);
|
||
|
|
|
||
|
|
while (<$HTML>)
|
||
|
|
{
|
||
|
|
|