chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7cf8d58)
documentation/doxygen: 1.8.16 doesn't support subpages of index.
authorVladimír Vondruš <mosra@centrum.cz>
Sun, 9 Jan 2022 21:18:27 +0000 (22:18 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Sun, 9 Jan 2022 21:50:14 +0000 (22:50 +0100)
These just aren't marked as such. So skip the direct test and rewrite
the other to not accidentally use this functionality.

documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html patch | blob | history
documentation/test_doxygen/compound_filename_case/input.h patch | blob | history
documentation/test_doxygen/compound_filename_case/page.html [moved from documentation/test_doxygen/compound_filename_case/index.html with 94% similarity] patch | blob | history
documentation/test_doxygen/compound_filename_case/pages.html patch | blob | history
documentation/test_doxygen/test_compound.py patch | blob | history
documentation/test_doxygen/test_page.py patch | blob | history

diff --git a/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html b/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html
index 75badd32f398d16ca0617c1d52b219b7b060bb87..f5586a0d13711498b126da0a5648fb260b1d6bfe 100644 (file)
--- a/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html
+++ b/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
-  <title>My Project &raquo; Uppercase page | My Project</title>
+  <title>A page &raquo; Uppercase page | My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+documentation.compiled.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -20,7 +20,7 @@
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
         <h1>
-          <span class="m-breadcrumb"><a href="index.html">My Project</a> &raquo;</span>
+          <span class="m-breadcrumb"><a href="page.html">A page</a> &raquo;</span>
           Uppercase page
         </h1>
 <p>This should get saved to a correct place and also get correctly linked to.</p>
diff --git a/documentation/test_doxygen/compound_filename_case/input.h b/documentation/test_doxygen/compound_filename_case/input.h
index 72a338b73b632e6574f7d8db219f7ca00643d169..054f4ec8b1ed5ebeee1ce0db72aff4eb7b685f00 100644 (file)
--- a/documentation/test_doxygen/compound_filename_case/input.h
+++ b/documentation/test_doxygen/compound_filename_case/input.h
@@ -1,4 +1,4 @@
-/** @mainpage
+/** @page page A page
 
 -   @subpage UPPERCASE
 -   @ref UPPERCLASS
diff --git a/documentation/test_doxygen/compound_filename_case/index.html b/documentation/test_doxygen/compound_filename_case/page.html
similarity index 94%
rename from documentation/test_doxygen/compound_filename_case/index.html
rename to documentation/test_doxygen/compound_filename_case/page.html
index 51cbd47b7f7abac9e8a3a9bbf7dba4c0cd704c23..0aafe775e711104fdf19948863ab6b5fa6384409 100644 (file)
--- a/documentation/test_doxygen/compound_filename_case/index.html
+++ b/documentation/test_doxygen/compound_filename_case/page.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
-  <title>My Project</title>
+  <title>A page | My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+documentation.compiled.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -20,7 +20,7 @@
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
         <h1>
-          My Project
+          A page
         </h1>
 <ul><li><a href="_u_p_p_e_r_c_a_s_e.html" class="m-doc">Uppercase page</a></li><li><a href="class_u_p_p_e_r_c_l_a_s_s.html" class="m-doc">UPPERCLASS</a></li></ul>
       </div>
diff --git a/documentation/test_doxygen/compound_filename_case/pages.html b/documentation/test_doxygen/compound_filename_case/pages.html
index 3d4f6ece101f79a08be2705b34a6a6bb9bdac885..998c6b8fa889304079d2112c174ee3f681256501 100644 (file)
--- a/documentation/test_doxygen/compound_filename_case/pages.html
+++ b/documentation/test_doxygen/compound_filename_case/pages.html
@@ -22,7 +22,7 @@
         <h1>Pages</h1>
         <ul class="m-doc">
           <li class="m-doc-collapsible">
-            <a href="#" onclick="return toggle(this)"></a><a href="index.html" class="m-doc">My Project</a> <span class="m-doc"></span>
+            <a href="#" onclick="return toggle(this)"></a><a href="page.html" class="m-doc">A page</a> <span class="m-doc"></span>
             <ul class="m-doc">
               <li><a href="_u_p_p_e_r_c_a_s_e.html" class="m-doc">Uppercase page</a> <span class="m-doc"></span></li>
             </ul>
diff --git a/documentation/test_doxygen/test_compound.py b/documentation/test_doxygen/test_compound.py
index d406c51a8388a471bd3f99061fe6a0abea9e4f09..a6e2e82fe43178efaf060bb454ebd434583c5e03 100644 (file)
--- a/documentation/test_doxygen/test_compound.py
+++ b/documentation/test_doxygen/test_compound.py
@@ -207,7 +207,7 @@ class FilenameCase(IntegrationTestCase):
 
         # Verify that all filenames are "converted" to lowercase and the links
         # and page tree work properly as well
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+        self.assertEqual(*self.actual_expected_contents('page.html'))
         self.assertEqual(*self.actual_expected_contents('pages.html'))
         self.assertEqual(*self.actual_expected_contents('_u_p_p_e_r_c_a_s_e.html'))
         self.assertEqual(*self.actual_expected_contents('class_u_p_p_e_r_c_l_a_s_s.html'))
diff --git a/documentation/test_doxygen/test_page.py b/documentation/test_doxygen/test_page.py
index 1768dbf96f35304912d6f7027794b2ce0ad179d7..23198011647562b41be9e1bb0203f85e80d62a41 100644 (file)
--- a/documentation/test_doxygen/test_page.py
+++ b/documentation/test_doxygen/test_page.py
@@ -74,6 +74,8 @@ class EmptyTitle(IntegrationTestCase):
         self.assertEqual(*self.actual_expected_contents('untitled.html'))
 
 class SubpageOfIndex(IntegrationTestCase):
+    @unittest.skipUnless(LooseVersion(doxygen_version()) >= LooseVersion("1.8.17"),
+        "1.8.16 and below doesn't mark the page as subpage of index")
     def test(self):
         self.run_doxygen(wildcard='*.xml')
         self.assertEqual(*self.actual_expected_contents('page.html'))
Colin Watson's blog