object is the parent of the search bar */
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 36px;
+ margin-right: 1em;
+}
+
/*---------------- Search filter selection */
#MSearchSelectWindow {
diff --git a/docs/search/search.js b/docs/search/search.js
index a554ab9..92b6094 100644
--- a/docs/search/search.js
+++ b/docs/search/search.js
@@ -1,25 +1,26 @@
/*
- @licstart The following is the entire license notice for the
- JavaScript code in this file.
+ @licstart The following is the entire license notice for the JavaScript code in this file.
- Copyright (C) 1997-2017 by Dimitri van Heesch
+ The MIT License (MIT)
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ Copyright (C) 1997-2020 by Dimitri van Heesch
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ and associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ The above copyright notice and this permission notice shall be included in all copies or
+ substantial portions of the Software.
- @licend The above is the entire license notice
- for the JavaScript code in this file
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ @licend The above is the entire license notice for the JavaScript code in this file
*/
function convertToId(search)
{
@@ -200,10 +201,9 @@ function SearchBox(name, resultsPath, inFrame, label)
}
return;
}
- else if (window.frames.MSearchResults.searchResults)
+ else
{
- var elem = window.frames.MSearchResults.searchResults.NavNext(0);
- if (elem) elem.focus();
+ window.frames.MSearchResults.postMessage("take_focus", "*");
}
}
else if (e.keyCode==27) // Escape out of the search field
@@ -364,7 +364,7 @@ function SearchBox(name, resultsPath, inFrame, label)
if (domPopupSearchResultsWindow.style.display!='block')
{
var domSearchBox = this.DOMSearchBox();
- this.DOMSearchClose().style.display = 'inline';
+ this.DOMSearchClose().style.display = 'inline-block';
if (this.insideFrame)
{
var domPopupSearchResults = this.DOMPopupSearchResults();
diff --git a/docs/search/variables_0.html b/docs/search/variables_0.html
index bf3eba5..2edd111 100644
--- a/docs/search/variables_0.html
+++ b/docs/search/variables_0.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_1.html b/docs/search/variables_1.html
index 49fe59a..98b95a9 100644
--- a/docs/search/variables_1.html
+++ b/docs/search/variables_1.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_2.html b/docs/search/variables_2.html
index 0c8a18c..3e0c591 100644
--- a/docs/search/variables_2.html
+++ b/docs/search/variables_2.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_3.html b/docs/search/variables_3.html
index 19a31fc..7867da3 100644
--- a/docs/search/variables_3.html
+++ b/docs/search/variables_3.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_4.html b/docs/search/variables_4.html
index bdc37be..732dee2 100644
--- a/docs/search/variables_4.html
+++ b/docs/search/variables_4.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_5.html b/docs/search/variables_5.html
index 6aa2249..ad9b545 100644
--- a/docs/search/variables_5.html
+++ b/docs/search/variables_5.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_6.html b/docs/search/variables_6.html
index ce4a906..1cf2da1 100644
--- a/docs/search/variables_6.html
+++ b/docs/search/variables_6.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_7.html b/docs/search/variables_7.html
index 39ffd47..ab2db0b 100644
--- a/docs/search/variables_7.html
+++ b/docs/search/variables_7.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_8.html b/docs/search/variables_8.html
index 37a2edd..baec040 100644
--- a/docs/search/variables_8.html
+++ b/docs/search/variables_8.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_9.html b/docs/search/variables_9.html
index 21e5a4f..df2fea0 100644
--- a/docs/search/variables_9.html
+++ b/docs/search/variables_9.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_a.html b/docs/search/variables_a.html
index 1f65055..c7491ab 100644
--- a/docs/search/variables_a.html
+++ b/docs/search/variables_a.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_b.html b/docs/search/variables_b.html
index c02d066..371f07a 100644
--- a/docs/search/variables_b.html
+++ b/docs/search/variables_b.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_c.html b/docs/search/variables_c.html
index 4b866c6..c89b8de 100644
--- a/docs/search/variables_c.html
+++ b/docs/search/variables_c.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_d.html b/docs/search/variables_d.html
index 84d878b..a73000d 100644
--- a/docs/search/variables_d.html
+++ b/docs/search/variables_d.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/docs/search/variables_e.html b/docs/search/variables_e.html
index b0d9b7b..50f6bea 100644
--- a/docs/search/variables_e.html
+++ b/docs/search/variables_e.html
@@ -1,7 +1,7 @@
-
+
@@ -23,6 +23,12 @@
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults");
searchResults.Search();
+window.addEventListener("message", function(event) {
+ if (event.data == "take_focus") {
+ var elem = searchResults.NavNext(0);
+ if (elem) elem.focus();
+ }
+});
/* @license-end */
-->
diff --git a/tests/test_adapt.cc b/tests/test_adapt.cc
index 51b6b7f..4bec1ab 100644
--- a/tests/test_adapt.cc
+++ b/tests/test_adapt.cc
@@ -14,8 +14,10 @@ int main () {
printf("Solving system '%s' with method '%s'\n",
sys.get_name(), sys.get_method());
sys.solve_adaptive(tint, tint/10.0, "out", 1);
- printf("%llu function evaluations, %llu steps, %llu rejected steps\n",
- sys.get_neval(), sys.get_nstep(), sys.get_nrej());
+ printf("%d function evaluations, %d steps, %d rejected steps\n",
+ int(sys.get_neval()),
+ int(sys.get_nstep()),
+ int(sys.get_nrej()));
return(0);
}
diff --git a/tests/test_fixed.cc b/tests/test_fixed.cc
index 8fc54c8..d60d310 100644
--- a/tests/test_fixed.cc
+++ b/tests/test_fixed.cc
@@ -12,10 +12,12 @@ int main () {
Osc1 sys;
printf("Solving system '%s' with method '%s'\n",
- sys.get_name(), sys.get_method());
+ sys.get_name(),
+ sys.get_method());
sys.solve_fixed(tint, dt, "out", 1);
- printf("%llu function evaluations, %llu steps\n",
- sys.get_neval(), sys.get_nstep());
+ printf("%lu function evaluations, %lu steps\n",
+ (unsigned long)sys.get_neval(),
+ (unsigned long)sys.get_nstep());
return(0);
}
diff --git a/tests/test_snaps.cc b/tests/test_snaps.cc
index 6a4bc71..504e34b 100644
--- a/tests/test_snaps.cc
+++ b/tests/test_snaps.cc
@@ -21,7 +21,8 @@ int main () {
tsnap[4] = 4.9;
printf("Solving system '%s' with method '%s'\n",
- sys.get_name(), sys.get_method());
+ sys.get_name(),
+ sys.get_method());
/* solve with evenly spaced snaps */
//sys.solve_adaptive(tint, dt, nsnap, "out");
@@ -29,8 +30,9 @@ int main () {
/* solve with snap times from tsnap */
sys.solve_adaptive(dt, tsnap, nsnap, "out");
- printf("%llu function evaluations, %llu steps\n",
- sys.get_neval(), sys.get_nstep());
+ printf("%lu function evaluations, %lu steps\n",
+ (unsigned long)sys.get_neval(),
+ (unsigned long)sys.get_nstep());
delete [] tsnap;
return(0);
diff --git a/tests/test_stiff.cc b/tests/test_stiff.cc
index c8ead5d..70265f2 100644
--- a/tests/test_stiff.cc
+++ b/tests/test_stiff.cc
@@ -15,10 +15,10 @@ int main () {
printf("Solving system '%s' with method '%s'\n",
sys.get_name(), sys.get_method());
sys.solve_adaptive(tint, dt, "out", 1);
- printf("%llu function evaluations\n", sys.get_neval());
- printf("%llu steps\n", sys.get_nstep());
- printf("%llu rejected steps\n", sys.get_nrej());
- printf("%llu ODE Jacobian evaluations\n", sys.get_nJac());
+ printf("%lu function evaluations\n", (unsigned long)sys.get_neval());
+ printf("%lu steps\n", (unsigned long)sys.get_nstep());
+ printf("%lu rejected steps\n", (unsigned long)sys.get_nrej());
+ printf("%lu ODE Jacobian evaluations\n", (unsigned long)sys.get_nJac());
printf("%lu Newton JLU updates (LU decompositions)\n", sys.get_newton()->get_nJLU());
printf("%lu Newton LU solves (matrix equation solves)\n", sys.get_newton()->get_n_solve_LU());