mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: fix formulas in JavaDoc broken after Doxygen upgrade

Browse Source
This commit is contained in:
Maksim Shabunin 2024-03-07 17:36:07 +03:00
parent 1eb061f89d
commit 8550c415ef
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -572,6 +572,10 @@ if(OPENCV_DISABLE_FILESYSTEM_SUPPORT)
add_definitions(-DOPENCV_HAVE_FILESYSTEM_SUPPORT=0) add_definitions(-DOPENCV_HAVE_FILESYSTEM_SUPPORT=0)
endif() endif()
# MathJax is used for math rendering by both Doxygen HTML and JavaDoc, so
# this var have to be defined before "modules" AND "doc" are processed
set(OPENCV_MATHJAX_RELPATH "https://cdn.jsdelivr.net/npm/mathjax@3.0.1" CACHE STRING "URI to a MathJax installation")
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Get actual OpenCV version number from sources # Get actual OpenCV version number from sources
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

3
doc/CMakeLists.txt
View File

@ -195,9 +195,6 @@ if(DOXYGEN_FOUND)
list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/tutorial-utils.js") list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/tutorial-utils.js")
string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_HTML_FILES "${CMAKE_DOXYGEN_HTML_FILES}") string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_HTML_FILES "${CMAKE_DOXYGEN_HTML_FILES}")
set(OPENCV_MATHJAX_RELPATH "https://cdn.jsdelivr.net/npm/mathjax@3.0.1" CACHE STRING "URI to a MathJax installation")
if (DOXYGEN_DOT_EXECUTABLE) if (DOXYGEN_DOT_EXECUTABLE)
message(STATUS "Found DOT executable: ${DOXYGEN_DOT_EXECUTABLE}") message(STATUS "Found DOT executable: ${DOXYGEN_DOT_EXECUTABLE}")
set(init_dot_path "${DOXYGEN_DOT_EXECUTABLE}") set(init_dot_path "${DOXYGEN_DOT_EXECUTABLE}")

5
doc/mymath.js
View File

@ -1,6 +1,8 @@
//<![CDATA[ //<![CDATA[
window.MathJax = { window.MathJax = {
loader: {load: ['[tex]/ams']},
tex: { tex: {
packages: {'[+]': ['ams']},
macros: { macros: {
matTT: [ "\\[ \\left|\\begin{array}{ccc} #1 & #2 & #3\\\\ #4 & #5 & #6\\\\ #7 & #8 & #9 \\end{array}\\right| \\]", 9], matTT: [ "\\[ \\left|\\begin{array}{ccc} #1 & #2 & #3\\\\ #4 & #5 & #6\\\\ #7 & #8 & #9 \\end{array}\\right| \\]", 9],
fork: ["\\left\\{ \\begin{array}{l l} #1 & \\mbox{#2}\\\\ #3 & \\mbox{#4}\\\\ \\end{array} \\right.", 4], fork: ["\\left\\{ \\begin{array}{l l} #1 & \\mbox{#2}\\\\ #3 & \\mbox{#4}\\\\ \\end{array} \\right.", 4],
@ -14,7 +16,8 @@ window.MathJax = {
hdotsfor: ["\\dots", 1], hdotsfor: ["\\dots", 1],
mathbbm: ["\\mathbb{#1}", 1], mathbbm: ["\\mathbb{#1}", 1],
bordermatrix: ["\\matrix{#1}", 1] bordermatrix: ["\\matrix{#1}", 1]
} },
processEscapes: false
} }
}; };
//]]> //]]>

13
modules/java/jar/build.xml.in
View File

@ -45,18 +45,23 @@
@CMAKE_CONFIG_OPENCV_JAVADOC_LINK@ @CMAKE_CONFIG_OPENCV_JAVADOC_LINK@
additionalparam="--allow-script-in-comments" additionalparam="--allow-script-in-comments"
> >
<Header> <bottom>
<![CDATA[ <![CDATA[
<script> <script>
var url = window.location.href; var url = window.location.href;
var pos = url.lastIndexOf('/javadoc/'); var pos = url.lastIndexOf('/javadoc/');
url = pos >= 0 ? (url.substring(0, pos) + '/javadoc/mymath.js') : (window.location.origin + '/mymath.js'); url = pos >= 0 ? (url.substring(0, pos) + '/javadoc/mymath.js') : (window.location.origin + '/mymath.js');
var script = document.createElement('script'); var script = document.createElement('script');
script.src = '@OPENCV_MATHJAX_RELPATH@/es5/tex-chtml.js,' + url; script.setAttribute("src", url);
document.getElementsByTagName('head')[0].appendChild(script); script.setAttribute("defer", "")
document.head.appendChild(script);
script = document.createElement('script');
script.setAttribute("src", '@OPENCV_MATHJAX_RELPATH@/es5/tex-chtml.js');
script.setAttribute("defer", "")
document.head.appendChild(script);
</script> </script>
]]> ]]>
</Header> </bottom>
</javadoc> </javadoc>
</target> </target>