diff --git a/DoxyfileBase b/DoxyfileBase index 1043c5ca088..1e0178e25cf 100644 --- a/DoxyfileBase +++ b/DoxyfileBase @@ -26,4 +26,5 @@ HTML_HEADER = html_header.html HTML_FOOTER = html_footer.html # MR - need to fix https://meshlib.io/documentation/Cpp/namespaceMR.html 404 EXCLUDE_SYMBOLS = Json std MR -SHOW_GROUPED_MEMB_INC = YES +SHOW_GROUPED_MEMB_INC = YES +PAGE_OUTLINE_PANEL = NO diff --git a/DoxyfileCpp b/DoxyfileCpp index 41ca2f2c477..8a7447a49bb 100644 --- a/DoxyfileCpp +++ b/DoxyfileCpp @@ -23,7 +23,6 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES PREDEFINED = MR_BIND_PREFERRED_NAME MR_CANONICAL_TYPEDEFS MRMESH_API MRSYMBOLMESH_API MRVIEWER_API MRIOEXTRAS_API MRVOXELS_API SKIP_FUNCTION_MACROS = YES - - EXCLUDE_SYMBOLS = Json std HTML_OUTPUT = html/Cpp +FULL_PATH_NAMES = YES # need add STRIP_FROM_INC_PATH and STRIP_FROM_PATH diff --git a/doxygen-awesome-css b/doxygen-awesome-css index af1d9030b3f..1f3620084ff 160000 --- a/doxygen-awesome-css +++ b/doxygen-awesome-css @@ -1 +1 @@ -Subproject commit af1d9030b3ffa7b483fa9997a7272fb12af6af4c +Subproject commit 1f3620084ff75734ed192101acf40e9dff01d848 diff --git a/scripts/custom_search/search.patch b/scripts/custom_search/search.patch index 91ab688c63d..0f9d26cfd7d 100644 --- a/scripts/custom_search/search.patch +++ b/scripts/custom_search/search.patch @@ -81,7 +81,7 @@ // The number of matches from the last run of . this.lastMatchCount = 0; -@@ -594,70 +581,8 @@ +@@ -594,84 +581,8 @@ } } @@ -98,6 +98,12 @@ - elem.setAttribute('className',attr); - } - +- const decodeHtml = (html) => { +- const txt = document.createElement("textarea"); +- txt.innerHTML = html; +- return txt.value; +- }; +- - const results = document.getElementById("SRResults"); - results.innerHTML = ''; - searchData.forEach((elem,index) => { @@ -111,10 +117,14 @@ - srLink.setAttribute('id','Item'+index); - setKeyActions(srLink,'return searchResults.Nav(event,'+index+')'); - setClassAttr(srLink,'SRSymbol'); -- srLink.innerHTML = elem[1][0]; +- srLink.innerHTML = decodeHtml(elem[1][0]); - srEntry.appendChild(srLink); - if (elem[1].length==2) { // single result -- srLink.setAttribute('href',resultsPath+elem[1][1][0]); +- if (elem[1][1][0].startsWith('http://') || elem[1][1][0].startsWith('https://')) { // absolute path +- srLink.setAttribute('href',elem[1][1][0]); +- } else { // relative path +- srLink.setAttribute('href',resultsPath+elem[1][1][0]); +- } - srLink.setAttribute('onclick','searchBox.CloseResultsWindow()'); - if (elem[1][1][1]) { - srLink.setAttribute('target','_parent'); @@ -123,7 +133,7 @@ - } - const srScope = document.createElement('span'); - setClassAttr(srScope,'SRScope'); -- srScope.innerHTML = elem[1][1][2]; +- srScope.innerHTML = decodeHtml(elem[1][1][2]); - srEntry.appendChild(srScope); - } else { // multiple results - srLink.setAttribute('href','javascript:searchResults.Toggle("SR_'+id+'")'); @@ -134,14 +144,18 @@ - srChild.setAttribute('id','Item'+index+'_c'+c); - setKeyActions(srChild,'return searchResults.NavChild(event,'+index+','+c+')'); - setClassAttr(srChild,'SRScope'); -- srChild.setAttribute('href',resultsPath+elem[1][c+1][0]); +- if (elem[1][c+1][0].startsWith('http://') || elem[1][c+1][0].startsWith('https://')) { // absolute path +- srChild.setAttribute('href',elem[1][c+1][0]); +- } else { // relative path +- srChild.setAttribute('href',resultsPath+elem[1][c+1][0]); +- } - srChild.setAttribute('onclick','searchBox.CloseResultsWindow()'); - if (elem[1][c+1][1]) { - srChild.setAttribute('target','_parent'); - } else { - srChild.setAttribute('target','_blank'); - } -- srChild.innerHTML = elem[1][c+1][2]; +- srChild.innerHTML = decodeHtml(elem[1][c+1][2]); - srChildren.appendChild(srChild); - } - srEntry.appendChild(srChildren); diff --git a/scripts/update_doc.sh b/scripts/update_doc.sh index c6d46e60e6f..6a2900240e3 100755 --- a/scripts/update_doc.sh +++ b/scripts/update_doc.sh @@ -18,7 +18,8 @@ TARGET_DIR="${1:-MeshLib/local}" prepare_source_files() { CURRENT_DIR=$(pwd) cd ../MeshLib/ - find source -name '*.h' -exec perl -pe 's|(?> Doxyfile${MODULE}Tag echo "XML_OUTPUT = ./xml_${MODULE}" >> Doxyfile${MODULE}Tag fi + if [ "$MODULE" = "Cpp" ]; then + echo "STRIP_FROM_INC_PATH = $(realpath ../MeshLib/source)" >> Doxyfile${MODULE}Tag + echo "STRIP_FROM_PATH = $(realpath ../MeshLib/source)" >> Doxyfile${MODULE}Tag + fi echo "========== ${MODULE}" >> log.txt echo "========== ${MODULE}" >> log_error.txt start=$(date +%s.%N) diff --git a/scripts/update_search.sh b/scripts/update_search.sh index eddea9896e6..bfece1aca15 100755 --- a/scripts/update_search.sh +++ b/scripts/update_search.sh @@ -6,9 +6,9 @@ if [ "$(basename "$PWD")" != "MeshInspector.github.io" ]; then return 1 fi -if [ "$(doxygen --version | cut -d' ' -f1)" != "1.11.0" ]; then +if [ "$(doxygen --version | cut -d' ' -f1)" != "1.14.0" ]; then echo "[ERROR] Unsuitable version of doxygen!" - echo "Use doxygen version 1.11.0 or update this script (and patch file)" + echo "Use doxygen version 1.14.0 or update this script (and patch file)" return 1 fi