diff --git a/CMakeLists.txt b/CMakeLists.txt index 60fbdf2a6c..1ca586192c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,6 +317,7 @@ IF(INSTALL_TCL) INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}") IF (IS_TCL_VERSION_FOUND) + INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tcl8" DESTINATION "${INSTALL_DIR}/lib") INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib") INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib") ELSE() diff --git a/dox/dev_guides/documentation/documentation.md b/dox/dev_guides/documentation/documentation.md index c31d05fa2a..da2141e3a5 100644 --- a/dox/dev_guides/documentation/documentation.md +++ b/dox/dev_guides/documentation/documentation.md @@ -361,20 +361,19 @@ For highlighting according to the C++ language, for instance, write the followi @verbatim ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} - int func(int a,int b) { return a*b; } +int func(int a,int b) { return a*b; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @endverbatim which will produce: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} - int func(int a,int b) { return a*b; } +int func(int a,int b) { return a*b; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Verbatim content can be written by using framing \@verbatim \@endverbatim . For instance -@verbatim - verbatim text -@endverbatim + verbatim text + @subsection OCCT_DM_SECTION_A_6 References @@ -392,16 +391,32 @@ to get a link to paragraph : @htmlonly Doxygen con @subsection OCCT_DM_SECTION_A_7 Images To insert image into document the developer can write the following code(in Doxygen-style): + +For HTML document: @verbatim -![alt-caption](relative/path/to/image/image001.svg "Image Caption") + @image html /relative/path/to/image/image001.png "Image caption" @endverbatim -This code tells Doxygen to insert a picture right in the place this code was written. Like this: +For latex document: @verbatim -![](/resources/occ_logo.png "OCCT logo") + @image latex /relative/path/to/image/image001.png "Image caption" @endverbatim -![](/resources/occ_logo.png "OCCT logo") +*Note*: When markdown document is used to generate html document the latex insertion is ignored (and vice versa) +due to this fact you can use image insertions in the pair, like example below: +@verbatim + @image html /relative/path/to/image/image001.png "Image caption" + @image latex /relative/path/to/image/image001.png "Image caption" +@endverbatim + +The code below tells Doxygen to insert a picture right in the place this code was written: +@verbatim + @image html /resources/occ_logo.png "OCCT logo" + @image latex /resources/occ_logo.png "OCCT logo" +@endverbatim + +@image html /resources/occ_logo.png "OCCT logo" +@image latex /resources/occ_logo.png "OCCT logo" @subsection OCCT_DM_SECTION_A_8 Table Of Contents diff --git a/src/StdPrs/StdPrs_ShadedShape.cxx b/src/StdPrs/StdPrs_ShadedShape.cxx index 11b430fd3f..dbc2a995f0 100644 --- a/src/StdPrs/StdPrs_ShadedShape.cxx +++ b/src/StdPrs/StdPrs_ShadedShape.cxx @@ -328,7 +328,7 @@ namespace Handle(Graphic3d_AspectLine3d) aBoundaryAspect = theDrawer->FaceBoundaryAspect ()->Aspect (); - Handle(Graphic3d_Group) & aPrsGrp = Prs3d_Root::CurrentGroup (thePresentation); + Handle(Graphic3d_Group) aPrsGrp = Prs3d_Root::CurrentGroup (thePresentation); aPrsGrp->SetGroupPrimitivesAspect (aBoundaryAspect); aPrsGrp->AddPrimitiveArray (aSegments); }