From 9f9a4cda5e4fa257784eb76fd85af69b02a476c6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 5 Jun 2020 12:24:33 +0100
Subject: [PATCH] Fix search in chm-friendly RTD theme

---
 .../sphinx_rtd_theme_chm_friendly/layout.html | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/docs/sphinx_rtd_theme_chm_friendly/layout.html b/docs/sphinx_rtd_theme_chm_friendly/layout.html
index 1b75e2d8a..109e8ef84 100644
--- a/docs/sphinx_rtd_theme_chm_friendly/layout.html
+++ b/docs/sphinx_rtd_theme_chm_friendly/layout.html
@@ -193,20 +193,27 @@
 
   {% if not embedded %}
 
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            LANGUAGE:'{{ language }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }},
-            SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
+		{% if sphinx_version >= "1.8.0" %} 
+      <script type="text/javascript" id="documentation_options" data-url_root="{{ pathto('', 1) }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script> 
+      {%- for scriptfile in script_files %} 
+        {{ js_tag(scriptfile) }} 
+      {%- endfor %} 
+    {% else %} 
+			<script type="text/javascript">
+					var DOCUMENTATION_OPTIONS = {
+							URL_ROOT:'{{ url_root }}',
+							VERSION:'{{ release|e }}',
+							LANGUAGE:'{{ language }}',
+							COLLAPSE_INDEX:false,
+							FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+							HAS_SOURCE:  {{ has_source|lower }},
+							SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
+					};
+			</script>
+			{%- for scriptfile in script_files %}
+				<script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+			{%- endfor %}
+    {% endif %} 
 
   {# RTD hosts this file, so just load on non RTD builds #}
   {% if not READTHEDOCS %}