0027112: GeomAPI_Interpolate produces wrong result

Support of the approximation of natural boundary condition (f''= 0)
Correction misprinting
2025-08-19 13:40:49 +03:00 · 2016-02-25 08:38:01 +03:00 · 2016-02-21 08:39:14 +03:00 · 2016-02-20 19:13:11 +03:00 · 2016-02-20 18:43:49 +03:00 · 2016-02-20 18:43:48 +03:00
10899 changed files with 71896 additions and 47866 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FO

 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
-    include (${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake")
+    include (${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake)
  else()
    include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake)
  endif()
@@ -31,10 +31,27 @@ endif()
 # the name of the project
 project (OCCT)

+# include occt macros
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
 # Solution folder property
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)

-set (INSTALL_OCCT_TEST_CASES OFF CACHE BOOL "${INSTALL_OCCT_TEST_CASES_DESCR}")
+# get current OCCT version
+OCC_VERSION (OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)
+
+set_property (GLOBAL PROPERTY OCC_VERSION_MAJOR ${OCC_VERSION_MAJOR})
+set_property (GLOBAL PROPERTY OCC_VERSION_MINOR ${OCC_VERSION_MINOR})
+set_property (GLOBAL PROPERTY OCC_VERSION_MAINTENANCE ${OCC_VERSION_MAINTENANCE})
+
+set (INSTALL_TEST_CASES OFF CACHE BOOL "${INSTALL_TEST_CASES_DESCR}")
+
+# single-configuration generator
+set (SINGLE_GENERATOR OFF)
+if (CMAKE_BUILD_TYPE)
+  set (SINGLE_GENERATOR ON)
+endif()
+
 # a single-configuration generator like the Makefile generator defines CMAKE_BUILD_TYPE variable
 # check this variable and set if it's required
 if (DEFINED CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE) # single-configuration generator.
@@ -42,19 +59,127 @@ if (DEFINED CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE) # single-configuration ge
 endif()

 # enable extended messages of many OCCT algorithms
-set (OCCT_ALGO_EXTENDED_OUTPUT OFF CACHE BOOL "${OCCT_ALGO_EXTENDED_OUTPUT_DESCR}")
-if (OCCT_ALGO_EXTENDED_OUTPUT)
+set (BUILD_WITH_DEBUG OFF CACHE BOOL "${BUILD_WITH_DEBUG_DESCR}")
+if (BUILD_WITH_DEBUG)
  add_definitions (-DOCCT_DEBUG)
 endif()

 # copy samples to install directory
-set (INSTALL_OCCT_SAMPLES OFF CACHE BOOL "${INSTALL_OCCT_SAMPLES_DESCR}")
+set (INSTALL_SAMPLES OFF CACHE BOOL "${INSTALL_SAMPLES_DESCR}")

-# install dir of the built project
-set (INSTALL_DIR "" CACHE PATH "${INSTALL_DIR_DESCR}" )
-set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
+# install dir of the project
+if (NOT DEFINED INSTALL_DIR)
+  set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}")
+endif()

-set (APPLY_OCCT_PATCH_DIR "" CACHE PATH "${APPLY_OCCT_PATCH_DIR_DESCR}")
+if (NOT DEFINED CMAKE_INSTALL_PREFIX_PREV)
+  set (CMAKE_INSTALL_PREFIX_PREV "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
+elseif (NOT "${CMAKE_INSTALL_PREFIX_PREV}" STREQUAL "${CMAKE_INSTALL_PREFIX}")
+  # CMAKE_INSTALL_PREFIX has been changed at previous step
+  set (CMAKE_INSTALL_PREFIX_PREV "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
+  
+  # INSTALL_DIR is required to be updated
+  set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}" FORCE)
+endif()
+
+if (NOT DEFINED INSTALL_DIR_PREV)
+  set (INSTALL_DIR_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+elseif (NOT "${INSTALL_DIR_PREV}" STREQUAL "${INSTALL_DIR}")
+  # INSTALL_DIR has been changed at previous step
+  set (INSTALL_DIR_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+
+  # sync CMAKE_INSTALL_PREFIX with INSTALL_DIR 
+  set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+
+  # set CMAKE_INSTALL_PREFIX_PREV to avoid the reset of structure of the install folder 
+  set (CMAKE_INSTALL_PREFIX_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+
+  # The structure of install folder should be reset
+  OCCT_CHECK_AND_UNSET (INSTALL_BIN_DIR)
+  OCCT_CHECK_AND_UNSET (INSTALL_SCRIPT_DIR)
+  OCCT_CHECK_AND_UNSET (INSTALL_LIB_DIR)
+  OCCT_CHECK_AND_UNSET (INSTALL_INCLUDE_DIR)
+  OCCT_CHECK_AND_UNSET (INSTALL_OCCT_RESOURCE_DIR)
+  OCCT_CHECK_AND_UNSET (INSTALL_SHARE_DIR)
+endif()
+
+# hide CMAKE_INSTALL_PREFIX from a user
+set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+
+set (BIN_LETTER "")
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+  set (BIN_LETTER "d")
+elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+  set (BIN_LETTER "i")
+endif()
+
+# Get all used variables: OS_WITH_BIT, COMPILER
+OCCT_MAKE_OS_WITH_BITNESS()
+OCCT_MAKE_COMPILER_SHORT_NAME()
+
+# do not define INSTALL_BIN_DIR for win. 
+# Leave library structure for win: <prefix>/win64/vc10/bin(d)
+if (NOT DEFINED INSTALL_BIN_DIR)
+  if (UNIX)
+    set (INSTALL_BIN_DIR "${INSTALL_DIR}/bin" CACHE PATH "${INSTALL_BIN_DIR_DESCR}")
+  else()
+    if (SINGLE_GENERATOR)
+      set (INSTALL_BIN_DIR "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}" CACHE PATH "${INSTALL_BIN_DIR_DESCR}")
+    endif()
+  endif()
+endif()
+
+# define folder contaning all shell/batch scripts
+if (NOT DEFINED INSTALL_SCRIPT_DIR)
+  if (UNIX)
+    set (INSTALL_SCRIPT_DIR "${INSTALL_BIN_DIR}/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_SCRIPT_DIR_DESCR}")
+  else()
+    set (INSTALL_SCRIPT_DIR "${INSTALL_DIR}" CACHE PATH "${INSTALL_SCRIPT_DIR_DESCR}")
+  endif()
+endif()
+
+# place the libraries to <prefix>/lib folder for unix and leave old structure for windows
+if (NOT DEFINED INSTALL_LIB_DIR)
+  if (UNIX)
+    set (INSTALL_LIB_DIR "${INSTALL_DIR}/lib" CACHE PATH "${INSTALL_LIB_DIR_DESCR}")
+  else()
+    if (SINGLE_GENERATOR)
+      set (INSTALL_LIB_DIR "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}" CACHE PATH "${INSTALL_LIB_DIR_DESCR}")
+    endif()
+  endif()
+endif()
+
+# OCCT headers: <prefix>/inc for windows,
+#               <prefix>/include/opencascade-7.0.0 for unix
+if (NOT DEFINED INSTALL_INCLUDE_DIR)
+  if (UNIX)
+    set (INSTALL_INCLUDE_DIR "${INSTALL_DIR}/include/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_INCLUDE_DIR_DESCR}")
+  else()
+    set (INSTALL_INCLUDE_DIR "${INSTALL_DIR}/inc" CACHE PATH "${INSTALL_INCLUDE_DIR_DESCR}")
+  endif()
+endif()
+
+# OCCT resources: <prefix>/src for windows,
+#                 <prefix>/share/opencascade-7.0.0/resources for unix
+if (NOT DEFINED INSTALL_OCCT_RESOURCE_DIR)
+  if (UNIX)
+    set (INSTALL_OCCT_RESOURCE_DIR "${INSTALL_DIR}/share/opencascade-${OCC_VERSION_STRING_EXT}/resources" CACHE PATH "${INSTALL_OCCT_RESOURCE_DIR_DESCR}")
+  else()
+    set (INSTALL_OCCT_RESOURCE_DIR "${INSTALL_DIR}/src" CACHE PATH "${INSTALL_OCCT_RESOURCE_DIR_DESCR}")
+  endif()
+endif()
+
+# OCCT data
+if (NOT DEFINED INSTALL_SHARE_DIR)
+  if (UNIX)
+    set (INSTALL_SHARE_DIR "${INSTALL_DIR}/share/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_SHARE_DIR_DESCR}")
+  else()
+    set (INSTALL_SHARE_DIR "${INSTALL_DIR}" CACHE PATH "${INSTALL_SHARE_DIR_DESCR}")
+  endif()
+endif()
+
+# a directory recognized as a 'patch' for OCCT
+set (BUILD_PATCH "" CACHE PATH "${BUILD_PATCH_DESCR}")

 # the list of being built toolkits
 set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESCR}")
@@ -68,15 +193,11 @@ endif()
 if (APPLE)
  set (USE_GLX OFF CACHE BOOL "${USE_GLX_DESCR}")
 endif()
+
 if (WIN32)
  set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
 endif()

-set (USE_VTK OFF CACHE BOOL "${USE_VTK_DESCR}")
-
-# include occt macros
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
 # include the patched or original list of modules
 # list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
 # list <OCCT_MODULES> will contain all modules
@@ -94,11 +215,6 @@ endif()
 # Overview
 set (BUILD_DOC_OcctOverview OFF CACHE BOOL "${BUILD_DOC_OcctOverview_DESCR}")

-if (NOT USE_VTK)
-  list (REMOVE_ITEM Visualization_TOOLKITS TKIVtk)
-  list (REMOVE_ITEM Draw_TOOLKITS TKIVtkDraw)
-endif()
-
 if (NOT USE_D3D)
  list (REMOVE_ITEM Visualization_TOOLKITS TKD3DHost)
 endif()
@@ -121,7 +237,7 @@ endif()
 # accumulate all used toolkits
 list (REMOVE_DUPLICATES BUILD_TOOLKITS)
 set (RAW_BUILD_TOOLKITS)
-foreach(BUILD_TOOLKIT ${BUILD_TOOLKITS})
+foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
  OCCT_TOOLKIT_FULL_DEP (${BUILD_TOOLKIT} TOOLKIT_FULL_DEPS)
  list (APPEND RAW_BUILD_TOOLKITS ${BUILD_TOOLKIT} ${TOOLKIT_FULL_DEPS})
 endforeach()
@@ -134,14 +250,28 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags")

 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")

+# search for TKIVtk and TKIVtkDraw in BUILD_TOOLKITS
+list (FIND BUILD_TOOLKITS TKIVtk CAN_USE_VTK)
+if (CAN_USE_VTK EQUAL -1)
+  list (FIND BUILD_TOOLKITS TKIVtkDraw CAN_USE_VTK)
+endif()
+
+if (NOT CAN_USE_VTK EQUAL -1)
+  if (NOT DEFINED USE_VTK)
+    set (USE_VTK OFF CACHE BOOL "${USE_VTK_DESCR}")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET (USE_VTK)
+endif()
+
 # Rebuild *.yacc and *.lex files that are contained by TKMath toolkit
 list (FIND BUILD_TOOLKITS TKMath   CAN_REBUILD_PDC_FOR_TKMATH)
 list (FIND BUILD_TOOLKITS StepFile CAN_REBUILD_PDC_FOR_STEPFILE)

 if (NOT ${CAN_REBUILD_PDC_FOR_TKMATH} EQUAL -1 OR NOT ${CAN_REBUILD_PDC_FOR_STEPFILE} EQUAL -1)
-  set (REBUILD_PLATFORM_DEPENDENT_CODE OFF CACHE BOOL "${REBUILD_PLATFORM_DEPENDENT_CODE_DESCR}")
+  set (BUILD_YACCLEX OFF CACHE BOOL "${BUILD_YACCLEX_DESCR}")
 else()
-  OCCT_CHECK_AND_UNSET (REBUILD_PLATFORM_DEPENDENT_CODE)
+  OCCT_CHECK_AND_UNSET (BUILD_YACCLEX)
 endif()

 if (NOT DEFINED 3RDPARTY_DIR)
@@ -185,7 +315,13 @@ if (USE_VTK)
  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
-  #OCCT_CHECK_AND_UNSET ("INSTALL_VTK")
+  
+  if (NOT CAN_USE_VTK EQUAL -1)
+    message (STATUS "Info: TKIVtk and TKIVtkDraw toolkits excluded due to VTK usage is disabled")
+
+    list (REMOVE_ITEM BUILD_TOOLKITS TKIVtk)
+    list (REMOVE_ITEM BUILD_TOOLKITS TKIVtkDraw)
+  endif()
 endif()

 # D3D
@@ -280,9 +416,12 @@ if (BUILD_DOC_OcctOverview)
  endif()

  if (INSTALL_DOC_OcctOverview)
-    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/doc")
+    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_SHARE_DIR}/doc")

-    OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR}")
+    # create overview.html only for windows
+    if (WIN32)
+      OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_SCRIPT_DIR}")
+    endif()
  endif()

  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
@@ -290,18 +429,18 @@ else()
  OCCT_CHECK_AND_UNSET ("INSTALL_DOC_OcctOverview")

  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOXYGEN_EXECUTABLE")
-  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOXYGEN_DOT_EXECUTABLE")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()

 # bison 
-if (REBUILD_PLATFORM_DEPENDENT_CODE)
+if (BUILD_YACCLEX)
  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
 else()
  OCCT_CHECK_AND_UNSET ("3RDPARTY_BISON_EXECUTABLE")
 endif()

 # flex 
-if (REBUILD_PLATFORM_DEPENDENT_CODE)
+if (BUILD_YACCLEX)
  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/flex")
 else()
  OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
@@ -317,7 +456,7 @@ endif()
 if (3RDPARTY_INCLUDE_DIRS)
  list (REMOVE_DUPLICATES 3RDPARTY_INCLUDE_DIRS)
  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_INCLUDE_DIRS_WITH_ENDS "${3RDPARTY_INCLUDE_DIRS}")
-  message (STATUS "The directories containing 3rdparty headers: ${3RDPARTY_INCLUDE_DIRS_WITH_ENDS}")
+  message (STATUS "Info: The directories of 3rdparty headers: ${3RDPARTY_INCLUDE_DIRS_WITH_ENDS}")
  include_directories (${3RDPARTY_INCLUDE_DIRS})
 endif()

@@ -327,14 +466,10 @@ include_directories (${CMAKE_BINARY_DIR}/inc)
 if (3RDPARTY_LIBRARY_DIRS)
  list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
-  message (STATUS "The directories containing 3rdparty libraries: ${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
+  message (STATUS "Info: The directories of 3rdparty libraries: ${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
  link_directories (${3RDPARTY_LIBRARY_DIRS})
 endif()

-# Get all used variables: OS_WITH_BIT, COMPILER
-OCCT_MAKE_OS_WITH_BITNESS()
-OCCT_MAKE_COMPILER_SHORT_NAME()
-
 # build directories
 set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
@@ -354,15 +489,6 @@ if (WIN32)
  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
 endif()

-if ("${INSTALL_DIR}" STREQUAL "")
-  get_filename_component (CMAKE_BINARY_DIR_PARENT ${CMAKE_BINARY_DIR} DIRECTORY)
-
-  set (INSTALL_DIR "${CMAKE_BINARY_DIR_PARENT}/install" CACHE PATH "${INSTALL_DIR_DESCR}" FORCE)
-  set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
-
-  message (STATUS "Info: INSTALL_DIR has been set as ${INSTALL_DIR}")
-endif()
-
 string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")

@@ -372,15 +498,24 @@ COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}"
 string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "Info: \(${CURRENT_TIME}\) End the collecting")

-OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_DIR}")
-OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/samples")
+OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_SHARE_DIR}")

-if (INSTALL_OCCT_SAMPLES)
-  OCCT_INSTALL_FILE_OR_DIR ("samples" "${INSTALL_DIR}")
+# OCCT samples
+if (INSTALL_SAMPLES)
+  if (WIN32)
+    OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_SHARE_DIR}/samples")
+    OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_SHARE_DIR}/samples")   
+  endif()
+  
+  OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_SHARE_DIR}/samples")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_SHARE_DIR}/samples")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_SHARE_DIR}/samples")
 endif()

-if (INSTALL_OCCT_TEST_CASES)
-  OCCT_INSTALL_FILE_OR_DIR ("tests" "${INSTALL_DIR}")
+OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_SHARE_DIR}/samples")
+
+if (INSTALL_TEST_CASES)
+  OCCT_INSTALL_FILE_OR_DIR ("tests" "${INSTALL_SHARE_DIR}")
 endif()

 if (WIN32)
@@ -389,14 +524,16 @@ else()
  set (SCRIPT_EXT sh)
 endif()

-# DRAW.BAT or DRAW.SH
-if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
-  install (FILES "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
-          OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+# copy draw script to install script folder
+if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
+  install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_SCRIPT_DIR}"
+          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 else()
-  install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
-          OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+  install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_SCRIPT_DIR}"
+          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 endif()
+
+# copy draw script to CMake binary folder
 OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")

 set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
@@ -404,29 +541,29 @@ set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
 if (WIN32)
  set (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM_NAME}\" (\n  call \"%~dp0${SUB_CUSTOM_NAME}\" %VCVER% %ARCH% %CASDEB% \n)")
 else()
-  set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
+  set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" \"\$1\" \"\$2\" \nfi")
 endif()

 # change custom.bat/sh
-if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
-  file (READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+if (EXISTS "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}")
+  file (READ "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)

  set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")

-  file (WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+  file (WRITE "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
 else()
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}")
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_SCRIPT_DIR}")
 endif()

 # write current custom.bat/sh (for install directory)
 set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
-OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR}")
+OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_SCRIPT_DIR}")

 # write current custom.bat/sh (for build directory)
 OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")

 if (BUILD_MODULE_OcctMfcSamples)
-  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
+  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_SCRIPT_DIR}")
  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()

@@ -434,29 +571,31 @@ endif()
 OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")

 # end script for draw in standalone environment
-# release version
-set (BUILD_LETTER "")
-OCCT_CONFIGURE ("adm/templates/env.install.${SCRIPT_EXT}.in" "env.install.release.${SCRIPT_EXT}")
-install (FILES "${CMAKE_BINARY_DIR}/env.install.release.${SCRIPT_EXT}" 
-         CONFIGURATIONS Release
-         DESTINATION  "${INSTALL_DIR}"
-         RENAME "env.${SCRIPT_EXT}")
+if (UNIX)
+  OCCT_CONFIGURE ("adm/templates/env.install.sh.in" "env.install.sh")
+  install (FILES "${CMAKE_BINARY_DIR}/env.install.sh" DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.sh")
+else()
+  # release version
+  set (CURRENT_BUILD_LETTER "")
+  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.release.bat")
+  install (FILES "${CMAKE_BINARY_DIR}/env.install.release.bat" 
+           CONFIGURATIONS Release
+           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")

-# debug version
-set (BUILD_LETTER "d")
-OCCT_CONFIGURE ("adm/templates/env.install.${SCRIPT_EXT}.in" "env.install.debug.${SCRIPT_EXT}")
-install (FILES "${CMAKE_BINARY_DIR}/env.install.debug.${SCRIPT_EXT}" 
-         CONFIGURATIONS Debug
-         DESTINATION  "${INSTALL_DIR}"
-         RENAME "env.${SCRIPT_EXT}")
+  # debug version
+  set (CURRENT_BUILD_LETTER "d")
+  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.debug.bat")
+  install (FILES "${CMAKE_BINARY_DIR}/env.install.debug.bat" 
+           CONFIGURATIONS Debug
+           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")

-# release with debug info version
-set (BUILD_LETTER "i")
-OCCT_CONFIGURE ("adm/templates/env.install.${SCRIPT_EXT}.in" "env.install.relwithdebinfo.${SCRIPT_EXT}")
-install (FILES "${CMAKE_BINARY_DIR}/env.install.relwithdebinfo.${SCRIPT_EXT}" 
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION  "${INSTALL_DIR}"
-         RENAME "env.${SCRIPT_EXT}")
+  # release with debug info version
+  set (CURRENT_BUILD_LETTER "i")
+  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.relwithdebinfo.bat")
+  install (FILES "${CMAKE_BINARY_DIR}/env.install.relwithdebinfo.bat" 
+           CONFIGURATIONS RelWithDebInfo
+           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")
+endif()

 # copy DrawAppliInit from OCCT source to build directory
 if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
@@ -469,9 +608,9 @@ foreach(RESOURCE ${RESOURCES})
  get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
  if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
    get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src/${RESOURCE_FOLDER}")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_OCCT_RESOURCE_DIR}/${RESOURCE_FOLDER}")
  else()
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_OCCT_RESOURCE_DIR}")
  endif()
 endforeach()

--- a/adm/MODULES
+++ b/adm/MODULES
@@ -2,6 +2,6 @@ FoundationClasses TKernel TKMath
 ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
-ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj
+ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKShape FWOSPlugin TKTObj TKBinTObj TKXmlTObj TKVCAF
 DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
-Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -237,13 +237,18 @@ n BinMDataXtd
 n BinMDocStd
 n BinMFunction
 n BinMNaming
-n BinMPrsStd
 n BinObjMgt
 n BinTools
 n CDF
 n CDM
 n FWOSDriver
 n PCDM
+n StdLDrivers
+n StdLPersistent
+n StdObjMgt
+n StdDrivers
+n StdPersistent
+n ShapePersistent
 n TDF
 n TDataStd
 n TDataXtd
@@ -260,7 +265,6 @@ n XmlMDataXtd
 n XmlMDocStd
 n XmlMFunction
 n XmlMNaming
-n XmlMPrsStd
 n XmlObjMgt
 r StdResource
 r XmlOcafResource
@@ -273,6 +277,9 @@ t TKCAF
 t TKCDF
 t TKLCAF

+t TKStdL
+t TKStd
+t TKShape
 t TKTObj
 t TKXml
 t TKXmlL
@@ -431,3 +438,5 @@ n IVtkTools
 t TKIVtk
 n IVtkDraw
 t TKIVtkDraw
+n Geom2dEvaluator
+t TKVCAF
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -191,47 +191,62 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
    OCCT_MAKE_COMPILER_SHORT_NAME()

    if (WIN32)
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-
+      if (DEFINED INSTALL_BIN_DIR)
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
+      else()
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+      endif()
    else()
      get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} REALPATH)
+
      if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
        get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
-        install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-                 RENAME ${FREEIMLIB}.3)
-                 install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-                 RENAME ${FREEIMLIB}.3)
-        install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-                 RENAME ${FREEIMLIB}.3)
+
+        if (DEFINED INSTALL_LIB_DIR)
+          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_LIB_DIR}" RENAME ${FREEIMLIB}.3)
+        else()
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS Release
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                   RENAME ${FREEIMLIB}.3)
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS RelWithDebInfo
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                   RENAME ${FREEIMLIB}.3)
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS Debug
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                   RENAME ${FREEIMLIB}.3)
+        endif()
      endif()
+
      if("${PRODUCT_NAME}" STREQUAL "GL2PS")
        get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
-        install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-                 RENAME ${GL2PSLIB}.1)
-        install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-                 RENAME ${GL2PSLIB}.1)
-        install (FILES "${ABS_PATH}"
-                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-                 RENAME ${GL2PSLIB}.1)
+
+        if (DEFINED INSTALL_LIB_DIR)
+          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_LIB_DIR}" RENAME ${GL2PSLIB}.1)
+        else()
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS Release
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                   RENAME ${GL2PSLIB}.1)
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS RelWithDebInfo
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                   RENAME ${GL2PSLIB}.1)
+          install (FILES "${ABS_PATH}"
+                   CONFIGURATIONS Debug
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                   RENAME ${GL2PSLIB}.1)
+        endif()
      endif()
    endif()
  else()
--- a/adm/cmake/doxygen.cmake
+++ b/adm/cmake/doxygen.cmake
@@ -1,32 +1,35 @@
 # doxygen

+set (3RDPARTY_DOT_EXECUTABLE_DESCR       "The path to the 'dot' tool producing layered drawings of directed graphs.\nThis tool used by doxygen")
+set (3RDPARTY_DOXYGEN_EXECUTABLE_DESCR   "The path to the doxygen command")
+
 if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
-  set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "The Path to the doxygen command")
+  set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}")
 endif()

-if (NOT DEFINED 3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
-  set (3RDPARTY_DOXYGEN_DOT_EXECUTABLE "" CACHE FILEPATH "The path to the dot program used by doxygen")
+if (NOT DEFINED 3RDPARTY_DOT_EXECUTABLE)
+  set (3RDPARTY_DOT_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}")
 endif()

-if (NOT DEFINED 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
-  set (3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE OFF CACHE BOOL "Skip trying to find Dot")
+if (NOT DEFINED 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  set (3RDPARTY_SKIP_DOT_EXECUTABLE OFF CACHE BOOL "Skip trying to find Dot")
 endif()

-if (3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
+if (3RDPARTY_SKIP_DOT_EXECUTABLE)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_DOT_EXECUTABLE)
 endif()

-if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE))
+if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE))

-  set (DOXYGEN_SKIP_DOT ${3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE})
+  set (DOXYGEN_SKIP_DOT ${3RDPARTY_SKIP_DOT_EXECUTABLE})
  find_package (Doxygen)
  
  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
-    set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "The Path to the doxygen command" FORCE)
+    set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}" FORCE)
  endif()
  
-  if (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
-    set (3RDPARTY_DOXYGEN_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "The path to the dot program used by doxygen" FORCE)
+  if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
+    set (3RDPARTY_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}" FORCE)
  endif()
 endif()

@@ -34,9 +37,9 @@ if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE
  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
 endif()

-if (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
-  if (NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_DOT_EXECUTABLE}")
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
+if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (NOT 3RDPARTY_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOT_EXECUTABLE}")
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOT_EXECUTABLE)
  endif()
 endif()

--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -289,34 +289,44 @@ endif()

 # install instructions
 if (INSTALL_FREETYPE)
-
  OCCT_MAKE_OS_WITH_BITNESS()
+
  if (WIN32)
-    install (FILES "${3RDPARTY_FREETYPE_DLL}"
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-    install (FILES "${3RDPARTY_FREETYPE_DLL}"
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-    install (FILES "${3RDPARTY_FREETYPE_DLL}"
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    if (DEFINED INSTALL_BIN_DIR)
+      install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
+    else()
+      install (FILES "${3RDPARTY_FREETYPE_DLL}"
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+      install (FILES "${3RDPARTY_FREETYPE_DLL}"
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+      install (FILES "${3RDPARTY_FREETYPE_DLL}"
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    endif()
  else()
    get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
    get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)

-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+    if (DEFINED INSTALL_LIB_DIR)
+      install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+               DESTINATION "${INSTALL_LIB_DIR}"
+               RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+    else()
+      install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+               RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+      install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+               RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+      install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+               RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+    endif()
  endif()

  set (USED_3RDPARTY_FREETYPE_DIR "")
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -12,20 +12,16 @@ endif()

 if (USE_TCL)
  if ("${3RDPARTY_TCL_LIBRARY_VERSION}" STREQUAL "")
-    message (STATUS "Warning. TCL version has not been specified by CSF_TclLibs defining thus it will be used as 8.6")
+    message (STATUS "Warning: TCL version has not been specified by CSF_TclLibs defining thus it will be used as 8.6")
    set (3RDPARTY_TCL_LIBRARY_VERSION "8.6")
  endif()

  if ("${3RDPARTY_TK_LIBRARY_VERSION}" STREQUAL "")
-    message (STATUS "Warning. TK version has not been specified by CSF_TclTkLibs defining thus it will be used as 8.6")
+    message (STATUS "Warning: TK version has not been specified by CSF_TclTkLibs defining thus it will be used as 8.6")
    set (3RDPARTY_TK_LIBRARY_VERSION "8.6")
  endif()
 endif()

-if (USE_VTK AND NOT 3RDPARTY_VTK_REQUIRED_LIBRARIES)
-  message (WARNING "CSF_VTK specification: VTK libraries are not defined")
-endif()
-
 if (USE_TBB)
  set (CSF_TBB "tbb tbbmalloc")
 else()
@@ -45,12 +41,6 @@ if (WIN32)
    set (CSF_TclTkLibs   "tk${3RDPARTY_TK_LIBRARY_VERSION}.lib")
  endif()

-  if (USE_VTK)
-    set (CSF_VTK "${3RDPARTY_VTK_REQUIRED_LIBRARIES}")
-  else()
-    set (CSF_VTK)
-  endif()
-
 else()

  if (APPLE)
@@ -84,9 +74,10 @@ else()
    set (CSF_ThreadLibs  "c")
    set (CSF_OpenGlLibs  "EGL GLESv2")
  elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt")
+    set (CSF_ThreadLibs  "pthread rt stdc++")
    set (CSF_OpenGlLibs  "GLU GL")
    set (CSF_XwLibs      "X11 Xext Xmu Xi")
+    set (CSF_dl          "dl")

    if (USE_TCL)
      set (CSF_TclLibs     "tcl${3RDPARTY_TCL_LIBRARY_VERSION}")
@@ -113,10 +104,4 @@ else()
      set (CSF_GL2PS)
    endif()
  endif()
-  
-  if (USE_VTK)
-    set (CSF_VTK "${3RDPARTY_VTK_REQUIRED_LIBRARIES}")
-  else()
-    set (CSF_VTK)
-  endif()
 endif()
--- a/adm/cmake/occt_defs_flags.cmake
+++ b/adm/cmake/occt_defs_flags.cmake
@@ -5,25 +5,26 @@ if(FLAGS_ALREADY_INCLUDED)
 endif()
 set(FLAGS_ALREADY_INCLUDED 1)

-
 if (MSVC)
-  add_definitions(/fp:precise)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp:precise")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fp:precise")
 endif()

 # set compiler short name and choose SSE2 option for appropriate MSVC compilers
 # ONLY for 32-bit
 if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
  if (MSVC80 OR MSVC90 OR MSVC10)
-    add_definitions(/arch:SSE2)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
  endif()
 endif()

 if (WIN32)
-  add_definitions (-wd4996)
-elseif (APPLE)
-  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
+  add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 else()
-  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fexceptions -fPIC")
+  add_definitions(-DOCC_CONVERT_SIGNALS)
 endif()

 # enable structured exceptions for MSVC
@@ -37,41 +38,41 @@ endif()
 # remove _WINDOWS flag if it exists
 string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
 if (IS_WINDOWSFLAG)
-  message (STATUS "/D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()

 # remove WIN32 flag if it exists
 string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
 if (IS_WIN32FLAG)
-  message (STATUS "/DWIN32 has been removed from CMAKE_CXX_FLAGS")
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_CXX_FLAGS")
  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()

 # remove _WINDOWS flag if it exists
 string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
 if (IS_WINDOWSFLAG)
-  message (STATUS "/D_WINDOWS has been removed from CMAKE_C_FLAGS")
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_C_FLAGS")
  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 endif()

 # remove WIN32 flag if it exists
 string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
 if (IS_WIN32FLAG)
-  message (STATUS "/DWIN32 has been removed from CMAKE_C_FLAGS")
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_C_FLAGS")
  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 endif()

 # remove DEBUG flag if it exists
 string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
 if (IS_DEBUG_CXX)
-  message (STATUS "-DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 endif()

 string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
 if (IS_DEBUG_C)
-  message (STATUS "-DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
 # enable parallel compilation on MSVC 9 and above
@@ -91,6 +92,17 @@ if (MSVC)
  endif()
 elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+  if (BUILD_SHARED_LIBS)
+    if (APPLE)
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
+    else()
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm -z defs ${CMAKE_SHARED_LINKER_FLAGS}")
+    endif()
+  else()
+    if (NOT ANDROID)
+      set (CMAKE_STATIC_LINKER_FLAGS "-lm ${CMAKE_SHARED_STATIC_FLAGS}")
+    endif()
+  endif()
 endif()

 if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -91,18 +91,18 @@ endfunction()

 function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)

-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
-    file (GLOB FOUND_FILES "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}")
+    file (GLOB FOUND_FILES "${BUILD_PATCH}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
  endif()

  file (GLOB ORIGIN_FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
  foreach (ORIGIN_FILE ${ORIGIN_FILES})
    # check for existence of patched version of current file
-    if (NOT APPLY_OCCT_PATCH_DIR OR NOT EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
+    if (NOT BUILD_PATCH OR NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}")
      list (APPEND FOUND_FILES ${ORIGIN_FILE})
    else()
      get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME)
-      if (NOT EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
+      if (NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
        list (APPEND FOUND_FILES ${ORIGIN_FILE})
      endif()
    endif()
@@ -120,6 +120,7 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")

@@ -147,15 +148,15 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
 endfunction()

 macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
-    if (IS_DIRECTORY "${APPLY_OCCT_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}")
+    if (IS_DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}")
      # first of all, install original files
      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")

      # secondly, rewrite original files with patched ones
-      install (DIRECTORY "${APPLY_OCCT_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+      install (DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
    else()
-      install (FILES     "${APPLY_OCCT_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+      install (FILES     "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
    endif()
  else()
    if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
@@ -167,8 +168,8 @@ macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
 endmacro()

 macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME DESTINATION_PATH)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
-    configure_file("${APPLY_OCCT_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
  else()
    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
  endif()
@@ -181,8 +182,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO

  # consider patched header.in template
  set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in")
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
-    set (TEMPLATE_HEADER_PATH "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/header.in")
+    set (TEMPLATE_HEADER_PATH "${BUILD_PATCH}/adm/templates/header.in")
  endif()

  set (ROOT_OCCT_DIR ${CMAKE_SOURCE_DIR})
@@ -190,8 +191,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
  foreach (OCCT_USED_TOOLKIT ${OCCT_BUILD_TOOLKITS})
    # append all required package folders
    set (OCCT_TOOLKIT_PACKAGES)
-    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
    endif()
@@ -206,78 +207,90 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
  set (OCCT_HEADER_FILE_WITH_PROPER_NAMES)

  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Compare FILES with files in package directories...")
+  message (STATUS "Info: \(${CURRENT_TIME}\) Compare FILES with files in package directories...")

  foreach (OCCT_PACKAGE ${OCCT_USED_PACKAGES})
-    if (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
-
-      list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
-      math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
-
-      # emit warnings if there is unprocessed headers
-      file (GLOB OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/*.*")
-      foreach (OCCT_FILE_IN_DIR ${OCCT_ALL_FILES_IN_DIR})
-        get_filename_component (OCCT_FILE_IN_DIR_NAME ${OCCT_FILE_IN_DIR} NAME)
-
-        set (OCCT_FILE_IN_DIR_STATUS OFF)
-
-        if (${ALL_FILES_NB} LESS 0)
-          break()
-        endif()
-
-        foreach (FILE_INDEX RANGE ${ALL_FILES_NB})
-          list (GET OCCT_ALL_FILE_NAMES ${FILE_INDEX} OCCT_FILE_NAME)
-
-          if ("${OCCT_FILE_IN_DIR_NAME}" STREQUAL "${OCCT_FILE_NAME}")
-            set (OCCT_FILE_IN_DIR_STATUS ON)
-
-            string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
-            if (IS_HEADER_FOUND)
-              list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
-
-              # collect header files with name that does not contain its package one
-              string (FIND "${OCCT_FILE_NAME}" "${OCCT_PACKAGE}_" FOUND_INDEX)
-              if (NOT ${FOUND_INDEX} EQUAL 0)
-                list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
-              endif()            
-            endif()
-
-            # remove found element from list
-            list (REMOVE_AT OCCT_ALL_FILE_NAMES ${FILE_INDEX})
-            math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" ) # decrement number
-
-            break()
-          endif()
-        endforeach()
-
-        if (NOT OCCT_FILE_IN_DIR_STATUS)
-          message (STATUS "Warning. ${OCCT_FILE_IN_DIR} is not involved into ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
-          
-          string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
-          if (IS_HEADER_FOUND)
-            list (APPEND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${OCCT_FILE_NAME})
-          endif()
-        endif()
-      endforeach()
    else()
      message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}")
+      continue()
    endif()
+
+    list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
+    math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
+
+    # emit warnings if there is unprocessed headers
+    file (GLOB OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/*.*")
+    file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")
+
+    # use patched header files
+    foreach (OCCT_FILE_IN_PATCH_DIR ${OCCT_ALL_FILES_IN_PATCH_DIR})
+      get_filename_component (OCCT_FILE_IN_PATCH_DIR_NAME ${OCCT_FILE_IN_PATCH_DIR} NAME)
+      list (REMOVE_ITEM OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${OCCT_FILE_IN_PATCH_DIR_NAME}")
+      list (APPEND OCCT_ALL_FILES_IN_DIR "${OCCT_FILE_IN_PATCH_DIR}")
+    endforeach()
+
+    foreach (OCCT_FILE_IN_DIR ${OCCT_ALL_FILES_IN_DIR})
+      get_filename_component (OCCT_FILE_IN_DIR_NAME ${OCCT_FILE_IN_DIR} NAME)
+
+      set (OCCT_FILE_IN_DIR_STATUS OFF)
+
+      if (${ALL_FILES_NB} LESS 0)
+        break()
+      endif()
+
+      foreach (FILE_INDEX RANGE ${ALL_FILES_NB})
+        list (GET OCCT_ALL_FILE_NAMES ${FILE_INDEX} OCCT_FILE_NAME)
+
+        if ("${OCCT_FILE_IN_DIR_NAME}" STREQUAL "${OCCT_FILE_NAME}")
+          set (OCCT_FILE_IN_DIR_STATUS ON)
+
+          string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
+          if (IS_HEADER_FOUND)
+            list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
+
+            # collect header files with name that does not contain its package one
+            string (FIND "${OCCT_FILE_NAME}" "${OCCT_PACKAGE}_" FOUND_INDEX)
+            if (NOT ${FOUND_INDEX} EQUAL 0)
+              list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
+            endif()
+          endif()
+
+          # remove found element from list
+          list (REMOVE_AT OCCT_ALL_FILE_NAMES ${FILE_INDEX})
+          math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" ) # decrement number
+
+          break()
+        endif()
+      endforeach()
+
+      if (NOT OCCT_FILE_IN_DIR_STATUS)
+        message (STATUS "Warning. File ${OCCT_FILE_IN_DIR} is not listed in ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
+
+        string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
+        if (IS_HEADER_FOUND)
+          list (APPEND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${OCCT_FILE_NAME})
+        endif()
+      endif()
+    endforeach()
  endforeach()
  
  # create new file including found header
  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Create header-links in inc folder...")
+  message (STATUS "Info: \(${CURRENT_TIME}\) Create header-links in inc folder...")

  foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES_COMPLETE})
    get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
    configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
  endforeach()
  
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/inc")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_INCLUDE_DIR}")
  
  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Checking headers in inc folder...")
+  message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
    
  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/inc/*")
  foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
@@ -316,23 +329,23 @@ macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
    file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
  endif()

-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_COPIED_OBJECT}")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_COPIED_OBJECT}")
    # secondly, rewrite original files with patched ones
-    file (COPY "${APPLY_OCCT_PATCH_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    file (COPY "${BUILD_PATCH}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
  endif()
 endmacro()

 macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
-    configure_file("${APPLY_OCCT_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
  else()
    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
  endif()
 endmacro()

 macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
-    add_subdirectory(${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY})
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+    add_subdirectory(${BUILD_PATCH}/${BEING_ADDED_DIRECTORY})
  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
    add_subdirectory (${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY})
  else()
@@ -347,8 +360,8 @@ function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
    message(STATUS "Warning: the list of being used toolkits is empty")
  else()
    foreach (USED_TOOLKIT ${BUILD_TOOLKITS})
-      if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
-        file (READ "${APPLY_OCCT_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${USED_TOOLKIT}/EXTERNLIB")
+        file (READ "${BUILD_PATCH}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
      elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
        file (READ "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
      endif()
@@ -365,8 +378,8 @@ endfunction()

 function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
  set (LOCAL_FILE_CONTENT)
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${FILE_NAME}")
-    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_NAME}")
+    file (STRINGS "${BUILD_PATCH}/${FILE_NAME}" LOCAL_FILE_CONTENT)
  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
    file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
  endif()
@@ -457,28 +470,42 @@ function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
  set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
 endfunction()

-# Returns OCCT version string from file Standard_Version.hxx (if available)
-function (OCCT_VERSION OCCT_VERSION_VAR)
-  set (OCC_VERSION_COMPLETE "7.1.0")
-  set (OCC_VERSION_DEVELOPMENT "")
-  
-  set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}")
+# Returns OCC version string from file Standard_Version.hxx (if available)
+function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)

+  set (OCC_VERSION_MAJOR         7)
+  set (OCC_VERSION_MINOR         0)
+  set (OCC_VERSION_MAINTENANCE   0)
+  set (OCC_VERSION_DEVELOPMENT   dev)
+  set (OCC_VERSION_COMPLETE      "7.0.0")
+ 
  set (STANDARD_VERSION_FILE "${CMAKE_SOURCE_DIR}/src/Standard/Standard_Version.hxx")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/Standard/Standard_Version.hxx")
+    set (STANDARD_VERSION_FILE "${BUILD_PATCH}/src/Standard/Standard_Version.hxx")
+  endif()
+
  if (EXISTS "${STANDARD_VERSION_FILE}")
-    foreach (SOUGHT_VERSION OCC_VERSION_COMPLETE OCC_VERSION_DEVELOPMENT)
+    foreach (SOUGHT_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE)
+      file (STRINGS "${STANDARD_VERSION_FILE}" ${SOUGHT_VERSION} REGEX "^#define ${SOUGHT_VERSION} .*")
+      string (REGEX REPLACE ".*${SOUGHT_VERSION} .*([^ ]+).*" "\\1" ${SOUGHT_VERSION} "${${SOUGHT_VERSION}}" )
+    endforeach()
+    
+    foreach (SOUGHT_VERSION OCC_VERSION_DEVELOPMENT OCC_VERSION_COMPLETE)
      file (STRINGS "${STANDARD_VERSION_FILE}" ${SOUGHT_VERSION} REGEX "^#define ${SOUGHT_VERSION} .*")
      string (REGEX REPLACE ".*${SOUGHT_VERSION} .*\"([^ ]+)\".*" "\\1" ${SOUGHT_VERSION} "${${SOUGHT_VERSION}}" )
    endforeach()
-    
-    if (NOT "${OCC_VERSION_DEVELOPMENT}" STREQUAL "")
-      set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}")
-    else()
-      set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}")
-    endif()
  endif()
-
-  set (${OCCT_VERSION_VAR} "${OCCT_VERSION_LOCALVAR}" PARENT_SCOPE)
+ 
+  set (OCC_VERSION_MAJOR "${OCC_VERSION_MAJOR}" PARENT_SCOPE)
+  set (OCC_VERSION_MINOR "${OCC_VERSION_MINOR}" PARENT_SCOPE)
+  set (OCC_VERSION_MAINTENANCE "${OCC_VERSION_MAINTENANCE}" PARENT_SCOPE)
+  set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
+  
+  if (OCC_VERSION_DEVELOPMENT AND OCC_VERSION_COMPLETE)
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
+  else()
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}" PARENT_SCOPE)
+  endif()
 endfunction()

 macro (CHECK_PATH_FOR_CONSISTENCY THE_ROOT_PATH_NAME THE_BEING_CHECKED_PATH_NAME THE_VAR_TYPE THE_MESSAGE_OF_BEING_CHECKED_PATH)
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -25,7 +25,7 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    set (HEADER_FILES)

    # Generate Flex and Bison files
-    if (${REBUILD_PLATFORM_DEPENDENT_CODE})
+    if (${BUILD_YACCLEX})

      # flex files
      OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
@@ -65,14 +65,14 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    endif()

    # header files
-    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")

-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
      if(APPLE)
-        file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+        file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
      endif()
    else()
      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
@@ -92,10 +92,10 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    endif()

    foreach(HEADER_FILE ${HEADER_FILES})
-      if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        list (APPEND USED_INCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        list (APPEND USED_INCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
      else()
        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
@@ -103,10 +103,10 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    endforeach()

    foreach(SOURCE_FILE ${SOURCE_FILES})
-      if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        list (APPEND USED_SRCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        list (APPEND USED_SRCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
      else()
        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
@@ -116,41 +116,64 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
 endforeach()
 string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")

+set (USED_RCFILE "")
+if (MSVC)
+  set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
+
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
+    configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+  endif()
+endif()
+
 if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
-  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})

-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Release
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-else()
-  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
-
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Release
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS RelWithDebInfo
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Debug
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
-  if (MSVC)
-    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+  if (DEFINED INSTALL_BIN_DIR)
+    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_BIN_DIR}")
+  else()
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+    install (TARGETS ${PROJECT_NAME}
             CONFIGURATIONS Debug
             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
  endif()
+else()
+  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
+
+  if (DEFINED INSTALL_LIB_DIR)
+    install (TARGETS ${PROJECT_NAME}
+             RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+             ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+             LIBRARY DESTINATION "${INSTALL_LIB_DIR}") 
+  else()
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Debug
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+
+    if (MSVC)
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    endif()
+  endif()
 endif()

 set (CURRENT_MODULE)
@@ -162,10 +185,16 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
 endforeach()

 if (CURRENT_MODULE)
-  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Modules/${CURRENT_MODULE}")
 endif()

-set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
+get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
+get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
+
+set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
+                                                  SOVERSION     "${OCC_VERSION_MAJOR}"
+                                                  VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")               

 set (USED_TOOLKITS_BY_CURRENT_PROJECT)
 set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
@@ -173,19 +202,24 @@ set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
 # parce EXTERNLIB file
 FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
 foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
-  string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
-  if (NOT "${TK_FOUND}" STREQUAL "")
-    list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
-  else()
-    string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
-    if ("${CSF_FOUND}" STREQUAL "")
-      message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
-    else() # get CSF_ value
-      set (CURRENT_CSF ${${USED_ITEM}})
-      if (NOT "${CURRENT_CSF}" STREQUAL "")
-        # prepare a list from a string with whitespaces
-        separate_arguments (CURRENT_CSF)
-        list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
+  string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
+  if (NOT COMMENT_FOUND)
+    string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
+    string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
+    
+    if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
+      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
+    else()
+      string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
+      if ("${CSF_FOUND}" STREQUAL "")
+        message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
+      else() # get CSF_ value
+        set (CURRENT_CSF ${${USED_ITEM}})
+        if (NOT "${CURRENT_CSF}" STREQUAL "")
+          # prepare a list from a string with whitespaces
+          separate_arguments (CURRENT_CSF)
+          list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
+        endif()
      endif()
    endif()
  endif()
@@ -196,7 +230,7 @@ if (APPLE)
  if (NOT ${IS_X11_FOUND} EQUAL -1)
    find_package (X11 COMPONENTS X11 Xext Xmu Xi)
    if (NOT X11_FOUND)
-      message (STATUS "Warning. X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
+      message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
    endif()
  endif()
 endif()
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -236,30 +236,40 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_NAME)
    OCCT_MAKE_COMPILER_SHORT_NAME()

    if (WIN32)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+      if (DEFINED INSTALL_BIN_DIR)
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL} DESTINATION "${INSTALL_BIN_DIR}")
+      else()
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+      endif()
    else()
      get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)

-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
+      if (DEFINED INSTALL_LIB_DIR)
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
+                 DESTINATION "${INSTALL_LIB_DIR}"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+      else()
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+      endif()
    endif()
  endif()
  mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY 3RDPARTY_${PRODUCT_NAME}_DLL)
--- a/adm/cmake/tcl.cmake
+++ b/adm/cmake/tcl.cmake
@@ -203,32 +203,47 @@ if (INSTALL_TCL)

    # collect and install all dlls from tcl dll dirs
    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
-    install (FILES ${TCL_DLLS}
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-    install (FILES ${TCL_DLLS}
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-    install (FILES ${TCL_DLLS}
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+
+    if (DEFINED INSTALL_BIN_DIR)
+      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_BIN_DIR}")
+    else()
+      install (FILES ${TCL_DLLS}
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+      install (FILES ${TCL_DLLS}
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+      install (FILES ${TCL_DLLS}
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    endif()
  else()
    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
-    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+
+    if (DEFINED INSTALL_LIB_DIR)
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_LIB_DIR}")
+    else()
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+    endif()
  endif()

  if (TCL_TCLSH_VERSION)
    # tcl is required to install in lib folder (without)
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    if (DEFINED INSTALL_LIB_DIR)
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_LIB_DIR}")
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_LIB_DIR}")
+    else()
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    endif()
  else()
    message (STATUS "\nWarning: tclX.X subdir won't be copyied during the installation process.")
    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
@@ -255,7 +270,7 @@ if (TK_FOUND AND 3RDPARTY_TCL_DIR)

  if (${THE_SAME_FOLDER} EQUAL 0)
    set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
-    message (STATUS "Info. TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
+    message (STATUS "Info: TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
  endif()
 endif()

--- a/adm/cmake/tk.cmake
+++ b/adm/cmake/tk.cmake
@@ -207,31 +207,45 @@ if (INSTALL_TK)

    # collect and install all dlls from tk dll dirs
    file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
-    install (FILES ${TK_DLLS}
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-    install (FILES ${TK_DLLS}
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-    install (FILES ${TK_DLLS}
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+
+    if (DEFINED INSTALL_BIN_DIR)
+      install (FILES ${TK_DLLS} DESTINATION "${INSTALL_BIN_DIR}")
+    else()
+      install (FILES ${TK_DLLS}
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+      install (FILES ${TK_DLLS}
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+      install (FILES ${TK_DLLS}
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    endif()
  else()
    get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
-    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+
+    if (DEFINED INSTALL_LIB_DIR)
+      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_LIB_DIR}")
+    else()
+      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+    endif()
  endif()

  if (TCL_TCLSH_VERSION)
    # tk is required to install in lib folder (without)
-    install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    if (DEFINED INSTALL_LIB_DIR)
+      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_LIB_DIR}")
+    else()
+      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    endif()
  else()
    message (STATUS "\nWarning: tkX.X subdir won't be copyied during the installation process.")
    message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -1,7 +1,7 @@
 # variable description

 # 
-set (APPLY_OCCT_PATCH_DIR_DESCR 
+set (BUILD_PATCH_DESCR 
 "Points to the directory recognized as a 'patch' for OCCT. If specified,
 the files from this directory take precedence over the corresponding native
 OCCT sources. This way you are able to introduce patches to Open CASCADE
@@ -13,19 +13,19 @@ set (BUILD_LIBRARY_TYPE_DESCR
 are linked dynamically and loaded at runtime. 'Static' libraries
 are archives of object files for use when linking other targets")

-set (REBUILD_PLATFORM_DEPENDENT_CODE_DESCR 
+set (BUILD_YACCLEX_DESCR 
 "Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
 ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
 leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")

-set (OCCT_ALGO_EXTENDED_OUTPUT_DESCR
+set (BUILD_WITH_DEBUG_DESCR
 "Enables extended messages of many OCCT algorithms, usually printed to cout. 
 These include messages on internal errors and special cases encountered, timing etc")

 # install variables
 set (INSTALL_DIR_DESCR 
-"The place where built OCCT libraries, headers, test cases (INSTALL_OCCT_TEST_CASES variable),
-samples (INSTALL_OCCT_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
+"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
+samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
 other similar variables) will be placed during the installation process (building INSTALL project)")

 macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
@@ -34,8 +34,8 @@ set (${INSTALL_TARGET_VARIABLE}_DESCR
 project) into the installation directory (INSTALL_DIR variable)")
 endmacro()

-INSTALL_MESSAGE (INSTALL_OCCT_SAMPLES     "OCCT samples")
-INSTALL_MESSAGE (INSTALL_OCCT_TEST_CASES  "non-regression OCCT test scripts")
+INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
+INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
 INSTALL_MESSAGE (INSTALL_DOC_OcctOverview "OCCT overview documentation (HTML format)")
 INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
 INSTALL_MESSAGE (INSTALL_FREEIMAGEPLUS    "FreeImagePlus binaries")
--- a/adm/cmake/vtk.cmake
+++ b/adm/cmake/vtk.cmake
@@ -9,21 +9,6 @@ if (NOT DEFINED 3RDPARTY_VTK_DIR)
  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
 endif()

-set (3RDPARTY_VTK_REQUIRED_LIBRARIES vtkCommonCore
-                                     vtkCommonDataModel
-                                     vtkCommonExecutionModel
-                                     vtkCommonMath
-                                     vtkCommonTransforms
-                                     vtkRenderingCore
-                                     vtkRenderingFreeType
-                                     vtkRenderingFreeTypeOpenGL
-                                     vtkRenderingOpenGL
-                                     vtkFiltersGeneral
-                                     vtkIOCore
-                                     vtkIOImage
-                                     vtkImagingCore
-                                     vtkInteractionStyle)
-
 # include occt macros. compiler_bitness, os_wiht_bit, compiler
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

@@ -82,37 +67,35 @@ if (VTK_FOUND)
  # add compiler flags, preprocessor definitions, include and link dirs
  include (${VTK_USE_FILE})

-  set (ALL_REQUIRED_VTK_LIBRARIES_FOUND ON)
  if (VTK_LIBRARIES)

    set (3RDPARTY_VTK_INCLUDE_DIRS)
    set (3RDPARTY_VTK_LIBRARY_DIRS)
    set (3RDPARTY_VTK_DLL_DIRS)

-    foreach (VTK_REQUIRED_LIBRARY ${3RDPARTY_VTK_REQUIRED_LIBRARIES})
-      list (FIND VTK_LIBRARIES ${VTK_REQUIRED_LIBRARY} FOUND_INDEX)
-      if (${FOUND_INDEX} EQUAL -1)
-        message (WARNING "VTK: required ${VTK_REQUIRED_LIBRARY} library is not found")
-        set (ALL_REQUIRED_VTK_LIBRARIES_FOUND OFF)
-      else()
+    set (HARDCODED_D3D9_LIB "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib/x64/d3d9.lib")
+
+    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
+      string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
+      if (IS_VTK_LIBRARY)
        # get paths from corresponding variables
-        if (${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS}")
-          list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS}")
+        if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+          list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
        endif()

-        if (${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS}")
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS}")
+        if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
        endif()

-        if (${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-          list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+          list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
          if (NOT WIN32)
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
          endif()
        endif()

        # get paths from corresponding properties
-        get_property (TARGET_VTK_IMPORT_CONFS TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_CONFIGURATIONS)
+        get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)

        if (TARGET_VTK_IMPORT_CONFS)
          list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
@@ -123,13 +106,24 @@ if (VTK_FOUND)
          #  endforeach()
          #endif()

-          get_property (TARGET_PROPERTY_IMP_PATH TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+          get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+          if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+            list (FIND TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES "${HARDCODED_D3D9_LIB}" D3D9_INDEX)
+            if (NOT D3D9_INDEX EQUAL -1)
+              message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from ${VTK_LIBRARY}")
+              
+              list (REMOVE_AT TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${D3D9_INDEX})
+              set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+            endif()            
+          endif()
+
+          get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
          if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
            get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
          endif()

-          get_property (TARGET_PROPERTY_LOCATION_PATH TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+          get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
          if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
            get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)

@@ -141,38 +135,32 @@ if (VTK_FOUND)
          endif()
        endif()
      endif()
-      
    endforeach()
-  else()  
-    set (ALL_REQUIRED_VTK_LIBRARIES_FOUND OFF)
  endif()

-  if (ALL_REQUIRED_VTK_LIBRARIES_FOUND)
+  if (3RDPARTY_VTK_INCLUDE_DIRS)
+    list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
+    list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})

-    if (3RDPARTY_VTK_INCLUDE_DIRS)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
-      list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
+    list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
+    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
+  endif()

-      list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
-      set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
-    endif()
+  if (3RDPARTY_VTK_LIBRARY_DIRS)
+    list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
+    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})

-    if (3RDPARTY_VTK_LIBRARY_DIRS)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
+    list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
+    set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
+  endif()

-      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
-      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
-    endif()
+  if (WIN32)
+    if (3RDPARTY_VTK_DLL_DIRS)
+      list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
+      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})

-    if (WIN32)
-      if (3RDPARTY_VTK_DLL_DIRS)
-        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
-        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
-
-        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
-        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
-      endif()
+      list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
    endif()
  endif()
 endif()
@@ -204,4 +192,6 @@ else()
  set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
 endif()

-mark_as_advanced (VTK_INCLUDE_DIRS VTK_LIBRARY_DIRS VTK_DIR)
+OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
+OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
+OCCT_CHECK_AND_UNSET (VTK_DIR)
--- a/adm/genconf.tcl
+++ b/adm/genconf.tcl
@@ -27,8 +27,12 @@ source [file join [file dirname [info script]] genconfdeps.tcl]
 package require Tk

 set aRowIter 0
+set aCheckRowIter 0
 frame .myFrame -padx 5 -pady 5
 pack  .myFrame -fill both -expand 1
+frame .myFrame.myVsFrame
+frame .myFrame.myHxxChecks
+frame .myFrame.myChecks

 set SYS_VS_LIST {}
 set SYS_VC_LIST {}
@@ -86,8 +90,8 @@ proc wokdep:gui:Close {} {
 }

 proc wokdep:gui:SwitchConfig {} {
-  set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsCombo current]]
-  set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsCombo current]]
+  set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsFrame.myVsCombo current]]
+  set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]

  set ::CSF_OPT_INC {}
  set ::CSF_OPT_LIB32 {}
@@ -359,38 +363,38 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
 }

 # Header
-ttk::label    .myFrame.myVsLbl       -text "Visual Studio configuration" -relief solid -padding {5 5 80 5}
-ttk::combobox .myFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 30
-ttk::combobox .myFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
+ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration" -relief solid -padding {5 5 80 5}
+ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 30
+ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
 entry         .myFrame.myVcEntry     -textvariable VCVER  -width 6
 entry         .myFrame.myVcVarsEntry -textvariable VCVARS -width 70
 ttk::button   .myFrame.myVcBrowseBtn -text "Browse" -command wokdep:gui:BrowseVcVars

 #
-ttk::label    .myFrame.myOcctBuildLbl -text "OCCT headers configuration" -relief solid -padding {5 5 80 5}
-checkbutton   .myFrame.myScutsCheck   -offvalue "false" -onvalue "true" -variable SHORTCUT_HEADERS
-ttk::label    .myFrame.myScutsLbl     -text "Short-cut headers instead original ones in inc"
+ttk::label    .myFrame.myHxxChecks.myOcctBuildLbl -text "OCCT headers configuration" -relief solid -padding {5 5 80 5}
+checkbutton   .myFrame.myHxxChecks.myScutsCheck   -offvalue "false" -onvalue "true" -variable SHORTCUT_HEADERS
+ttk::label    .myFrame.myHxxChecks.myScutsLbl     -text "Short-cut headers instead original ones in inc"

 #
 ttk::label    .myFrame.mySrchLbl       -text "3rd-parties search path" -relief solid -padding {5 5 80 5}
 entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH -width 80
 ttk::button   .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
-checkbutton   .myFrame.myFImageCheck   -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myFImageLbl     -text "Use FreeImage"
-checkbutton   .myFrame.myGl2psCheck    -offvalue "false" -onvalue "true" -variable HAVE_GL2PS     -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myGl2psLbl      -text "Use GL2PS"
-checkbutton   .myFrame.myTbbCheck      -offvalue "false" -onvalue "true" -variable HAVE_TBB       -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myTbbLbl        -text "Use Intel TBB"
-checkbutton   .myFrame.myOpenClCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENCL    -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myOpenClLbl     -text "Use OpenCL"
-checkbutton   .myFrame.myMacGLXCheck   -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
-ttk::label    .myFrame.myMacGLXLbl     -text "Use X11 for windows drawing"
-ttk::label    .myFrame.myVtkLbl        -text "Use VTK"
-checkbutton   .myFrame.myVtkCheck      -offvalue "false" -onvalue "true" -variable HAVE_VTK       -command wokdep:gui:UpdateList
-checkbutton   .myFrame.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myQt4Lbl        -text "Search Qt4"
-checkbutton   .myFrame.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myJDKLbl        -text "Search JDK"
+checkbutton   .myFrame.myChecks.myFImageCheck   -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myFImageLbl     -text "Use FreeImage"
+checkbutton   .myFrame.myChecks.myGl2psCheck    -offvalue "false" -onvalue "true" -variable HAVE_GL2PS     -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myGl2psLbl      -text "Use GL2PS"
+checkbutton   .myFrame.myChecks.myTbbCheck      -offvalue "false" -onvalue "true" -variable HAVE_TBB       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myTbbLbl        -text "Use Intel TBB"
+checkbutton   .myFrame.myChecks.myOpenClCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENCL    -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myOpenClLbl     -text "Use OpenCL"
+checkbutton   .myFrame.myChecks.myMacGLXCheck   -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
+ttk::label    .myFrame.myChecks.myMacGLXLbl     -text "Use X11 for windows drawing"
+ttk::label    .myFrame.myChecks.myVtkLbl        -text "Use VTK"
+checkbutton   .myFrame.myChecks.myVtkCheck      -offvalue "false" -onvalue "true" -variable HAVE_VTK       -command wokdep:gui:UpdateList
+checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
+checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myJDKLbl        -text "Search JDK"

 # Additional headers search paths
 ttk::label    .myFrame.myIncLbl    -text "Additional headers search paths" -relief solid -padding {5 5 80 5}
@@ -449,10 +453,10 @@ ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close
 # Create grid
 # Header
 if { "$tcl_platform(platform)" == "windows" } {
-  grid .myFrame.myVsLbl       -row $aRowIter -column 0 -columnspan 10 -sticky w
-  incr aRowIter
-  grid .myFrame.myVsCombo     -row $aRowIter -column 0 -columnspan 2 -sticky w
-  grid .myFrame.myArchCombo   -row $aRowIter -column 2 -sticky w
+  grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
+  grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
+  grid .myFrame.myVsFrame.myVsCombo     -row 0 -column 1 -padx 5
+  grid .myFrame.myVsFrame.myArchCombo   -row 0 -column 2
  incr aRowIter
  grid .myFrame.myVcEntry     -row $aRowIter -column 0
  grid .myFrame.myVcVarsEntry -row $aRowIter -column 1 -columnspan 4 -sticky w
@@ -461,10 +465,10 @@ if { "$tcl_platform(platform)" == "windows" } {
 }

 #
-grid .myFrame.myOcctBuildLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
-incr aRowIter
-grid .myFrame.myScutsCheck   -row $aRowIter -column 0 -sticky e
-grid .myFrame.myScutsLbl     -row $aRowIter -column 1 -columnspan 2 -sticky w
+grid .myFrame.myHxxChecks -row $aRowIter -column 0 -columnspan 10 -sticky w
+grid .myFrame.myHxxChecks.myOcctBuildLbl -row 0 -column 0
+grid .myFrame.myHxxChecks.myScutsCheck   -row 0 -column 1
+grid .myFrame.myHxxChecks.myScutsLbl     -row 0 -column 2
 incr aRowIter
 #
 grid .myFrame.mySrchLbl       -row $aRowIter -column 0 -columnspan 10 -sticky w
@@ -472,29 +476,29 @@ incr aRowIter
 grid .myFrame.mySrchEntry     -row $aRowIter -column 0 -columnspan 5
 grid .myFrame.mySrchBrowseBtn -row $aRowIter -column 6
 incr aRowIter
-grid .myFrame.myFImageCheck   -row $aRowIter -column 0 -sticky e
-grid .myFrame.myFImageLbl     -row $aRowIter -column 1 -sticky w
-grid .myFrame.myQt4Check      -row $aRowIter -column 2 -sticky e
-grid .myFrame.myQt4Lbl        -row $aRowIter -column 3 -sticky w
-incr aRowIter
-grid .myFrame.myGl2psCheck    -row $aRowIter -column 0 -sticky e
-grid .myFrame.myGl2psLbl      -row $aRowIter -column 1 -sticky w
-grid .myFrame.myJDKCheck      -row $aRowIter -column 2 -sticky e
-grid .myFrame.myJDKLbl        -row $aRowIter -column 3 -sticky w
-incr aRowIter
-grid .myFrame.myTbbCheck      -row $aRowIter -column 0 -sticky e
-grid .myFrame.myTbbLbl        -row $aRowIter -column 1 -sticky w
-incr aRowIter
-grid .myFrame.myOpenClCheck   -row $aRowIter -column 0 -sticky e
-grid .myFrame.myOpenClLbl     -row $aRowIter -column 1 -sticky w
-incr aRowIter
-grid .myFrame.myVtkCheck      -row $aRowIter -column 0 -sticky e
-grid .myFrame.myVtkLbl        -row $aRowIter -column 1 -sticky w
+
+grid .myFrame.myChecks        -row $aRowIter -column 0 -columnspan 10 -sticky w
 incr aRowIter
+grid .myFrame.myChecks.myFImageCheck   -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myFImageLbl     -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myTbbCheck      -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myTbbLbl        -row $aCheckRowIter -column 3 -sticky w
+grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 4 -sticky e
+grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 5 -sticky w
+#grid .myFrame.myChecks.myOpenClCheck   -row $aCheckRowIter -column 6 -sticky e
+#grid .myFrame.myChecks.myOpenClLbl     -row $aCheckRowIter -column 7 -sticky w
+incr aCheckRowIter
+grid .myFrame.myChecks.myGl2psCheck    -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myGl2psLbl      -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myVtkCheck      -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 4 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 5 -sticky w
+incr aCheckRowIter
 if { "$::tcl_platform(os)" == "Darwin" } {
-  grid .myFrame.myMacGLXCheck -row $aRowIter -column 0 -sticky e
-  grid .myFrame.myMacGLXLbl   -row $aRowIter -column 1 -sticky w
-  incr aRowIter
+  grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 0 -sticky e
+  grid .myFrame.myChecks.myMacGLXLbl   -row $aCheckRowIter -column 1 -sticky w
+  incr aCheckRowIter
 }

 # Additional headers search paths
@@ -528,10 +532,10 @@ grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
 grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2

 # Bind events
-bind .myFrame.myVsCombo <<ComboboxSelected>> {
+bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
  wokdep:gui:SwitchConfig
 }
-bind .myFrame.myArchCombo <<ComboboxSelected>> {
+bind .myFrame.myVsFrame.myArchCombo <<ComboboxSelected>> {
  wokdep:gui:SwitchArch
 }

--- a/adm/genconfdeps.tcl
+++ b/adm/genconfdeps.tcl
@@ -770,10 +770,10 @@ proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
      # We didn't find preferred binary path => search through inc path or among all available VTK directories
      if { "$aVtkBinPath" == "" } {
        # Try to find in lib path
-        set aPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aLibPath/bin"]
-        if { "$aPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aLibPath/bin"
-        } elseif { [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aLibPath/lib"] != "" } {
-          lappend ::CSF_OPT_BIN$anArchIter "$aLibPath/lib"
+        set aPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aVtkLibPath/bin"]
+        if { "$aPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aVtkLibPath/bin"
+        } elseif { [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aVtkLibPath/lib"] != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aVtkLibPath/lib"
        } else {
           lappend anErrBin$anArchIter "Error: 'vtkCommonCore-${aVtkVer}.dll' not found (VTK)"
           set isFound "false"
--- a/adm/gendoc.tcl
+++ b/adm/gendoc.tcl
@@ -731,7 +731,7 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod

    puts $doxyFile "DOTFILE_DIRS             = $outDir/html"
    puts $doxyFile "DOT_PATH                 = $graphvizPath"
-    puts $doxyFile "INCLUDE_PATH             = [OCCDoc_GetIncDir $productsPath]"
+    puts $doxyFile "INCLUDE_PATH             = [OCCDoc_GetSourceDir $productsPath]"
    
    # list of files to generate
    set mainpage [OCCDoc_MakeMainPage $outDir $outDir/$name.dox $modules $productsPath]
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -27,7 +27,11 @@
 source [file join [file dirname [info script]] genconfdeps.tcl]

 set path ""
+set THE_CASROOT ""
 set fBranch ""
+if { [info exists ::env(CASROOT)] } {
+  set THE_CASROOT "$::env(CASROOT)"
+}
 switch -exact -- "$tcl_platform(platform)" {
  "windows" {set targetStation "wnt"}
  "unix"    {set targetStation "lin"}
@@ -38,10 +42,9 @@ switch -exact -- "$tcl_platform(os)" {
 }

 proc _get_options { platform type branch } {
-  global path
  set res ""
-  if {[file exists "$path/adm/CMPLRS"]} {
-    set fd [open "$path/adm/CMPLRS" rb]
+  if {[file exists "$::THE_CASROOT/adm/CMPLRS"]} {
+    set fd [open "$::THE_CASROOT/adm/CMPLRS" rb]
    set opts [split [read $fd] "\n"]
    close $fd
    foreach line $opts {
@@ -56,16 +59,22 @@ proc _get_options { platform type branch } {
 }

 proc _get_type { name } {
-  global path
-  if {[file exists "$path/adm/UDLIST"]} {
-    set fd [open "$path/adm/UDLIST" rb]
-    set UDLIST [split [read $fd] "\n"]
+  set UDLIST {}
+  if {[file exists "$::path/adm/UDLIST"]} {
+    set fd [open "$::path/adm/UDLIST" rb]
+    set UDLIST [concat $UDLIST [split [read $fd] "\n"]]
    close $fd
-    foreach uitem $UDLIST {
-      set line [split $uitem]
-      if {[lindex $line 1] == "$name"} {
-        return [lindex $line 0]
-      }
+  }
+  if { "$::path/adm/UDLIST" != "$::THE_CASROOT/adm/UDLIST" && [file exists "$::THE_CASROOT/adm/UDLIST"] } {
+    set fd [open "$::THE_CASROOT/adm/UDLIST" rb]
+    set UDLIST [concat $UDLIST [split [read $fd] "\n"]]
+    close $fd
+  }
+
+  foreach uitem $UDLIST {
+    set line [split $uitem]
+    if {[lindex $line 1] == "$name"} {
+      return [lindex $line 0]
    }
  }
  return ""
@@ -103,9 +112,17 @@ proc _get_used_files { pk {inc true} {src true} } {
  return $lret
 }

+# return location of the path within src directory
+proc osutils:findSrcSubPath {theSubPath} {
+  if {[file exists "$::path/src/$theSubPath"]} {
+    return "$::path/src/$theSubPath"
+  }
+  return "$::THE_CASROOT/src/$theSubPath"
+}
+
 # Wrapper-function to generate VS project files
 proc genproj { args } {
-  global path targetStation
+  global path THE_CASROOT targetStation
  set aSupportedTargets { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "xcd" }
  set anArgs $args

@@ -200,15 +217,10 @@ proc genproj { args } {

  OS:MKPRC "$anAdmPath" "$anTarget" "$aLibType" "$aPlatform"

-  genprojbat "$anAdmPath" "$anTarget"
+  genprojbat "$anTarget"
 }

-proc genprojbat {thePath theIDE} {
-  global path
-  
-  set anOsIncPath "$path/src/OS"
-  set anOsRootPath "$path"
-
+proc genprojbat {theIDE} {
  set aTargetPlatform "lin"
  if { "$::tcl_platform(platform)" == "windows" } {
    set aTargetPlatform "wnt"
@@ -225,34 +237,31 @@ proc genprojbat {thePath theIDE} {
    set aTargetPlatformExt bat
  }

-  set aBox [file normalize "$thePath/.."]
-
  if {"$theIDE" != "cmake"} {
-    set anEnvTmplFile [open "$path/adm/templates/env.${aTargetPlatformExt}" "r"]
+    set anEnvTmplFile [open "$::THE_CASROOT/adm/templates/env.${aTargetPlatformExt}" "r"]
    set anEnvTmpl [read $anEnvTmplFile]
    close $anEnvTmplFile

    set aCasRoot ""
-    if { [file normalize "$anOsRootPath"] != "$aBox" } {
-      set aCasRoot [relativePath "$aBox" "$anOsRootPath"]
+    if { [file normalize "$::path"] != [file normalize "$::THE_CASROOT"] } {
+      set aCasRoot [relativePath "$::path" "$::THE_CASROOT"]
    }
-    set anOsIncPath [relativePath "$aBox" "$anOsRootPath"]

    regsub -all -- {__CASROOT__}   $anEnvTmpl "$aCasRoot" anEnvTmpl

-    set anEnvFile [open "$aBox/env.${aTargetPlatformExt}" "w"]
+    set anEnvFile [open "$::path/env.${aTargetPlatformExt}" "w"]
    puts $anEnvFile $anEnvTmpl
    close $anEnvFile

-    file copy -force -- "$path/adm/templates/draw.${aTargetPlatformExt}" "$aBox/draw.${aTargetPlatformExt}"
+    file copy -force -- "$::THE_CASROOT/adm/templates/draw.${aTargetPlatformExt}" "$::path/draw.${aTargetPlatformExt}"
  }

  if {[regexp {(vc)[0-9]*$} $theIDE] == 1} {
-    file copy -force -- "$path/adm/templates/msvc.bat" "$aBox/msvc.bat"
+    file copy -force -- "$::THE_CASROOT/adm/templates/msvc.bat" "$::path/msvc.bat"
  } else {
    switch -exact -- "$theIDE" {
-      "cbp"   { file copy -force -- "$path/adm/templates/codeblocks.sh" "$aBox/codeblocks.sh" }
-      "xcd"   { file copy -force -- "$path/adm/templates/xcode.sh"      "$aBox/xcode.sh" }
+      "cbp"   { file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.sh" "$::path/codeblocks.sh" }
+      "xcd"   { file copy -force -- "$::THE_CASROOT/adm/templates/xcode.sh"      "$::path/xcode.sh" }
    }
  }
 }
@@ -380,43 +389,39 @@ proc OS:MKVC { theOutDir {theModules {}} {theAllSolution ""} {theVcVer "vc8"} }
 }

 proc OS:init {{os {}}} {
-    global path
-    global env
-    global tcl_platform
-    
-    set askplat $os
-    if { "$os" == "" } {
-      set os $tcl_platform(os)
+  set askplat $os
+  set aModules {}
+  if { "$os" == "" } {
+    set os $::tcl_platform(os)
+  }
+
+  if [file exists "$::path/src/VAS/Products.tcl"] {
+    source "$::path/src/VAS/Products.tcl"
+    foreach aModuleIter [VAS:Products] {
+      set aFileTcl "$::path/src/VAS/${aModuleIter}.tcl"
+      if [file exists $aFileTcl] {
+        source $aFileTcl
+        lappend aModules $aModuleIter
+      } else {
+        puts stderr "Definition file for module $aModuleIter is not found in unit VAS"
+      }
    }
+    return $aModules
+  }

-    ;# Load list of OCCT modules and their definitions
-    source "$path/src/OS/Modules.tcl"
-    set Modules {}
-    foreach module [OS:Modules] {
-        set f "$path/src/OS/${module}.tcl"
-        if [file exists $f] {
-            source $f
-            lappend Modules $module
-        } else {
-            puts stderr "Definition file for module $module is not found in unit OS"
-        }
+  # Load list of OCCT modules and their definitions
+  source "$::path/src/OS/Modules.tcl"
+  foreach aModuleIter [OS:Modules] {
+    set aFileTcl "$::path/src/OS/${aModuleIter}.tcl"
+    if [file exists $aFileTcl] {
+      source $aFileTcl
+      lappend aModules $aModuleIter
+    } else {
+      puts stderr "Definition file for module $aModuleIter is not found in unit OS"
    }
+  }

-    # Load list of products and their definitions
-#    set Products [woklocate -p VAS:source:Products.tcl]
-    #if { "$Products" != "" } {
-	#source "$Products"
-	#foreach product [VAS:Products] {
-	    #set f [woklocate -p VAS:source:${product}.tcl]
-	    #if [file exists $f] {
-		#source $f
-	    #} else {
-		#puts stderr "Definition file for product $product is not found in unit VAS"
-	    #}
-	#}
-    #}
-
-    return $Modules
+  return $aModules
 }

 # topological sort. returns a list {  {a h} {b g} {c f} {c h} {d i}  } => { d a b c i g f h }
@@ -560,13 +565,14 @@ proc osutils:tk:close { ltk } {
  set recurse {}
  foreach dir $ltk {
    set ids [LibToLink $dir]
+#    puts "osutils:tk:close($ltk) ids='$ids'"
    set eated [osutils:tk:eatpk $ids]
    set result [concat $result $eated]
    set ids [LibToLink $dir]
    set result [concat $result $ids]

    foreach file $eated {
-      set kds "$path/src/$file/EXTERNLIB"
+      set kds [osutils:findSrcSubPath "$file/EXTERNLIB"]
      if { [osutils:tk:eatpk $kds] !=  {} } {
        lappend recurse $file
      }
@@ -598,7 +604,7 @@ proc LibToLink {theTKit} {
    return
  }
  set aToolkits {}
-  set anExtLibList [osutils:tk:eatpk "$path/src/$theTKit/EXTERNLIB"]
+  set anExtLibList [osutils:tk:eatpk [osutils:findSrcSubPath "$theTKit/EXTERNLIB"]]
  foreach anExtLib $anExtLibList {
    set aFullPath [LocateRecur $anExtLib]
    if { "$aFullPath" != "" && [_get_type $anExtLib] == "t" } {
@@ -610,8 +616,7 @@ proc LibToLink {theTKit} {
 # Search unit recursively

 proc LocateRecur {theName} {
-  global path
-  set theNamePath "$path/src/$theName"
+  set theNamePath [osutils:findSrcSubPath "$theName"]
  if {[file isdirectory $theNamePath]} {
    return $theNamePath
  }
@@ -677,11 +682,11 @@ proc osutils:collectinc {theModules theIncPath theTargetStation} {
  if { [info exists ::env(SHORTCUT_HEADERS)] && 
       $::env(SHORTCUT_HEADERS) == "true" } {
    # template preparation
-    if { ![file exists $aCasRoot/adm/templates/header.in] } {
-      puts "template file does not exist: $aCasRoot/adm/templates/header.in"
+    if { ![file exists $::THE_CASROOT/adm/templates/header.in] } {
+      puts "template file does not exist: $::THE_CASROOT/adm/templates/header.in"
      return
    }
-    set aHeaderTmpl [wokUtils:FILES:FileToString $aCasRoot/adm/templates/header.in]
+    set aHeaderTmpl [wokUtils:FILES:FileToString $::THE_CASROOT/adm/templates/header.in]

    # relative anIncPath in connection with aCasRoot/src
    set aFromBuildIncToSrcPath [relativePath "$anIncPath" "$aCasRoot/src"]
@@ -1023,9 +1028,7 @@ proc osutils:vcproj:readtemplate {theVcVer isexec} {
 }

 proc osutils:readtemplate {ext what} {
-  global env
-  global path
-  set loc "$path/adm/templates/template.$ext"
+  set loc "$::THE_CASROOT/adm/templates/template.$ext"
  return [wokUtils:FILES:FileToString $loc]
 }
 # Read a file in a string as is.
@@ -1051,7 +1054,6 @@ proc osutils:compilable { } {
 }

 proc osutils:commonUsedTK { theToolKit } {
-  global path
  set anUsedToolKits [list]
  set aDepToolkits [LibToLink $theToolKit]
  foreach tkx $aDepToolkits {
@@ -1423,8 +1425,7 @@ proc osutils:vcx1proj:filters { dir proj theFilesMap } {

 # Generate RC file content for ToolKit from template
 proc osutils:readtemplate:rc {theOutDir theToolKit} {
-  global path
-  set aLoc "$path/adm/templates/template_dll.rc"
+  set aLoc "$::THE_CASROOT/adm/templates/template_dll.rc"
  set aBody [wokUtils:FILES:FileToString $aLoc]
  regsub -all -- {__TKNAM__} $aBody $theToolKit aBody

@@ -1592,7 +1593,6 @@ proc osutils:tk:loadunit { loc map } {
 # Call unit filter on units name to accept or reject a unit
 # Tfiles lists for each unit the type of file that can be compiled.
 proc osutils:tk:files { tkloc  {l_compilable {} } {justail 1} {unitfilter {}} } {
-  global path
  set Tfiles(source,nocdlpack)     {source pubinclude}
  set Tfiles(source,toolkit)       {}
  set Tfiles(source,executable)    {source pubinclude}
@@ -1649,7 +1649,6 @@ proc osutils:tk:files { tkloc  {l_compilable {} } {justail 1} {unitfilter {}} }

 # Generate Visual Studio project file for executable
 proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} } } {
-  global path
  set aVcFiles {}
  foreach f [osutils:tk:files $theToolKit osutils:compilable 0] {
    if { $theProjTmpl == {} } {
@@ -1732,9 +1731,9 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {}
    if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
      # nothing
    } elseif { "$theVcVer" == "vc9" } {
-      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$path/adm/templates/vcproj.user.vc9x"]
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcproj.user.vc9x"]
    } else {
-      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$path/adm/templates/vcxproj.user.vc10x"]
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcxproj.user.vc10x"]
    }
    if { "$aCommonSettingsFileTmpl" != "" } {
      regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $theVcVer aCommonSettingsFileTmpl
@@ -2426,7 +2425,6 @@ proc OS:xcodeproj { theModules theOutDir theGuidsMap theLibType thePlatform} {

 # Generates dependencies section for Xcode project files.
 proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids theIsStatic} {
-  global path
  upvar $theGuidsMap         aGuidsMap
  upvar $theFileRefSection   aFileRefSection
  upvar $theDepsGuids        aDepsGuids
--- a/adm/templates/custom.install.sh.in
+++ b/adm/templates/custom.install.sh.in
@@ -1,7 +1,7 @@
 #!/bin/bash

-if [ "$COMPILER" == "@COMPILER@" ]; then
-  if [ "$ARCH" == "@COMPILER_BITNESS@" ]; then
+if [ "$1" == "@COMPILER@" ]; then
+  if [ "$2" == "@COMPILER_BITNESS@" ]; then
    export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
    export TK_DIR="@USED_3RDPARTY_TK_DIR@"
    export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
@@ -9,6 +9,32 @@ if [ "$COMPILER" == "@COMPILER@" ]; then
    export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIR@"
    export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
    export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
+
+    export BIN_PATH="@INSTALL_BIN_DIR@"
+    if [ "$BIN_PATH" != "" ]; then
+      export PATH="${BIN_PATH}:${PATH}"
+    fi
+
+    export LIB_PATH="@INSTALL_LIB_DIR@"
+    if [ "$LIB_PATH" != "" ]; then
+      if [ "$LD_LIBRARY_PATH" != "" ]; then
+        export LD_LIBRARY_PATH="${LIB_PATH}:${LD_LIBRARY_PATH}"
+      else
+        export LD_LIBRARY_PATH="${LIB_PATH}"
+      fi
+    fi
+    
+    export OCCT_RESOURCE_PATH="${CASROOT}/src"
+    if [ "@INSTALL_OCCT_RESOURCE_DIR@" != "" ]; then
+      export OCCT_RESOURCE_PATH="@INSTALL_OCCT_RESOURCE_DIR@"
+    fi
+
+    # required for set default testing environment
+    # and "Samples" window creation in DRAW
+    export OCCT_SHARE_PATH="${CASROOT}"
+    if [ "@INSTALL_SHARE_DIR@" != "" ]; then
+      export OCCT_SHARE_PATH="@INSTALL_SHARE_DIR@"
+    fi
  fi
 fi

--- a/adm/templates/draw.sh
+++ b/adm/templates/draw.sh
@@ -2,7 +2,7 @@

 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";

-source "${aScriptPath}/env.sh" "$1" "$2"
+source "${aScriptPath}/env.sh" "$1"

 echo 'Hint: use "pload ALL" command to load standard commands'
 DRAWEXE
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -9,11 +9,9 @@ rem   vc8 win32 Release

 set "SCRIPTROOT=%~dp0"
 set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
-set "CASROOT=__CASROOT__"
-if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
-if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"

 rem ----- Reset values to defaults -----
+set "CASROOT=__CASROOT__"
 set "CASDEB="
 set "VCVER=vc8"
 set "ARCH=32"
@@ -31,10 +29,16 @@ set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="

 rem ----- Load local settings -----
+if not ["%CASROOT%"] == [""] if exist "%CASROOT%\custom.bat" (
+  call "%CASROOT%\custom.bat" %1 %2 %3 %4 %5
+)
 if exist "%~dp0custom.bat" (
  call "%~dp0custom.bat" %1 %2 %3 %4 %5
 )

+if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
+if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
+
 rem ----- Read script arguments (override local settings) -----
 if not ["%1"]    == [""]      set "VCVER=%1"
 if not ["%2"]    == [""]      set "ARCH=%2"
--- a/adm/templates/env.install.bat.in
+++ b/adm/templates/env.install.bat.in
@@ -5,7 +5,7 @@ set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"

 set "VCVER=@COMPILER@"
 set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB=@BUILD_LETTER@"
+set "CASDEB=@CURRENT_BUILD_LETTER@"

 if not ["%1"]    == [""]      set "VCVER=%1"
 if not ["%2"]    == [""]      set "ARCH=%2"
--- a/adm/templates/env.install.sh.in
+++ b/adm/templates/env.install.sh.in
@@ -35,7 +35,7 @@ fi

 # ----- Set local settings -----
 if [ -e "${aScriptPath}/custom.sh" ]; then 
-  source "${aScriptPath}/custom.sh" "${COMPILER}" "${WOKSTATION}${ARCH}" "${CASDEB}"
+  source "${aScriptPath}/custom.sh" "${COMPILER}" "${ARCH}"
 fi

 THRDPARTY_PATH=""
@@ -76,15 +76,10 @@ if [ "$TK_DIR" != "$TCL_DIR" ]; then
  fi
 fi

-BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
-LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
-
-export PATH="${CASROOT}/${BIN_PATH}:${PATH}"
-
 if [ "$LD_LIBRARY_PATH" != "" ]; then
-  export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
 else
-  export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
 fi

 if [ "$WOKSTATION" == "mac" ]; then
@@ -99,34 +94,34 @@ fi
 export CSF_LANGUAGE=us
 export MMGT_CLEAR=1
 export CSF_EXCEPTION_PROMPT=1
-export CSF_SHMessage="${CASROOT}/src/SHMessage"
-export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
-export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
-export CSF_XSMessage="${CASROOT}/src/XSMessage"
-export CSF_TObjMessage="${CASROOT}/src/TObj"
-export CSF_StandardDefaults="${CASROOT}/src/StdResource"
-export CSF_PluginDefaults="${CASROOT}/src/StdResource"
-export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
-export CSF_TObjDefaults="${CASROOT}/src/StdResource"
-export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
-export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
-export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
-export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
-export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
-export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
+export CSF_SHMessage="${OCCT_RESOURCE_PATH}/SHMessage"
+export CSF_MDTVTexturesDirectory="${OCCT_RESOURCE_PATH}/Textures"
+export CSF_ShadersDirectory="${OCCT_RESOURCE_PATH}/Shaders"
+export CSF_XSMessage="${OCCT_RESOURCE_PATH}/XSMessage"
+export CSF_TObjMessage="${OCCT_RESOURCE_PATH}/TObj"
+export CSF_StandardDefaults="${OCCT_RESOURCE_PATH}/StdResource"
+export CSF_PluginDefaults="${OCCT_RESOURCE_PATH}/StdResource"
+export CSF_XCAFDefaults="${OCCT_RESOURCE_PATH}/StdResource"
+export CSF_TObjDefaults="${OCCT_RESOURCE_PATH}/StdResource"
+export CSF_StandardLiteDefaults="${OCCT_RESOURCE_PATH}/StdResource"
+export CSF_UnitsLexicon="${OCCT_RESOURCE_PATH}/UnitsAPI/Lexi_Expr.dat"
+export CSF_UnitsDefinition="${OCCT_RESOURCE_PATH}/UnitsAPI/Units.dat"
+export CSF_IGESDefaults="${OCCT_RESOURCE_PATH}/XSTEPResource"
+export CSF_STEPDefaults="${OCCT_RESOURCE_PATH}/XSTEPResource"
+export CSF_XmlOcafResource="${OCCT_RESOURCE_PATH}/XmlOcafResource"
+export CSF_MIGRATION_TYPES="${OCCT_RESOURCE_PATH}/StdResource/MigrationSheet.txt"

 # Draw Harness special stuff
-if [ -e "${CASROOT}/src/DrawResources" ]; then
-  export DRAWHOME="${CASROOT}/src/DrawResources"
-  export CSF_DrawPluginDefaults="${CASROOT}/src/DrawResources"
+if [ -e "${OCCT_RESOURCE_PATH}/DrawResources" ]; then
+  export DRAWHOME="${OCCT_RESOURCE_PATH}/DrawResources"
+  export CSF_DrawPluginDefaults="${OCCT_RESOURCE_PATH}/DrawResources"

-  if [ -e "${CASROOT}/src/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${CASROOT}/src/DrawResources/DrawDefault"
+  if [ -e "${OCCT_RESOURCE_PATH}/DrawResources/DrawDefault" ]; then
+    export DRAWDEFAULT="${OCCT_RESOURCE_PATH}/DrawResources/DrawDefault"
  fi
 fi

-if [ -e "${CASROOT}/src/DrawResourcesProducts" ]; then
-  export CSF_DrawPluginProductsDefaults="${CASROOT}/src/DrawResourcesProducts"
+if [ -e "${OCCT_RESOURCE_PATH}/DrawResourcesProducts" ]; then
+  export CSF_DrawPluginProductsDefaults="${OCCT_RESOURCE_PATH}/DrawResourcesProducts"
 fi

--- a/adm/templates/env.sh
+++ b/adm/templates/env.sh
@@ -3,16 +3,8 @@
 # go to the script directory
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";

-export CASROOT="__CASROOT__"
-
-if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then
-  export CASROOT="${aScriptPath}/${CASROOT}"
-fi
-if [ "${CASROOT}" == "" ]; then
-  export CASROOT="${aScriptPath}"
-fi
-
 # Reset values
+export CASROOT="__CASROOT__"
 export CASDEB=""
 export TARGET="";
 export HAVE_TBB="false";
@@ -28,8 +20,16 @@ export CSF_OPT_BIN32=""
 export CSF_OPT_BIN64=""

 # ----- Set local settings -----
+if [ "${CASROOT}" != "" ] && [ -e "${CASROOT}/custom.sh" ]; then source "${CASROOT}/custom.sh"; fi
 if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi

+if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then
+  export CASROOT="${aScriptPath}/${CASROOT}"
+fi
+if [ "${CASROOT}" == "" ]; then
+  export CASROOT="${aScriptPath}"
+fi
+
 # Read script arguments
 shopt -s nocasematch
 for i in $*
--- a/adm/templates/occt_toolkit.rc.in
+++ b/adm/templates/occt_toolkit.rc.in
@@ -0,0 +1,30 @@
+#include <windows.h>
+#include <Standard_Version.hxx>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+PRODUCTVERSION  OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#endif
+FILEOS          VOS_NT
+FILETYPE        VFT_DLL
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN BLOCK "040904E4" // Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4)
+    BEGIN
+      VALUE "FileDescription", "@PROJECT_NAME@ Toolkit\000"
+      VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
+      VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
+      VALUE "ProductName",     "@PROJECT_NAME@\000"
+      VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
+      VALUE "OfficialSite",    "www.opencascade.org\000"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 0x04E4
+  END
+END
--- a/adm/templates/template.vc10
+++ b/adm/templates/template.vc10
@@ -85,7 +85,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
    </ClCompile>
    <ResourceCompile>
@@ -107,6 +107,7 @@
      <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
@@ -128,7 +129,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -138,7 +139,7 @@
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
    </ClCompile>
@@ -173,7 +174,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -183,7 +184,7 @@
      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
    </ClCompile>
    <ResourceCompile>
@@ -195,6 +196,7 @@
      <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
@@ -216,7 +218,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -226,7 +228,7 @@
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
    </ClCompile>
--- a/adm/templates/template.vc10x
+++ b/adm/templates/template.vc10x
@@ -85,7 +85,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
    </ClCompile>
    <ResourceCompile>
@@ -106,6 +106,7 @@
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
@@ -127,7 +128,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -137,7 +138,7 @@
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
    </ClCompile>
@@ -171,7 +172,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -181,7 +182,7 @@
      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
    </ClCompile>
    <ResourceCompile>
@@ -192,6 +193,7 @@
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
@@ -213,7 +215,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -223,7 +225,7 @@
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
    </ClCompile>
--- a/adm/templates/template.vc8
+++ b/adm/templates/template.vc8
@@ -50,7 +50,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -62,7 +62,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__TKNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 				EnableEnhancedInstructionSet="2"
 			/>
 			<Tool
@@ -149,7 +148,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -163,7 +162,6 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996"
 				EnableEnhancedInstructionSet="2"
 			/>
 			<Tool
@@ -251,7 +249,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -263,7 +261,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__TKNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -350,7 +347,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -364,7 +361,6 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/adm/templates/template.vc8x
+++ b/adm/templates/template.vc8x
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__;"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -60,7 +60,6 @@
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
 				EnableEnhancedInstructionSet="2"
 			/>
 			<Tool
@@ -146,7 +145,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -157,7 +156,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 				EnableEnhancedInstructionSet="2"
 			/>
 			<Tool
@@ -242,7 +240,7 @@
 				AdditionalOptions="/favor:blend"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -253,7 +251,6 @@
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -340,7 +337,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -351,7 +348,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/adm/templates/template.vc9
+++ b/adm/templates/template.vc9
@@ -52,7 +52,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -65,7 +65,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__TKNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -150,7 +149,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -165,7 +164,6 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -248,7 +246,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -260,7 +258,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__TKNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -343,7 +340,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -357,7 +354,6 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/adm/templates/template.vc9x
+++ b/adm/templates/template.vc9x
@@ -52,7 +52,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -64,7 +64,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -144,7 +143,7 @@
 				AdditionalOptions="-MP"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -156,7 +155,6 @@
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -238,7 +236,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -249,7 +247,6 @@
 				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -330,7 +327,7 @@
 				AdditionalOptions="-MP -favor:blend"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -341,7 +338,6 @@
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/adm/upgrade.tcl
+++ b/adm/upgrade.tcl
@@ -502,7 +502,7 @@ proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
    # try to find existing macro IMPLEMENT_STANDARD_RTTIEXT and check that 
    # it is consistent
    foreach line $aFileContent {
-      if { [regexp {^\s*IMPLEMENT_STANDARD_RTTIEXT\s*\(\s*$class\s*,\s*([A-Za-z]+)\s*\)} $line res impl_base] } {
+      if { [regexp "^\\s*IMPLEMENT_STANDARD_RTTIEXT\\s*\\(\\s*$class\\s*,\\s*(\[A-Za-z0-9_\]+)\\s*\\)" $line res impl_base] } {
        # implementation is in place, just report warning if second argument
        # is different
        if { $base != $impl_base } {
@@ -592,13 +592,14 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \

    # find all instances of DEFINE_STANDARD_RTTI with single or two arguments
    set index 0
-    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI)\s*\(\s*([A-Za-z_0-9,\s]+)\s*\)}
+    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI)([_A-Z]+)?\s*\(\s*([A-Za-z_0-9,\s]+)\s*\)}
    while { [regexp -start $index -indices -lineanchor $pattern_rtti \
-                    $aProcessedFileContent location start clist] } {
+                    $aProcessedFileContent location start suffix clist] } {
      set index [lindex $location 1]

-      set start [eval string range \$aProcessedFileContent $start]
-      set clist [split [eval string range \$aProcessedFileContent $clist] ,]
+      set start  [eval string range \$aProcessedFileContent $start]
+      set suffix [eval string range \$aProcessedFileContent $suffix]
+      set clist  [split [eval string range \$aProcessedFileContent $clist] ,]

      if { [llength $clist] == 1 } {
        set class [string trim [lindex $clist 0]]
@@ -609,12 +610,8 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
              logwarn "macro DEFINE_STANDARD_RTTI is changed assuming it inherits $inherits($class), please check!"
            }
            set change_flag 1
-            # try to inject macro IMPLEMENT_STANDARD_RTTIEXT in the 
-            # corresponding source file (or check it already present),
-            # and depending on this, use either inline or out-of-line variant
-            set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $inherits($class) $theSourceExtensions]
            ReplaceSubString aProcessedFileContent $location \
-                             "${start}${rtti_suffix}($class,$inherits($class))" index
+                             "${start}EXT($class,$inherits($class))" index
          }
        } else {
          logwarn "Error in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file, cannot fix"
@@ -624,14 +621,16 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
        set base  [string trim [lindex $clist 1]]
        if { ! [info exists inherits($class)] } {
          logwarn "Warning in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file"
-        } elseif { $base != $inherits($class) } {
+        } elseif { $base != $inherits($class) && ! [info exists inherits($class,multiple)] } {
          logwarn "Warning in $aProcessedFile: Second argument in macro DEFINE_STANDARD_RTTI for class $class is $base while $class seems to inherit from $inherits($class)"
-          if { ! [info exists inherits($class,multiple)] } {
-            set base $inherits($class)
-          }
        }
-        if { ! $theCheckMode } {
+        # convert intermediate version of macro DEFINE_STANDARD_RTTI
+        # with two arguments to either _INLINE or EXT variant
+        if { ! $theCheckMode && "$suffix" == "" } {
          set change_flag 1
+          # try to inject macro IMPLEMENT_STANDARD_RTTIEXT in the 
+          # corresponding source file (or check it already present),
+          # and depending on this, use either inline or out-of-line variant
          set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $base $theSourceExtensions]
          ReplaceSubString aProcessedFileContent $location \
                           "${start}${rtti_suffix}($class,$base)" index
@@ -679,7 +678,7 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \

    # find all uses of macro STANDARD_TYPE and method DownCast and ensure that
    # argument class is explicitly included
-    set pattern_incbeg {\s*#\s*include\s*[\"<]\s*}
+    set pattern_incbeg {\s*#\s*include\s*[\"<]\s*([A-Za-z0-9_/]*/)?}
    set pattern_incend {[.][a-zA-Z]+\s*[\">]}
    set index 0
    set addtype {}
@@ -707,7 +706,9 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
      if { ! $theCheckMode } {
        set addinc ""
        foreach type $addtype {
-          append addinc "\n#include <$type.hxx>"
+          if { "$aProcessedFileName" != "$type.hxx" } {
+            append addinc "\n#include <$type.hxx>"
+          }
        }
        if { [regexp -indices ".*\n${pattern_incbeg}\[A-Za-z0-9_/\]+${pattern_incend}" $aProcessedFileContent location] } {
          set change_flag 1
@@ -734,6 +735,7 @@ proc ConvertHandle {theTargetPath theIncPaths theCheckMode theExtensions} {

  # iterate by header files
  foreach aHeader [glob -nocomplain -type f -directory $theTargetPath *.{$theExtensions}] {
+    set aCurrentHeaderName [file tail $aHeader]

    # skip gxx files, as names Handle_xxx used there are in most cases 
    # placeholders of the argument types substituted by #define
@@ -767,8 +769,9 @@ proc ConvertHandle {theTargetPath theIncPaths theCheckMode theExtensions} {
      set anUpdatedHeaderContent {}    
      set pattern_handle {\mHandle_([A-Za-z0-9_]+)}
      foreach line $aHeaderContent {
-        # do not touch #include and #if... statements
-        if { [regexp {\s*\#\s*include} $line] || [regexp {\s*\#\s*if} $line] } {
+        # do not touch typedefs, #include, and #if... statements
+        if { [regexp {^\s*typedef} $line] || 
+             [regexp {^\s*\#\s*include} $line] || [regexp {^\s*\#\s*if} $line] } {
          lappend anUpdatedHeaderContent $line
          continue
        }
@@ -848,8 +851,8 @@ proc ConvertHandle {theTargetPath theIncPaths theCheckMode theExtensions} {
        } else {
          # replace by forward declaration of a class or its include unless 
          # it is already declared or included
-          if { ! [regexp "^\s*\#\s*include\s*\[\<\"\]\s*$aForwardDeclHandledClass\s*\[\>\"\]" $aHeaderContent] } {
-            if { $isQObject } {
+          if { ! [regexp "\#\\s*include\\s*\[\<\"\]\\s*(\[A-Za-z0-9_/\]*/)?$aForwardDeclHandledClass\[.\]hxx\\s*\[\>\"\]" $aHeaderContent] } {
+            if { $isQObject && "$aCurrentHeaderName" != "${aForwardDeclHandledClass}.hxx" } {
              lappend anUpdatedHeaderContent "#include <${aForwardDeclHandledClass}.hxx>"
              if { ! [SearchForFile $theIncPaths ${aForwardDeclHandledClass}.hxx] } {
                loginfo "Warning: include ${aForwardDeclHandledClass}.hxx added in $aHeader, assuming it exists and defines Handle_$aForwardDeclHandledClass"
@@ -1031,7 +1034,10 @@ proc ConvertCStyleHandleCast {pkpath theExtensions theCheckMode} {
    while { [regexp -start $index -indices -lineanchor $pattern_refcast0 $hxx location class var] } {
      set index [lindex $location 1]

-      logwarn "Warning in $afile: C-style cast: [eval string range \$hxx $location]"
+      set var   [eval string range \$hxx $var]
+      if { "$var" != "const" && "$var" != "Standard_OVERRIDE" } {
+        logwarn "Warning in $afile: C-style cast: [eval string range \$hxx $location]"
+      }
    }

    # replace const Handle(A)& a = Handle(B)::DownCast (b); by 
@@ -1154,24 +1160,16 @@ proc ReadFileToList {theFilePath theFileContent theFileEOL} {
  set aFileContent [read $aFile]
  close $aFile

-  set aFileEOL "\r"
-  if [regexp "\r\n" $aFileContent] {
+  # detect DOS end-of-lines
+  if { [regexp "\r\n" $aFileContent] } {
    set aFileEOL "\r\n"
-  } elseif [regexp "\n" $aFileContent] {
+    set aList [split [regsub -all "\r\n" $aFileContent "\n"] "\r\n"]
+  } else {
+    # standard UNIX end-of-lines
    set aFileEOL "\n"
+    set aList [split $aFileContent "\n"]
  }

-  # convert to unix eol
-  if {"$aFileEOL" != "\n"} {
-    regsub -all {$aFileEOL} $aFileContent "\n" aFileContent
-  }
-
-  set aList [split $aFileContent "\n"]
-#  set aList {}
-#  foreach aLine [split $aFileContent "\n"] {
-#    lappend aList [string trimright $aLine]
-#  }
-
  return $aList
 }

--- a/adm/upgrade_sample_orig.dat
+++ b/adm/upgrade_sample_orig.dat
@@ -0,0 +1,67 @@
+// This is sample C++ file intended for testing and verifyig automatic upgrade 
+// script. Copy it with extension .cxx and apply upgrade procedure to see
+// the result, as follows:
+// > upgrade.bat -src=./adm -inc=./src -recurse -all
+
+// Include of Geom_Line.hxx and Geom_Plane.hxx should be added below
+#include <gp.hxx>
+
+//========================================================================
+// OCCT 7.0
+//========================================================================
+
+//------------------------------------------------------------------------
+// Option -rtti
+//------------------------------------------------------------------------
+
+// Should be replaced by <Standard_Type.hxx>
+#include <Standard_DefineHandle.hxx>
+
+class A_0
+{
+}
+
+class B_1 : 
+public A_0
+{
+  // second argument "A_0" should be added
+  DEFINE_STANDARD_RTTI(B_1)
+};
+
+class C_2 : public Standard_Transient, B_1
+{
+  // second argument "Standard_Transient" should be added
+  DEFINE_STANDARD_RTTI(C_2)
+};
+
+void for_rtti ()
+{
+  Handle(Geom_Curve) aCurve = new Geom_Line (gp::Origin(), gp::DZ());
+  Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast (aCurve);
+}
+
+// should be removed
+IMPLEMENT_DOWNCAST(A)
+IMPLEMENT_STANDARD_RTTIEXT(A, B)
+
+//------------------------------------------------------------------------
+// Option -fwd
+//------------------------------------------------------------------------
+
+// force safe mode used for Qt objects
+Q_OBJECT
+slots:
+
+// these includes should be recognized as corresponding to forward declarations 
+#include <occt/TColStd_HArray1OfReal.hxx>
+
+// these declarations should be just removed
+class Handle(TColStd_HArray1OfReal);
+
+// should be replaced by include of corresponding header
+class TColStd_Array1OfReal;
+class Handle(Geom_Curve);
+
+// check that trailing spaces at the following line are preserved
+void ff();       
+
--- a/dox/CMakeLists.txt
+++ b/dox/CMakeLists.txt
@@ -37,12 +37,10 @@ set (OCCT_CONFIG_FOR_DOXYGEN "${OCCT_GENERATED_DOC_DIR}/occt.cfg")

 set (3RDPARTY_MATHJAX_RELATIVE_PATH "http://cdn.mathjax.org/mathjax/latest")

-OCCT_VERSION (OCCT_SOURCE_VERSION)
-
 configure_file ("${OCCT_OVERVIEW_RESOURCE_DIR}/occt_ug_html.doxyfile" "${OCCT_CONFIG_FOR_DOXYGEN}" COPYONLY)

 # Add common options for generation of Overview and User Guides
-file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nPROJECT_NUMBER         = ${OCCT_SOURCE_VERSION}")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nPROJECT_NUMBER         = ${OCC_VERSION_STRING_EXT}")
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nOUTPUT_DIRECTORY       = ${OCCT_GENERATED_OVERVIEW_DIR}/.")
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nPROJECT_LOGO           = ${OCCT_OVERVIEW_DIR}/resources/occ_logo.png")

--- a/dox/FILES_HTML.txt
+++ b/dox/FILES_HTML.txt
@@ -32,9 +32,6 @@ user_guides/ocaf/ocaf.md
 user_guides/tobj/tobj.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/brep_wp/brep_wp.md
-user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md
-user_guides/ocaf_tree_wp/ocaf_tree_wp.md
-user_guides/ocaf_wp/ocaf_wp.md
 user_guides/vis/vis.md

 dev_guides/dev_guides.md
--- a/dox/FILES_PDF.txt
+++ b/dox/FILES_PDF.txt
@@ -12,9 +12,6 @@ user_guides/modeling_algos/modeling_algos.md
 user_guides/boolean_operations/boolean_operations.md
 user_guides/shape_healing/shape_healing.md
 user_guides/ocaf/ocaf.md
-user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md
-user_guides/ocaf_tree_wp/ocaf_tree_wp.md
-user_guides/ocaf_wp/ocaf_wp.md
 user_guides/step/step.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/tobj/tobj.md
--- a/dox/dev_guides/building/3rdparty/3rdparty_windows.md
+++ b/dox/dev_guides/building/3rdparty/3rdparty_windows.md
@@ -11,12 +11,12 @@ You need to use the same version of MS Visual Studio for building all third-part
 The links for downloading the third-party products are available on the web site of OPEN CASCADE SAS at http://www.opencascade.org/getocc/require/. There are two types of third-party products used  by OCCT: 

 * Mandatory  products: 
-	* Tcl/Tk 8.5 - 8.6;
-	* FreeType 2.4.10 - 2.5.3.
+	* Tcl/Tk 8.5 -- 8.6;
+	* FreeType 2.4.10 -- 2.5.3.
 * Optional  products:
-	* TBB 3.x - 4.x;
-	* gl2ps 1.3.5 - 1.3.8;
-	* FreeImage 3.14.1 -3.16.0;
+	* TBB 3.x -- 4.x;
+	* gl2ps 1.3.5 -- 1.3.8;
+	* FreeImage 3.14.1 -- 3.16.0;
 	* VTK 6.1.0.

 It is recommended to create a separate new folder on your workstation, where you will unpack the downloaded archives of the third-party  products, and where you will build these products (for example, *c:\\occ3rdparty*). 
@@ -168,9 +168,9 @@ You can download its sources from  http://geuz.org/gl2ps/src/.
   As a result, you will get a folder named, for example, *3rdparty\\gl2ps-1.3.5-source*. 

   Rename it into <i>gl2ps-platform-compiler-building mode</i>, where 
-   * **platform** is *win32*  or *win64*; 
-   * **compiler** is *vc8*, *vc9* or *vc10*; 
-   * **building mode** - *opt*  (for release) or *deb* (for debug). 
+   * **platform** -- *win32*  or *win64*; 
+   * **compiler** -- *vc8*, *vc9* or *vc10*; 
+   * **building mode** -- *opt*  (for release) or *deb* (for debug). 
   
   For example, <i>gl2ps-win64-vc10-deb</i>

@@ -208,7 +208,7 @@ You can download its sources from  http://geuz.org/gl2ps/src/.
     @image html /dev_guides/building/3rdparty/images/3rdparty_image004.png 
     @image latex /dev_guides/building/3rdparty/images/3rdparty_image004.png 

-   * Select the generator (the compiler  and the target platform - 32 or 64 bit) in the pop-up window. 
+   * Select the generator (the compiler  and the target platform -- 32 or 64 bit) in the pop-up window. 
   
     @image html /dev_guides/building/3rdparty/images/3rdparty_image005.png 
     @image latex /dev_guides/building/3rdparty/images/3rdparty_image005.png 
--- a/dox/dev_guides/building/android/android.md
+++ b/dox/dev_guides/building/android/android.md
@@ -35,7 +35,7 @@ Select "MinGW MakeFiles" item from the list
  - Click "Finish"
@figure{/dev_guides/building/android/images/android_image003.png}

-If ANDROID_NDK environment variable is not defined in current OS, add cache entry ANDROID_NDK (entry type is PATH) - path to the NDK folder ("Add Entry" button)
+If ANDROID_NDK environment variable is not defined in current OS, add cache entry ANDROID_NDK (entry type is PATH) -- path to the NDK folder ("Add Entry" button)
@figure{/dev_guides/building/android/images/android_image004.png}

 If on Windows the message is appeared: "CMake Error: CMake was unable to find a build program corresponding to "MinGW Makefiles"
--- a/dox/dev_guides/building/automake.md
+++ b/dox/dev_guides/building/automake.md
@@ -60,7 +60,7 @@ To prevent this, it is suggested to make links:
  Example:
   

-  \>  ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 -–with-vtk-include=/PRODUCTS/VTK-6.1.0/include/vtk-6.1 –with-vtk-library=/PRODUCTS/ /VTK-6.1.0//lib
+  \>  ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 --with-vtk-include=/PRODUCTS/VTK-6.1.0/include/vtk-6.1 -with-vtk-library=/PRODUCTS/ /VTK-6.1.0//lib


  3.If configure exits successfully, you can build OCCT with *make* command.
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@@ -3,7 +3,7 @@ Building with CMake {#occt_dev_guides__building_cmake}

@tableofcontents

-This article describes **CMake**-based build process which is now suggested as a standard way to produce the binaries of Open CASCADE Technology from sources. *OCCT requires CMake version 3.0 or later*.
+This article describes **CMake**-based build process which is now suggested as a standard way to produce the binaries of Open CASCADE Technology from sources. *OCCT requires CMake version 2.8.12 or later*.

 **Note**: Comparing to the previous (6.x) releases of Open CASCADE Technology, OCCT 7.0 comes with a complete set of CMake scripts and projects, so that there is no need to use WOK anymore. Moreover, CMake gives you a powerful configuration tool which allows to control many aspects of OCCT deployment. At the same time this tool is quite intuitive which is a significant advantage over the legacy WOK utilities.

@@ -35,7 +35,7 @@ The bare sources distribution contains not only the sources of Open CASCADE Tech

 Now it is time to run a CMake tool which will generate the actual project files for the target IDE (e.g., Visual Studio 2010 solution).

-It is recommended to use *cmake-gui* - cross-platform GUI tool provided by CMake on Windows, Mac and Linux. As a command-line alternative, *ccmake* also can be used.
+It is recommended to use *cmake-gui* -- cross-platform GUI tool provided by CMake on Windows, Mac and Linux. As a command-line alternative, *ccmake* also can be used.

 CMake deals with three directories: source, build or binary and install.

@@ -47,11 +47,11 @@ CMake deals with three directories: source, build or binary and install.

 **Note**: The good practice is not to mix up different build configurations in a single directory and not to use the source directory as a build one, for example:
      
-    d:/occt/                   - the source directory
-    d:/tmp/occt-build-vc10-x64 - the build directory with the generated
-                                 solution and other intermediate files created during a CMake tool working
-    d:/occt-install            - the installation directory that is
-                                 able to contain several OCCT configuratoion
+    d:/occt/                   -- the source directory
+    d:/tmp/occt-build-vc10-x64 -- the build directory with the generated
+                                  solution and other intermediate files created during a CMake tool working
+    d:/occt-install            -- the installation directory that is
+                                  able to contain several OCCT configuratoion

 ## Configuration process

@@ -93,22 +93,23 @@ The following table enumerates the full list of environment variables used at co
 | CMAKE_BUILD_TYPE | String | Specifies the build type on single-configuration generators (sush as make).  Possible values are Debug, Release and RelWithDebInfo |
 | USE_FREEIMAGE | Boolean flag | Indicates whether Freeimage product should be used in OCCT visualization module for support of popular graphics image formats (PNG, BMP etc) |
 | USE_GL2PS | Boolean flag | Indicates whether GL2PS product should be used in OCCT visualization module for support of vector image formats (PS, EPS etc) |
-| USE_TBB | Boolean flag | Indicates whether TBB 3-rd party is used or not. TBB stands for Threading Building Blocks, the technology of Intel Corp, which comes with different mechanisms and patterns for injecting parallelism into your application. OCCT remains parallel even without TBB product |
-| USE_VTK | Boolean flag | Indicates whether VTK 3-rd party is used or not. VTK stands for Visualization ToolKit, the technology of Kitware Inc intended for general-purpose scientific visualization. OCCT comes with a bridge between CAD data representation and VTK by means of its dedicated VIS component (VTK Integration Services). You may skip this 3-rd party unless you are planning to use VTK visualization for OCCT geometry. The official documentation @ref occt_user_guides__vis for the details on VIS |
-| 3RDPARTY_DIR | Path | Defines the root directory where all required 3-rd party products will be searched. Once you define this path it is very convenient to click "Configure" button in order to let CMake automatically detect all necessary products|
+| USE_TBB | Boolean flag | Indicates whether TBB 3rd party is used or not. TBB stands for Threading Building Blocks, the technology of Intel Corp, which comes with different mechanisms and patterns for injecting parallelism into your application. OCCT remains parallel even without TBB product |
+| USE_VTK | Boolean flag | Indicates whether VTK 3rd party is used or not. VTK stands for Visualization ToolKit, the technology of Kitware Inc intended for general-purpose scientific visualization. OCCT comes with a bridge between CAD data representation and VTK by means of its dedicated VIS component (VTK Integration Services). You may skip this 3rd party unless you are planning to use VTK visualization for OCCT geometry. The official documentation @ref occt_user_guides__vis for the details on VIS |
+| 3RDPARTY_DIR | Path | Defines the root directory where all required 3rd party products will be searched. Once you define this path it is very convenient to click "Configure" button in order to let CMake automatically detect all necessary products|
 | 3RDPARTY_FREETYPE_* | Path | Path to Freetype binaries |
 | 3RDPARTY_TCL_* 3RDPARTY_TK_* | Path | Path to Tcl/Tk binaries |
 | 3RDPARTY_FREEIMAGE* | Path | Path to Freeimage binaries |
 | 3RDPARTY_GL2PS_* | Path | Path to GL2PS binaries |
 | 3RDPARTY_TBB* | Path | Path to TBB binaries |
 | 3RDPARTY_VTK_* | Path | Path to VTK binaries |
-| BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref occt_user_guides |
+| BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref user_guides |
 | BUILD_LIBRARY_TYPE | String |  Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files for use when linking other targets |
 | BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\<MODULE\>* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically |
-| REBUILD_PLATFORM_DEPENDENT_CODE | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
+| BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
 | BUILD_MODULE_OcctMfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
 | BUILD_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this options leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command to generate the documentation in HTML format |
-| APPLY_OCCT_PATH_DIR | Boolean flag | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution |
+| BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution |
+| BUILD_WITH_DEBUG | Boolean flag | Enables extended messages of many OCCT algorithms, usually printed to cout. These include messages on internal errors and special cases encountered, timing etc |
 | CMAKE_CONFIGURATION_TYPES | String | Semicolon-separated CMake configurations |
 | INSTALL_DIR | Path | Points to the installation directory |
 | INSTALL_FREETYPE | Boolean flag | Indicates whether Freetype binaries should be installed into the installation directory |
@@ -117,24 +118,24 @@ The following table enumerates the full list of environment variables used at co
 | INSTALL_TBB | Boolean flag | Indicates whether TBB binaries should be installed into the installation directory |
 | INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
 | INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
-| INSTALL_OCCT_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
-| INSTALL_OCCT_SAMPLES | Boolean flag | Indicates whether OCCT samples should be installed into the installation directory |
+| INSTALL_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_SAMPLES | Boolean flag | Indicates whether OCCT samples should be installed into the installation directory |
 | INSTALL_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |

 **Note:** In those CMake options defining paths only the forward slashes ("/") are acceptable.

-### 3rd-party search mechanism (The variables with <i>3RDPARTY_</i> prefix)
+### 3rd party search mechanism (The variables with <i>3RDPARTY_</i> prefix)

-If *3RDPARTY_DIR* directory is defined, required 3rd-party binaries are sought in it, default system folders are ignored.
+If *3RDPARTY_DIR* directory is defined, required 3rd party binaries are sought in it, default system folders are ignored.

-The procedure expects to find binary and header files of each 3rd-party product in its own sub-directory: *bin*, *lib* and *include*.
+The procedure expects to find binary and header files of each 3rd party product in its own sub-directory: *bin*, *lib* and *include*.

 The result of the search (achived on the next pass of the configuration process) are recorded in the corresponding variables:

-* *3RDPARTY_\<PRODUCT\>_DIR* - path to the 3rdparty directory (with directory name) (e.g. <i>D:/3rdparty/tcltk-86-32</i>)
-* *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR* - path to directory containing a library (e.g. <i>D:/3rdparty/tcltk-86-32/lib</i>). 
-* *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* - path to the directory containing a header file (e.g., <i>D:/3rdparty/tcltk-86-32/include</i>)
-* *3RDPARTY_\<PRODUCT\>_DLL_DIR* - path to the directory containing a shared library (e.g., <i>D:/3rdparty/tcltk-86-32/bin</i>) This variable is only relevant to Windows platforms
+* *3RDPARTY_\<PRODUCT\>_DIR* -- path to the 3rdparty directory (with directory name) (e.g. <i>D:/3rdparty/tcltk-86-32</i>)
+* *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR* -- path to the directory containing a library (e.g. <i>D:/3rdparty/tcltk-86-32/lib</i>). 
+* *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* -- path to the directory containing a header file (e.g., <i>D:/3rdparty/tcltk-86-32/include</i>)
+* *3RDPARTY_\<PRODUCT\>_DLL_DIR* -- path to the directory containing a shared library (e.g., <i>D:/3rdparty/tcltk-86-32/bin</i>) This variable is only relevant to Windows platforms.

 Note: each library and include directory should be the children of product directory if the last one is defined.

@@ -192,14 +193,14 @@ Normally you use the installation directory of OCCT to link against your specifi

 the directory structure is follow:
    
-    data            - data files for OCCT (brep, iges, stp)
-    doc             - OCCT overview documentation in HTML format
-    inc             - header files
-    samples         - samples
-    src             - all required source files for OCCT
-    tests           - OCCT test suite
-    win32\vc10\bind - binary files (installed 3rdparties and occt)
-              \libd - libraries (installed 3rdparties and occt)
+    data            -- data files for OCCT (brep, iges, stp)
+    doc             -- OCCT overview documentation in HTML format
+    inc             -- header files
+    samples         -- samples
+    src             -- all required source files for OCCT
+    tests           -- OCCT test suite
+    win32\vc10\bind -- binary files (installed 3rdparties and occt)
+              \libd -- libraries (installed 3rdparties and occt)

 **Note:** The above example is given for debug configuration. However, it is generally safe to use the same installation directory for the release build. In the latter case the contents of install directory will be enriched with subdirectories and files related to the release configuration. In particular, the binaries directory win64 will be expanded as
 follows:
@@ -209,6 +210,6 @@ follows:
               \bin
               \lib

-If CMake installation flags are enabled for the 3-rd party products (e.g. INSTALL_FREETYPE), then the corresponding binaries will be copied to the same bin(d) and lib(d) directories together with the native binaries of OCCT. Such organization of libraries can be especially helpful if your OCCT-based software does not use itself the 3-rd parties of Open CASCADE Technology (thus, there is no sense to pack them into dedicated directories)
+If CMake installation flags are enabled for the 3rd party products (e.g. INSTALL_FREETYPE), then the corresponding binaries will be copied to the same bin(d) and lib(d) directories together with the native binaries of OCCT. Such organization of libraries can be especially helpful if your OCCT-based software does not use itself the 3rd parties of Open CASCADE Technology (thus, there is no sense to pack them into dedicated directories)

 The installation folder contains the scripts to run *DRAWEXE* (*draw.bat* or *draw.sh*), samples (if its were installed) and overview.html (short-cut for installed OCCT overview documentation).
--- a/dox/dev_guides/building/msvc.md
+++ b/dox/dev_guides/building/msvc.md
@@ -13,11 +13,11 @@ paragraph 1 of \ref occt_dev_guides__building for instructions.

 1. Edit file *custom.bat* to define the environment: 

-   - *VCVER* - version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), 
+   - *VCVER* -- version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), 
             and relevant *VCVARS* path
-   - *ARCH* - architecture (32 or 64), affects only *PATH* variable for execution
-   - <i>HAVE_*</i> - flags to enable or disable use of optional third-party products
-   - CSF_OPT_* - paths to search for includes and binaries of all used 
+   - *ARCH* -- architecture (32 or 64), affects only *PATH* variable for execution
+   - <i>HAVE_*</i> -- flags to enable or disable use of optional third-party products
+   - CSF_OPT_* -- paths to search for includes and binaries of all used 
                 third-party products

 2. Launch *msvc.bat* to start Visual Studio with all necessary environment 
--- a/dox/dev_guides/building/wok/wok.md
+++ b/dox/dev_guides/building/wok/wok.md
@@ -3,9 +3,9 @@ Using WOK {#occt_dev_guides__building_wok}

@tableofcontents

-\ref occt_dev_guides__wok "WOK" is a legacy build environment for Open CASCADE Technology. 
+WOK is a legacy build environment for Open CASCADE Technology. 
 It is required for generation of header files for classes defined with 
-@ref occt_dev_guides__cdl "CDL" ("Cascade Definition Language"). 
+CDL ("Cascade Definition Language"). 
 Also tools for generation of project files for other build systems, and OCCT 
 documentation, are integrated to WOK.

@@ -105,7 +105,7 @@ and third-party components required for building OCCT.

  Note that <i>$CASROOT</i> is equal to *D:/occt* now.

-  Then you can work with this workbench using normal WOK functionality (*wprocess, umake*, etc.; see @ref occt_dev_guides__wok "WOK User's Guide" for details) or use it only for generation of derived sources and project files, and build OCCT with Visual Studio on Windows or *make* command on Linux, as described below.
+  Then you can work with this workbench using normal WOK functionality (*wprocess, umake*, etc.) or use it only for generation of derived sources and project files, and build OCCT with Visual Studio on Windows or *make* command on Linux, as described below.
  
@section wok3 Generation of building projects

@@ -115,14 +115,14 @@ and third-party components required for building OCCT.
  LOC:dev:occt> wgenproj [ -target=<TARGET> ] [ -no_wprocess ]
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 TARGET:
-  * *vc8* - Visual Studio 2005;
-  * *vc9* - Visual Studio 2008;
-  * *vc10* - Visual Studio 2010;
-  * *vc11* - Visual Studio 2012;
-  * *cbp* - CodeBlocks;
-  * *cmake* - CMake;
-  * *amk* - AutoMake;
-  * *xcd* - Xcode;
+  * *vc8* -- Visual Studio 2005;
+  * *vc9* -- Visual Studio 2008;
+  * *vc10* -- Visual Studio 2010;
+  * *vc11* -- Visual Studio 2012;
+  * *cbp* -- CodeBlocks;
+  * *cmake* -- CMake;
+  * *amk* -- AutoMake;
+  * *xcd* -- Xcode;
  * <i>-no_wprocess</i> option skips generation of derived headers and source files.

 Note that this command takes several minutes to complete at the first call. 
@@ -135,14 +135,14 @@ To regenerate derived headers and source files without regeneration of projects
  LOC:dev:occt> wprocess -DGroups=Src,Xcpp
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The generated building project has been placed into <i>$CASROOT/adm</i> folder:
-  * for vc8 - <i>$CASROOT/adm/msvc/vc8</i>;
-  * for vc9 - <i>$CASROOT/adm/msvc/vc9</i>;
-  * for vc10 - <i>$CASROOT/adm/msvc/vc10</i>;
-  * for vc11 - <i>$CASROOT/adm/msvc/vc11</i>;
-  * for cbp - <i>$CASROOT/adm/\<OS\>/cbp</i>;
-  * for cmake - <i>$CASROOT/adm/cmake</i>;
-  * for amk - <i>$CASROOT/adm/lin/amk</i>;
-  * xcd - <i>$CASROOT/adm/\<OS\>/xcd</i>
+  * for vc8 -- <i>$CASROOT/adm/msvc/vc8</i>;
+  * for vc9 -- <i>$CASROOT/adm/msvc/vc9</i>;
+  * for vc10 -- <i>$CASROOT/adm/msvc/vc10</i>;
+  * for vc11 -- <i>$CASROOT/adm/msvc/vc11</i>;
+  * for cbp -- <i>$CASROOT/adm/\<OS\>/cbp</i>;
+  * for cmake -- <i>$CASROOT/adm/cmake</i>;
+  * for amk -- <i>$CASROOT/adm/lin/amk</i>;
+  * xcd -- <i>$CASROOT/adm/\<OS\>/xcd</i>

@section wok4  Generation of documentation

@@ -152,11 +152,11 @@ The generated building project has been placed into <i>$CASROOT/adm</i> folder:
  :LOC:dev:occt> wgendoc 
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The following options can be used: 
-  * <i>-wb=\<workbench name\></i>  the name of OCCT workbench (the current one by default);
-  * <i>-m=\<list of modules\></i> the list of modules that will be contained in the documentation;
-  * <i>-outdir=\<path\></i> the output directory for the documentation;
-  * <i>-chm</i>  the option to generate CHM file;
-  * <i>-hhc=\<path\></i> the path to HTML Help Compiler *hhc.exe* or equivalent;
-  * <i>-qthelp=\<path\></i> the option to generate Qt Help file, where <i>\<path\></i> is the required path to *qthelpgenerator* executable;
-  * <i>-doxygen=\<path\></i> the path to Doxygen executable;
-  * <i>-dot=\<path\></i> the path to GraphViz dot executable.
+  * <i>-wb=\<workbench name\></i> -- the name of OCCT workbench (the current one by default);
+  * <i>-m=\<list of modules\></i> -- the list of modules that will be contained in the documentation;
+  * <i>-outdir=\<path\></i> -- the output directory for the documentation;
+  * <i>-chm</i> -- the option to generate CHM file;
+  * <i>-hhc=\<path\></i> -- the path to HTML Help Compiler *hhc.exe* or equivalent;
+  * <i>-qthelp=\<path\></i> -- the option to generate Qt Help file, where <i>\<path\></i> is the required path to *qthelpgenerator* executable;
+  * <i>-doxygen=\<path\></i> -- the path to Doxygen executable;
+  * <i>-dot=\<path\></i> -- the path to GraphViz dot executable.
--- a/dox/dev_guides/contribution/coding_rules.md
+++ b/dox/dev_guides/contribution/coding_rules.md
@@ -67,10 +67,10 @@ Names of units should not contain underscores, unless the use of underscores is

 The following extensions should be used for source files, depending on their type:

-* <i>.cdl</i> - CDL declaration files
-* <i>.cxx</i> - C++ source files
-* <i>.hxx</i> - C++ header files
-* <i>.lxx</i> - headers with definitions of inline methods (CDL packages)
+* <i>.cdl</i> -- CDL declaration files
+* <i>.cxx</i> -- C++ source files
+* <i>.hxx</i> -- C++ header files
+* <i>.lxx</i> -- headers with definitions of inline methods (CDL packages)

 ### Prefix for toolkit names [MANDATORY]

@@ -452,7 +452,7 @@ The source code is one of the most important references for documentation.
 The comments in the source code should be complete enough to allow understanding the corresponding code and to serve as basis for other documents.

 The main reasons why the comments are regarded as documentation and should be maintained are:
- The comments are easy to reach - they are always together with the source code;
+- The comments are easy to reach -- they are always together with the source code;
 - It is easy to update a description in the comment when the source is modified;
 - The source by itself is a good context to describe various details that would require much more explanations in a separate document;
 - As a summary, this is the most cost-effective documentation.
@@ -486,7 +486,7 @@ They should be detailed enough to allow any person to understand what each part

 It is recommended to comment all static functions (like methods in headers), and to insert at least one comment per each 10-100 lines in the function body.

-There are also some rules that define how comments should be formatted, see <a href="#occt_coding_rules_3">Formatting Rules</a>.
+There are also some rules that define how comments should be formatted, see @ref occt_coding_rules_3 "Formatting Rules".

 Following these rules is important for good comprehension of the comments. Moreover, this approach  allows automatically generating user-oriented documentation directly from the commented sources.

@@ -950,7 +950,7 @@ Command should warn the user about unknown arguments, including cases when extra

 ### Message printing

-Informative messages should be printed into standard output *std::cout*, whilst command results (if any) - into Draw Interpreter.
+Informative messages should be printed into standard output *std::cout*, whilst command results (if any) -- into Draw Interpreter.

 Information printed into Draw Interpreter should be well-structured to allow usage in TCL script.

--- a/dox/dev_guides/contribution_workflow/contribution_workflow.md
+++ b/dox/dev_guides/contribution_workflow/contribution_workflow.md
@@ -2,282 +2,464 @@ Contribution Workflow {#occt_dev_guides__contribution_workflow}
 ====================================
@tableofcontents 

-@section occt_contribution_workflow_1 Introduction
+@section occt_contribution_intro Introduction

 The purpose of this document is to describe standard workflow for processing contributions to certified version of OCCT. 

-@subsection occt_contribution_workflow_1_1 Use of issue tracker system
+@subsection occt_contribution_intro_tracker Use of issue tracker system

 Each contribution should have corresponding issue (bug, or feature, or integration request) 
 registered in the MantisBT issue tracker system accessible by URL 
 http://tracker.dev.opencascade.org. 
-The issue is processed further according to the described workflow.
+The issue is processed according to the described workflow.

-@subsection occt_contribution_workflow_1_2 Access Levels 
+@subsection occt_contribution_intro_access Access levels

-  Access level defines the permissions of the user to view, 
-  register and modify issues in a Mantis bugtracker. 
-  The correspondence of access level and user permissions 
-  is defined in accordance with the table below.
+Access level defines the permissions of the user to view, register and modify issues in the issue tracker. 
+The correspondence of access level and user permissions is defined in the table below.

 | Access level  | Granted to       | Permissions       | Can set statuses         |
 |:------------- | :--------- | :-------------- | :----------------------- |
-| Viewer        | Everyone (anonymous access)   | View public issues only    | No     |
-| Reporter | Users registered on dev.opencascade.com  | View, report, and comment issues  | New, Resolved   |
-| Updater       | Users of dev.opencascade.com in publicly visible projects | View  and comment issues | New, Resolved  |
-| Developer     | OCC developers and external contributors who signed the CLA  | View, report, modify, and handle issues | New, Assigned, Resolved, Reviewed  |
-| Tester        | OCC engineer devoted to certification testing | View, report, modify, and handle issues | Assigned, Tested         |
-| Manager       | Person responsible for a project or OCCT component | View, report, modify, and handle issues | New, Resolved, Reviewed, Tested, Closed  |
+| Viewer        | Everyone (anonymous access)   | View public issues only    | None |
+| Updater       | Users registered on dev.opencascade.org, in Open CASCADE project | View  and comment issues | None |
+| Reporter      | Users registered on dev.opencascade.org, in Community project | View, report, and comment issues  | New, Resolved, Feedback |
+| Developer     | OCC developers and (in Community project) external contributors who signed the CLA | View, report, modify, and handle issues | New, Assigned, Resolved, Reviewed, Feedback |
+| Tester        | OCC engineer devoted to certification testing | View, report, modify, and handle issues | Assigned, Tested, Feedback |
+| Maintainer    | Person responsible for a project or OCCT component | View, report, modify, and handle issues | New, Resolved, Reviewed, Tested, Closed, Feedback |
+| Bugmaster     | Person responsible for Mantis issue tracker, integrations, certification, and releases | Full access | All statuses |

 According to his access level, the user can participate in the issue handling process under different roles, as described below.

-@section occt_contribution_workflow_2 Typical workflow for an issue
+@section occt_contribution_workflow Standard workflow for an issue

-@subsection occt_contribution_workflow_2_1 General scheme
+@subsection occt_contribution_workflow_general General scheme

-@image html OCCT_ContributionWorkflow_V3_image001.png "Standard life cycle of an issue"
-@image latex OCCT_ContributionWorkflow_V3_image001.png "Standard life cycle of an issue"
+<center>
+@image html OCCT_ContributionWorkflow_V3_image001.svg "Standard life cycle of an issue"
+@image latex OCCT_ContributionWorkflow_V3_image001.svg "Standard life cycle of an issue"
+</center>
  
-@subsection occt_contribution_workflow_2_2 Issue registration
+@subsection occt_contribution_workflow_issue Issue registration

-An issue is registered in Mantis bugtracker by the Reporter with definition of the necessary attributes. 
-The definition of the following attributes is obligatory:
+An issue is registered in Mantis bugtracker by the **Reporter** with definition of the necessary attributes (see also @ref occt_contribution_app):

-  * **Category** - indicates component of OCCT to which the issue relates. If in doubt, assign OCCT:Foundation Classes.
-  * **Reproducibility** 
-  * **Severity** 
-  * **Priority**
-  * **Profile** - allows defining the platform on which the problem was detected   from the list of predefined platforms. If a platform is absent in the list of predefined platforms it is possible to use Or Fill In option to define the platform manually.
-    * **Platform**
-    * **OS**
-    * **OS Version**
-  * **Products Version** - defines the version of Open CASCADE on which the problem has been detected.
-  * **Summary** - a short, one sentence description of the issue. It has a limit of 128 characters. It should be informative and useful for the developers. It is advisable to avoid vague or misleading phrases, such as "it doesn't work" or "it crashed". It is not allowed to mention the issue originator, and in particular the customer, in the name of the registered issue.
-  * **Description** - should contain a detailed definition of the nature of the registered issue depending on its type. For a bug it is required to submit a detailed description of the incorrect behavior, including the indication of the cause of the problem (if possible at this stage) or any inputs from the originator. For a feature or integration request it is recommended to describe the proposed feature in details (as possible at that stage), including the changes required for its implementation and the main features of the new functionality. Filling the bug description is obligatory. 
-  * **Steps To Reproduce** - in this field it is possible to describe in detail how to reproduce the issue.  This field considerably helps to find the cause of the problem, to eliminate it and to create the test case.
-  * *Upload File* field allows attaching the shapes, scripts or modified source files of OCCT. It is recommended to attach a prototype test case in form of a Tcl script for DRAW,   using either existing DRAW commands, or a C++ code which can be organized in DRAW commands,   as well as sample shapes or other input data (if applicable), immediately after the issue registration. 
+**Category** -- indicates the OCCT component, to which the issue relates.
+    (If in doubt, assign to OCCT:Foundation Classes.)
+
+**Severity** -- indicates the impact of the issue in the context where it was discovered.
+
+**Profile** -- specifies the configuration, on which the problem was detected. 
+For specific configurations it is possible to specify separately platform, OS, and version.
+These fields can be left empty if the issue is not configuration-specific.
+Additional details relevant for the environment where the issue is reproduced (such as compiler version, bitness, etc.) can be provided in the **Description**.
+
+**Products Version** -- defines the OCCT version, on which the problem has been detected.
+
+It is preferable to indicate the version of the earliest known official release where the problem can be reproduced.
+If the issue is reported on the current development version of OCCT, the current development version should be used (for convenience, this version is marked by asterisk in Mantis).
+    
+@note OCCT version number can be consulted in the file Standard_Version.hxx (value of OCC_VERSION_COMPLETE macro).
+
+**Assign to** -- developer to whom the issue will be assigned. 
+    By default, it is set to **Maintainer** of the OCCT component selected in **Category** field.
+
+**Target Version** -- defines the target version for the fix to be provided.
+    By default, it is set to the current version under development.
+
+**Summary** -- a short, one sentence description of the issue. 
  
-  The newly registered issue gets status **NEW** and is assigned to the developer responsible for the OCCT component indicated in the Category field (Maintainer). 
+The **Summary** has a limit of 128 characters. 
+It should be informative and useful for the developers. 
+It is not allowed to mention the issue originator, and in particular the customer, in the name of the registered issue.

-@subsection occt_contribution_workflow_2_3 Assigning the issue
+A good practice is to start the issue with indication of the relevant component (OCCT module, package, class etc.) to better represent its context.

-  The description of the new issue is checked by the **Maintainer** and if it is feasible, 
-  he may assign the issue to a **Developer**. Alternatively, any user with **Developer** access level  
-  or higher can assign the issue to himself if he wants to provide a solution. 
+The summary should be given in imperative mood when it can be formulated as goal to be achieved or action to be done.
+In particular, this applies to feature requests and improvements, for instance:
+
+> *Visualization - provide a support of zoom persistent selection*
+
+If the issue reports a problem, the summary should be given in Present Simple.
+If reported problem is believed to be a regression, it is recommended to indicate this in the summary, like this:
+
+> [Regression in 6.9.0] *IGES - Export of a reversed face leads to wrong data*
+
+**Description** -- should contain a detailed definition of the nature of the registered issue depending on its type. 
+
+For a bug it is required to submit a detailed description of the incorrect behavior, including the indication of the cause of the problem (if known at this stage), and details on the context where the issue has been detected.
+
+For a feature or integration request it is necessary to describe the proposed feature in details (as much as possible at that stage), including the changes required for its implementation and the main features of the new functionality. 
+
+Example:
+
+> *Currently selection does not work correctly for non-zoomable objects (those defined using transform persistence). To provide correct selection for such objects, first-level (object) BVH structures must be updated on each camera change, and frustum must be rebuilt accordingly.*
+
+@note In the description and notes to the issues you can refer to another issue by its ID prefixed by number sign (e.g.: #12345), and refer to a note by its ID prefixed by tilde (e.g.: ~20123). 
+These references will be expanded by Mantis into links to the corresponding issue or note. 
+When the number sign or the tilde followed by digits are a part of a normal text, add a space before digits (e.g.: "face # 12345 contains ~ 1000 edges") to avoid this conversion.
+
+**Steps To Reproduce** -- allows describing in detail how to reproduce the issue. 
+
+This information is crucial for the developer to investigate the cause of the problem and to create the test case.
+The optimal approach is to give a sequence of @ref occt_user_guides__test_harness "DRAW Test Harness" commands to reproduce the problem in DRAW.
+This information can also be provided as a DRAW Tcl script attached to the issue (in **Upload File** field).
+
+**Additional information and documentation updates** -- any additional information, remarks to be taken into account in Release Notes, etc.. 
+
+**Upload File** -- allows attaching the shapes, snapshots, scripts, documents, or modified source files of OCCT. 
+
+This field can be used to attach a prototype test case in form of a Tcl script for DRAW, a C++ code which can be organized in DRAW commands, sample shapes, documents describing proposed change or analysis of the problem, or other data required for reproduction of the issue.
+Where applicable, pictures demonstrating a problem and/or desired result can be attached.
  
-  The recommended way to handle contributions is that the **Reporter** assigns the issue to himself and provides a solution.
+The newly registered issue gets status **NEW** and is assigned to the person indicated in the **Assign to** field. 

-  The **Maintainer, Technical Project Manager,** or **Bugmaster** can close or reassign the issue 
-  (in **FEEDBACK** state) to the **Reporter** after it has been registered, if its description does not contain sufficient details to reproduce the bug or explain the purpose of the new feature. 
-  That decision shall be documented in the comments to the issue in the Bugtracker.
+@subsection occt_contribution_workflow_assign Assigning the issue

-  The assigned issue should have state **ASSIGNED**.
-
-@subsection occt_contribution_workflow_2_4 Resolving the issue
-
-  The **Developer** responsible for the issue assigned to him provides a solution 
-  as a change on the version of OCCT indicated in the issue attributes, or the last development version. 
-
-  The modified sources should be submitted for review and testing to the dedicated branch of the official OCCT Git repository:
-
-  * Branch should be created for the issue with name composed of letters ‘CR’ followed by issue ID number (without leading zeroes). 
-   Optional suffix can be added to the branch name after issue ID, 
-   e.g. to distinguish between several version of the fix.
-  * The branch should be based on recent version of the master branch 
-   (not later than commit tagged as last OCCT release).
-  * The first line of the first commit message should contain 
-   the Summary of the issue (starting with its ID followed by colon, e.g. "0022943: Bug TDataXtd_PatternStd"). 
-   The consequent lines should contain a description of the changes made. 
-   If more than one commit has been made, the commit messages should contain description of the changes made.
-  * The amount of the code affected by the change should be limited 
-   to only the changes required for the bug fix or improvement. 
-   Change of layout or re-formatting of the existing code is allowed 
-   only in the parts where meaningful changes related to the issue have been made.
-  * The name of the branch where the fix is submitted should be given 
-   in the note to the Mantis issue 
-   (providing the direct link to relevant branch view in GitWeb is encouraged).
-  * The description of the changes made should be put to the field 
-   "Additional information and documentation updates" of the Mantis issue.
-
-  In some cases (if Git is not accessible for the contributor), 
-  external contributions can be submitted as patch (diff) files or sources 
-  attached to the Mantis issue, with indication of OCCT version on which the fix is made. 
-  Such contributions should be put to Git for processing by someone else,
-  and hence they have less priority in processing than the ones submitted directly through Git.
-
-  The issue for which solution is provided should be switched to **RESOLVED** state 
-  and assigned to the developer who is expected to make a code review 
-  (the **Reviewer**; by default, can be set to the **Maintainer** of the component).
-
-@subsection occt_contribution_workflow_2_5 Code review
-
-  The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT Code reviewing rules and examines all changes in the sources to detect obvious and possible errors, misprints, conformity to coding style.
+The description of the new issue is checked by the **Maintainer** and if it is feasible, he may assign the issue to a **Developer**.
+Alternatively, any user with **Developer** access level or higher can assign the issue to himself if he wants to provide a solution. 
  
-    * If Reviewer detects some problems, he can either:
-      * Fix these issues and provide new solution, reassigning the issue (in **RESOLVED** state) to the **Developer**, who then becomes a **Reviewer**. 
-       Possible disagreements should be resolved through discussion, which is done normally within issue notes (or on the OCCT developer’s forum if necessary).
-      * Reassign the issue back to the **Developer**,  providing detailed list of remarks. The issue then gets status **ASSIGNED** and a new solution should be provided.
-    * If Reviewer does not detect any problems, he changes status to **REVIEWED**.
+The recommended way to handle contributions is that the **Reporter** assigns the issue to himself and provides a solution.

-@subsection occt_contribution_workflow_2_6 Testing
+The **Maintainer** or **Bugmaster** can close or reassign the issue (in **FEEDBACK** state) to the **Reporter** after it has been registered, if its description does not contain sufficient details to reproduce the bug or explain the need of the new feature. 
+That decision shall be documented in the comments to the issue in the Bugtracker.
+
+The assigned issue has status **ASSIGNED**.
+
+@subsection occt_contribution_workflow_fix Resolving the issue
+
+The **Developer** responsible for the issue assigned to him provides a solution including:
+
+* Changes in the code, with appropriate comments;
+* Test case (when applicable) and data necessary for its execution;
+* Changes in the user and developer guides (when necessary).
+
+The change is integrated to branch named CRxxxxx (where **xxxxx** is issue number) in the OCCT Git repository, based on current master, and containing a single commit with the appropriate description.
+Then the issue is switched to **RESOLVED** for further review and testing.
+
+The following sub-sections describe this process, relevant requirements and options, in more details.
+
+@subsubsection  occt_contribution_workflow_fix_code Requirements to the code modification
+ 
+The amount of code affected by the change should be limited to the changes required for the bug fix or improvement.
+Change of layout or re-formatting of the existing code is allowed only in the parts where meaningful changes related to the issue have been made.
+
+@note If deemed useful, re-formatting or cosmetic changes affecting considerable parts of the code can be made within a dedicated issue.
+
+The changes should comply with the OCCT @ref occt_dev_guides__coding_rules "Codng Rules". 
+It is especially important to comment the code properly so that other people can understand it easier.
+
+The modification should be tested by running OCCT tests (on the platform and scope available to **Developer**) and ensuring absence of regressions.
+In case if modification affects results of some existing test case and the new result is correct, such test case should be updated to report OK (or BAD), as descibed in @ref testmanual_details_results "Automated Test System / Interpretation of Test Results".
+      
+@subsubsection occt_contribution_workflow_fix_test Providing a test case
+
+For modifications affecting OCCT functionality, a test case should be created (unless already exists) and included in the commit or patch.
+See @ref testmanual_intro_quick_create "Automated Test System / Creating a New Test" for relevant instructions.
+
+The data files required for a test case should be attached to the corresponding issue in Mantis (i.e. not included in the commit).
+
+When the test case cannot be provided for any reason, the maximum possible information on how the problem can be reproduced and how to check the fix should be provided in the **Steps to Reproduce** field of an issue.
+
+@subsubsection  occt_contribution_workflow_fix_doc Updating user and developer guides
+
+If the change affects a functionality described in @ref user_guides "User Guides", the corresponding user guide should be updated to reflect the change.
+
+If the change affects OCCT test system, build environment, or development tools described in @ref dev_guides "Developer Guides", the corresponding guide should be updated.
+ 
+The changes that break compatibility with the previous versions of OCCT (i.e. affecting API or behavior of existing functionality in the way that may require update of existing applications based on an earlier official release of OCCT to work correctly) should be described in the document @ref occt_dev_guides__upgrade "Upgrade from previous OCCT versions".
+It is recommended to add a sub-section for each change described.
+The description should provide the explanation of the incompatibility introduced by the change, and describe how it can be resolved (at least, in known situations).
+When feasible, the automatic upgrade procedure (adm/upgrade.tcl) can be extended by a new option to perform the required upgrade of the dependent code automatically. 
+
+@subsubsection  occt_contribution_workflow_fix_git Submission of change as a Git branch
+  
+The modification of sources should be provided in the dedicated branch of the official OCCT Git repository.
+
+The branch should contain a single commit, with the appropriate commit message (see @ref occt_contribution_workflow_fix_commit "Requirements to the commit message" below).
+
+In general, this branch should be based on the recent version of the master branch.
+It is highly preferable to submit changes basing on the current master.
+In case if the fix is implemented on the previous release of OCCT, the branch can be based on the corresponding tag in Git, instead of the master.
+  
+The branch name should be composed of letters **CR** (abbreviation of "Change Request") followed by the issue ID number (without leading zeros). 
+It is possible to add an optional suffix to the branch name after the issue ID, e.g. to distinguish between several versions of the fix (see @ref occt_contribution_nonstd_rebase).
+
+See @ref occt_dev_guides__git_guide "Guide to using GIT" for help.
+
+@note When a branch with the name given according to the above rule is pushed to Git, a note is automatically added to the corresponding issue in Mantis, indicating the person who has made the push, the commit hash, and (for new commits) the description.
+  
+@subsubsection  occt_contribution_workflow_fix_commit Requirements to the commit message
+
+The commit message posted in Git constitutes an integral part of both the fix and the release documentation.
+
+The first line of the commit message should contain the Summary of the issue (starting with its ID followed by colon, e.g. "0022943: Bug in TDataXtd_PatternStd"), followed by an empty line. 
+
+The following lines should provide a description of the context and details on the changes made.
+The contents and the recommended structure of the description depend on the nature of the bug. 
+  
+In a general case, the following elements should be present:
+* **Problem** -- a description of the unwanted behavior;
+* **Change** -- a description of the implemented changes, including the names of involved classes / methods / enumerations etc.;
+* **Result** -- a description of the current behavior (after the implementation).
+
+Example:
+
+> *0026330: BRepOffsetAPI_ThruSections creates invalid shape.*
+> 
+> *Methods BRep_Tool::CurveOnSurface() and BRepCheck_Edge::InContext() now properly handle parametric range on a 3D curve when it is used to generate a p-curve dynamically (on a planar surface) and both the surface and the 3D curve have non-null locations.*
+
+Provide sufficient context so that potential user of the affected functionality can understand what has been changed and how the algorithm works now.
+Describe reason and essence of the changes made, but do not go too deep into implementation details -- these should be reflected in comments in the code.
+
+@subsubsection occt_contribution_workflow_fix_resolve Marking issue as resolved
+
+To mark the change as ready for review and testing, the corresponding issue should be switched to **RESOLVED** state.
+By default, the issue gets assigned to the **Maintainer** of the component, who is thus responsible for its review. 
+Alternatively, another person can be selected as a reviewer at this step.
+
+When the issue is switched to **RESOLVED**, it is required to update or fill the field **Steps to reproduce**.
+The possible variants are:
+
+* The name of an existing or new test case (preferred variant);
+* A sequence of DRAW commands;
+* N/A (Not required / Not possible / Not applicable);
+* Reference to an issue in the bug tracker of another project.
+
+@subsection occt_contribution_workflow_review Code review
+
+The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT @ref occt_dev_guides__coding_rules "Coding Rules" and examines all changes in the sources, test case(s), and documentation to detect obvious and possible errors, misprints, or violations of the coding style. 
+
+If the Reviewer detects some problems, he can either:
+
+* Fix these issues and provide a new solution. 
+  The issue can then be switched to **REVIEWED**. 
+  
+  In case of doubt or possible disagreement the **Reviewer** can reassign the issue (in **RESOLVED** state) to the **Developer**, who then becomes a **Reviewer**. 
+  Possible disagreements should be resolved through discussion, which is done normally within issue notes (or on the OCCT developer’s forum if necessary).
+
+* Reassign the issue back to the **Developer**,  providing detailed list of remarks. The issue then gets status **ASSIGNED** and a new solution should be provided.
+    
+If Reviewer does not detect any problems, or provides a corrected version, he changes status to **REVIEWED**.
+The issue gets assigned to the **Bugmaster**.
+
+@subsection occt_contribution_workflow_test Testing

  The issues that are in **REVIEWED** state are subject of certification (non-regression) testing. 
-  The issue is assigned to OCC **Tester** when he starts processing it.
-  The results of tests are checked by the **Tester**: 
-    * If the **Tester** detects build problems or regressions, he changes the status to **ASSIGNED** and reassigns the issue to the **Developer** with a detailed description of the problem. The **Developer** should produce a new solution.
-    * If the **Tester** does not detect build problems or regressions, he changes the status to **TESTED** for further integration.
+  The issue is assigned to an OCCT **Tester** when he starts processing it.

-@subsection occt_contribution_workflow_2_7 Integration of a solution
+  If the branch submitted for testing is based on obsolete status of the master branch, **Tester** @ref occt_contribution_nonstd_rebase "rebases" it on master HEAD.
+  In case of conflicts, the issue is assigned back to **Developer** in **FEEDBACK** status, requesting for a rebase.

-  Before integration into the master branch of the repository the **Integrator** checks the following conditions:
+  Certification testing includes:
+	* Addition of new data models (if required for a new test case) to the data base;
+    * Revision of the new test case(s) added by developer, and changes in the existing test cases included in commit. 
+	  The **Tester** can amend tests to ensure their correct behavior in the certification environment.
+    * Building OCCT on a sub-set of supported configurations (OS and compiler), watching for errors and warnings;
+	* Execution of tests on sub-set of supported platforms (at least, one Windows and one Linux configuration), watching for regressions;
+	* Building OCCT samples, watching for errors;
+	* Building and testing of OCC products based on OCCT.
+
+If the **Tester** does not detect problems or regressions, he changes the status to **TESTED** for further integration.
+
+If the **Tester** detects build problems or regressions, he changes the status to **ASSIGNED** and reassigns the issue to the **Developer** with a detailed description of the problems. 
+The **Developer** should analyze the reported problems and, depending on results of this analysis, either:
+* Confirm that the detected problems are expected changes and they should be accepted as a new status of the code. Then the issue should be switched to **FEEDBACK** and assigned to the **Bugmaster**.
+* Produce a new solution (see @ref occt_contribution_workflow_fix, and also @ref occt_contribution_nonstd_minor).
+
+@subsection occt_contribution_workflow_integrate Integration of a solution
+
+Before integration into the master branch of the repository the **Integrator** checks the following conditions:
    * the change has been reviewed;
    * the change has been tested without regressions (or with regressions treated properly);
    * the test case has been created for this issue (when applicable), and the change has been rechecked on this test case;
-    * "Additional information and documentation updates" field is filled by the developer;
    * the change does not conflict with other changes integrated previously.
  
-  If the result of check is successful the Integrator integrates solution 
-  into the master branch of the repository. Each change is integrated into the master branch 
-  as a single commit without preserving the history of changes made in the branch 
-  (by rebase, squashing all intermediate commits), however, preserving the author when possible. 
-  This is done to have the master branch history plain and clean. 
-  The following picture illustrates the process:
+If the result of check is successful the Integrator integrates the solution into the branch.
+The integrations are performed weekly; integration branches are named following the pattern IR-YYYY-MM-DD.
+
+Each change is integrated as a single commit without preserving the history of changes made in the branch (by rebase, squashing all intermediate commits if any), however, preserving the author when possible.
+This is done to have the master branch history plain and clean.
+The following picture illustrates the process:
  
-@image html OCCT_ContributionWorkflow_V3_image002.png "Integration of several branches"
-@image latex OCCT_ContributionWorkflow_V3_image002.png "Integration of several branches"
+@image html OCCT_ContributionWorkflow_V3_image002.png "Integration of several branches" width=\textwidth
+@image latex OCCT_ContributionWorkflow_V3_image002.png "Integration of several branches" width=\textwidth
  
-  The new master branch is tested against possible regressions that might appear due to interference between separate changes. When the tests are Ok, the new master is pushed to the official repository 
-  and the original branches are removed from it.
-  The issue status is set then to **VERIFIED** and is assigned to the **Reporter** so that he could check the fix as-integrated.
+The new integration branch is tested against possible regressions that might appear due to interference between separate changes.
+When the tests are OK, the integration branch is pushed as the new master to the official repository.
+The issue status is set then to **VERIFIED** and is assigned to the **Reporter** so that he could check the fix as integrated.

-@subsection occt_contribution_workflow_2_8 Closing a bug
+The branches corresponding to the integrated fixes are removed from the repository by the **Bugmaster**.

-  The **Bugmaster** closes the issue after regular OCCT Release provided that the issue status is **VERIFIED** and that issue was really solved in that release, by rechecking the corresponding test case. The final issue state is **CLOSED**.
+@subsection occt_contribution_workflow_close Closing an issue

-@subsection occt_contribution_workflow_2_9 Reopening a bug
+When possible, the **Reporter** should check whether the problem is actually resolved in the environment where it has been discovered, after the fix is integrated to master.
+If the fix does not actually resolve the original problem, the issue in **VERIFIED** status can be reopened and assigned back to the **Developer** for rework.
+The details on how to check that the issue is still reproducible should be provided.
+However, if the issue does resolve the problem as described in the original report, but a similar problem is discovered for another input data or configuration, or the fix has caused a regression, that problem should be registered as a separate (@ref occt_contribution_nonstd_relate "related") issue.

-  If a regression is detected, the **Bugmaster** may reopen and reassign the **CLOSED** issue to the appropriate developer with comprehensive comments about the reason of reopening. The issue then becomes **ASSIGNED** again. 
+If the fix integrated to master causes regressions, **Bugmaster** can revert it and reopen the issue.

-@section occt_contribution_workflow_3 Appendix
+The **Bugmaster** closes the issue after the regular OCCT Release, provided that the issue status is **VERIFIED** and the change was actually included in the release.
+The final issue state is **CLOSED**.

-@subsection occt_contribution_workflow_3_1 Issue attributes
+The field **Fixed in Version** of the issue is set to the OCCT version where it is fixed.

-@subsubsection occt_contribution_workflow_3_1_1 Severity
+@section occt_contribution_nonstd Additional workflow elements
+
+@subsection occt_contribution_nonstd_feedback Requesting more information or specific action
+
+If, at any step of the issue lifetime, the person responsible for it cannot process it due to absence of required information, expertise, or rights, he can switch it to status **FEEDBACK** and assign to the person who is (presumably) able to resolve the block. Some examples of typical situations where **FEEDBACK** is used are:
+
+* The **Maintainer** or the **Developer** requests for more information from the **Reporter** to reproduce the issue;
+* The **Tester** requests the **Developer** or the **Maintainer** to help him in the interpretation of testing results; 
+* The **Developer** or the **Maintainer** asks the **Bugmaster** to close the issue that is found irrelevant or already fixed (see @ref occt_contribution_nonstd_autofix).
+
+In general, issues with status **FEEDBACK** should be processed as fast as possible, to avoid unjustified delays.
+
+@subsection occt_contribution_nonstd_relate Defining relationships between issues
+
+When two or more issues are related to each other, this relationship should be reflected in the issue tracker.
+It is also highly recommended to add a note to explain the relationship.
+Typical cases of relationships are:
+
+* Issue A is caused by previous fix made for issue B (A is a child of B);
+* Issue A describes the same problem as issue B (A is a duplicate of B);
+* Issues A and B relate to the same piece of code, functionality etc., in the sense that the fix for one of these issues will affect the other (A is related to B)
+
+When the fix made for one issue also resolves  another one, these issues should be marked as related or duplicate.
+In general, the duplicate issue should have the same status, and, when closed, be marked as fixed in the same OCCT version, as the main one.
+
+@subsection  occt_contribution_nonstd_patch Submission of a change as a patch
+  
+In some cases (if Git is not accessible for the contributor), external contributions can be submitted as a patch file (generated by *diff* command) or as modified sources attached to the Mantis issue.
+The OCCT version, for which the patch is generated, should be clearly specified (e.g. as hash code of Git commit if the patch is based on an intermediate state of the master).
+  
+@note Such contributions should be put to Git by someone else (e.g. the **Reviewer**), this may cause delay in their processing.
+  
+@subsection occt_contribution_nonstd_rebase Updating branches in Git
+
+Updates of the existing branch (e.g. taking into account the remarks of the **Reviewer**, or fixing regressions) should be provided as new commits on top of previous state of the branch.
+
+It is allowed to rebase the branch on the new state of the master and push it to the repository under the same name (with <i>--force</i> option) provided that the original sequence of commits is preserved.
+
+When a change is squashed into a single commit (e.g. to be submitted for review), it should be pushed into a branch a with different name.
+
+The recommended approach is to add a numeric suffix (index) indicating the version of the change, e.g. "CR12345_5".
+Usually it is worth keeping a non-squashed branch in Git for reference.
+
+To avoid confusions, the branch corresponding to the latest version of the change should have a greater index.
+
+@note Make sure to revise the commit message after squashing a branch, to keep it meaningful and comprehensive.
+
+@subsection occt_contribution_nonstd_minor Minor corrections
+
+In some cases review remarks or results of testing require only minor corrections to be done in the branch containing a change.
+"Minor" implies that the correction does not impact the functionality and does not affect the description of the previously committed change.
+
+As an exception to general @ref occt_contribution_workflow_fix_git "single-commit rule", it is allowed to put such minor corrections on top of the existing branch as a separate commit, and re-submit it for further processing in the same branch, without squashing.
+
+Minor commits should have a single-line message starting with //.
+These messages will be ignored when the branch is squashed at integration.
+
+Typical cases of minor corrections are:
+
+* Amendments of test cases (including those made by the **Tester** to adjust a test script to a specific platform);
+* Trivial corrections of compilation warnings (such as removal of an unused variable);
+* Addition or correction of comments or documentation;
+* Corrections of code formatting (e.g. reversion of irrelevant formatting changes made in the main commit).
+
+@subsection occt_contribution_nonstd_autofix Handling non-reproducible issues
+
+Investigation of each issue starts with reproducing it on current development version (master).
+
+If it cannot be reproduced on the current master, but can be reproduced on one of previous releases (or previous state of the master), it is considered as solved by a change made for another issue.
+If that "fixing" issue can be identified (e.g. by parsing Git log), it should be set as related to that issue.
+The issue should be switched to **FEEDBACK** and assigned to the **Bugmaster** for further processing.
+
+The **Bugmaster** decides whether it is necessary to create a test case for that issue, and if so may assign it to the **Developer** or the **Tester** to create a test.
+The issue then follows the standard workflow.
+
+Otherwise, if the issue is fixed in one of previous releases, the **Bugmaster** closes it setting the appropriate value in **Fixed in Version** field, or, if the issue is fixed after the last release, switches it to **VERIFIED** status.
+
+If the issue cannot be reproduced due to an unclear description, missing data, etc., it should be assigned back to the **Reporter** in **FEEDBACK** status, requesting for more information.
+The **Reporter** should provide additional information within one month; after that time, if no new information is provided, the issue should be closed by the **Bugmaster** with resolution **Unable to reproduce**. 
+
+@section occt_contribution_app Appendix: Issue attributes
+
+@subsection occt_contribution_app_category Category
+
+The category corresponds to the component of OCCT where the issue is found:
+    
+  |              Category        |                       Component                        |
+  | :--------------------------- | :----------------------------------------------------- |
+  | OCCT:Foundation Classes      | Foundation Classes module                              |
+  | OCCT:Modeling Data           | Modeling Data classes                                  |
+  | OCCT:Modeling Algorithms     | Modeling Algorithms, except shape healing and meshing  |
+  | OCCT:Shape Healing           | Shape Healing component (TKShapeHealing)               |
+  | OCCT:Mesh                    | BRepMesh algorithm                                     |
+  | OCCT:Data Exchange           | Data Exchange module                                   |
+  | OCCT:Visualization           | Visualization module                                   |
+  | OCCT:Application Framework   | OCAF                                                   |
+  | OCCT:DRAW                    | DRAW Test Harness                                      |
+  | OCCT:Tests                   | Automatic Test System                                  |
+  | OCCT:Documentation           | Documentation                                          |
+  | OCCT:Coding                  | General code quality                                   |
+  | OCCT:Configuration           | Configuration, build system, etc.                      |
+  | OCCT:Releases                | Official OCCT releases                                 |
+  | Website:Tracker              | OCCT Mantis issue tracker, tracker.dev.opencascade.org |
+  | Website:Portal               | OCCT development portal, dev.opencascade.org           |
+  | Website:Git                  | OCCT Git repository, git.dev.opencascade.org           |
+
+
+@subsection occt_contribution_app_severity Severity

  Severity shows at which extent the issue affects the product. 
  The list of used severities is given in the table below in the descending order.
  
-  | Severity    |                  Description                      | Weight for Bug Score |
-  | :---------- | :------------------------------------------------ | :------------------: |
-  | crash       | Crash of the application or OS, loss of data      |          5           |
-  | block       | Regression corresponding to the previously  delivered official version. Impossible  operation of a function on any data with no work-around. Missing function previously requested in software requirements specification.   Destroyed data.     |        4            |
-  | major       | Impossible operation of a function with existing work-around. Incorrect operation of a function on a particular dataset. Impossible operation of a function after intentional input of incorrect data. Incorrect behavior of a function   after intentional input of incorrect data.  | 3 |
-  | minor       | Incorrect behavior of a function corresponding  to the description in software requirements specification. Insufficient performance  of a function.          |   2     |
-  | tweak       | Ergonomic inconvenience, need of light updates.   |          1           |
-  | text        | Inconsistence of program code to the Coding Standard. Errors in source text  (e.g.  unnecessary variable declarations, missing   comments, grammatical errors in user manuals). | 1 |
-  | trivial     | Cosmetic bugs.                                    |          1           |
-  | feature     | Bug fix, new feature, improvement that requires workload estimation and validation. | 1 |   
-  | integration request | Requested integration of an existing feature into the product.               |          0           |
-  | Just a question       | A question to be processed, without need   of any changes in the product.        |         0                |
+  | Severity    |                  Description                      |
+  | :---------- | :------------------------------------------------ |
+  | crash       | Crash of the application or OS, loss of data      |
+  | block       | Regression corresponding to the previously  delivered official version. Impossible  operation of a function on any data with no work-around. Missing function previously requested in software requirements specification.   Destroyed data. |
+  | major       | Impossible operation of a function with existing work-around. Incorrect operation of a function on a particular dataset. Impossible operation of a function after intentional input of incorrect data. Incorrect behavior of a function   after intentional input of incorrect data. |
+  | minor       | Incorrect behavior of a function corresponding  to the description in software requirements specification. Insufficient performance  of a function. |
+  | tweak       | Ergonomic inconvenience, need of light updates. |
+  | text        | Non-conformance of the program code to the Coding Rules, mistakes and non-functional errors in the source text  (e.g. unnecessary variable declarations, missing comments, grammatical errors in user manuals). |
+  | trivial     | Cosmetic issues.                                    |
+  | feature     | Request for a new feature or improvement. |
+  | integration request | Requested integration of an existing feature into the product. |
+  | just a question       | A question to be processed, without need   of any changes in the product. |

-@subsubsection occt_contribution_workflow_3_1_2 Statuses of issues
+@subsection occt_contribution_app_status Status

  The bug statuses that can be applied to the issues are listed in the table below. 
  
  | Status               |  Description                                                        |
  | :------------------- | :----------------------------------------- |
-  | New                  | New just registered issue. Testing case should be created by Reporter. |
-  | Feedback             | The issue requires more information; the original posters should pay attention. |
+  | New                  | A new, just registered issue. |
+  | Acknowledged         | Can be used to mark the issue as postponed. |
+  | Confirmed            | Can be used to mark the issue as postponed. |
+  | Feedback             | The issue requires more information or a specific action. |
  | Assigned             | Assigned to a developer.  |
-  | Resolved + a resolution  |    The issue has been fixed, and now is waiting for revision.  |
-  |Revised  + a resolution   | The issue has been revised, and now is waiting for testing. |
+  | Resolved             | The issue has been fixed, and now is waiting for review.  |
+  | Reviewed             | The issue has been reviewed, and now is waiting for testing (or being tested). |
  | Tested               | The fix has been internally tested by the tester with success on the full non-regression database or its part and a test case has been created for this issue. |
  | Verified             | The fix has been integrated into the master of the corresponding repository |
-  | Closed               | The fix has been integrated to the master. The corresponding test case has been executed successfully. The issue is no longer reproduced. |
+  | Closed + resolution  | The fix has been integrated to the master. The corresponding test case has been executed successfully. The issue is no longer reproduced. |

-@subsubsection occt_contribution_workflow_3_1_3 Resolutions
+@subsection occt_contribution_app_resolution Resolution

-  **Resolution** is set when the bug is resolved. "Reopen" resolution is added automatically when the bug is reopened.
+  **Resolution** is set when the bug is closed. "Reopen" resolution is added automatically when the bug is reopened.

  | Resolution            |                               Description                                    |
  |:--------------------- | :--------------------------------------------------------------------------- |
-  | Open                  | The issue is being processed.                                                |
+  | Open                  | The issue is pending.                                                        |
  | Fixed                 | The issue has been successfully fixed.                                       |
  | Reopened              | The bug has been reopened because of insufficient fix or regression.         |
-  | Unable to reproduce   | The bug is not reproduced.                                |
-  | Not fixable           | The bug cannot be fixed because it is a bug of third party software, or because it requires more workload than it can be allowed.        |
+  | Unable to reproduce   | The bug is not reproduced.                                                   |
+  | Not fixable           | The bug cannot be fixed because e.g. it is a bug of third party software, OS or hardware limitation, etc. |
  | Duplicate             | The bug for the same issue already exists in the tracker.                    |
-  | Not a bug             | It is a normal behavior in accordance with the specification of the product  |
-  | No change required    | The issue didn’t require any change of the product, such as a question issue |
-  | Suspended             | This resolution is set for Acknowledged status only. It means that the issue is waiting for fix until a special administrative decision is taken (e.g. a budget is not yet set in accordance with the contract)       | 
-  | Documentation updated | The issue was a normal behavior of the product, but the actions of the user  were wrong. The specification and the user manual have been updated  to reflect this issue.    |
-  | Won’t fix             | An administrative/contractual decision has been taken to not fix the bug     |
-
-@subsection occt_contribution_workflow_3_2 Update and evolution of documentation
-
-  The documentation on Open CASCADE Technology currently exists in three forms:
-  
-  * OCCT Technical Documentation generated automatically with Doxygen tool on the basis of comments in CDL or HXX files.    
-  * User’s Reference Documentation on OCCT packages and Products supplied in the form of PDF User’s guides
-  * OCCT Release Documentation supplied in the form of Release Notes with each release.
-  
-  It is strictly required to properly report the improvements and changes introduced in OCCT in all three forms of Documentation.
-  
-@subsubsection occt_contribution_workflow_3_2_1 Maintenance of CDL files
-
-  Every developer providing a contribution to the source code of OCC 
-  should make a relevant change in the corresponding header file, including CDL.
-
-  Making the appropriate comments is mandatory in the following cases:
-  
-  * Development of a new package / class / method / enumeration;
-  * Modification of an existing package / class / method / enumeration that changes its behavior;
-  * Modification / new development impacts at other packages / classes / methods / enumerations, the documentation  which of should be modified correspondingly.  
-
-  The only case when the comments may be not required is introducing 
-  a modification that does not change the existing behavior in any noticeable way
-  or brings the behavior in accordance with the existing description.
-  
-  CDL description must be in good English, containing as much relevant 
-  information and as clear as possible. If the developer is unable to properly formulate 
-  his ideas in English or suspects that his description can be misunderstood, 
-  he should address to the Documentation Engineer for language assistance. 
-  Such action is completely subject to the discretion of the developer; however, 
-  the Documentation Engineer can require that the developer should provide a relevant 
-  technical documentation and reopen a bug until all documentation satisfies the requirements above.
-
-@subsubsection occt_contribution_workflow_3_2_2 Maintenance of the User’s Reference Documentation
-
-  The User’s Reference Documentation is distributed among a number of User’s Guides, 
-  each describing a certain module of OCCT. 
-  The User's Guides do not cover the entire functionality of OCCT; 
-  however, they describe most widely used and important packages.
-  
-  In most aspects the User's Guides present the information that is contained in CDL descriptions for methods, classes, etc., only from a different point of view. Thus, it is required that any developer who implements a new or modifies an existing package / class / method / enumeration and adds a description of new development or changes in the corresponding CDL file should also check if this class  package / class / method / enumeration or the package / class, to which the added class / method belongs is already described in the documentation and update the User’s Reference Documentation correspondingly.
-
-3.2.3. Preparation of the Release Documentation
-
-  Before changing the bug Status to RESOLVED, the developer should provide a description of the implemented work using the "Additional information and documentation updates" field of Mantis bugtracker. 
-  
-  This description is used for the Release Documentation and has the following purposes:
-  
-  * to inform the OCCT users about the main features and improvements implemented in the platform in the release;
-  * to give a complete and useable list of changes introduced into the OCCT since the latest version. 
-
-  The changes should be described from the user’s viewpoint so that the text 
-  could be comprehensible even for beginners having a very vague idea about OCCT. 
-  If the developer is unable to properly formulate his ideas in English or suspects 
-  that his description can be misunderstood, he should address to the Documentation Engineer 
-  for language assistance. Such action is completely subject to the discretion of the developer; 
-  however, the Documentation Engineer can require that the developer 
-  should provide a relevant technical documentation and reopen a bug 
-  until all documentation satisfies the requirements.
-
-  **Note**, that it is required to single out the changes in the OCCT behavior as compared to the previous versions and especially the changes to be considered when porting from the previous version of OCCT.
-
-For example: 
-*  If global macros XXX() was used in the code of your application, revise it for direct use of the argument stream object. 
-*  You might need to revise the code related to text display in 3d viewer to take into account new approach of using system fonts via XXX library. 
-
-  The **Documentation Engineer** is responsible for preparation of the version Release Notes 
-  and update of the User’s Guides. If the **Documentation Engineer** considers that the description currently provided by the **Developer** is somehow inadequate or unsatisfactory he can demand the **Developer** to rewrite the documentation with the **Documentation Engineer’s** assistance.
+  | Not a bug             | It is a normal behavior in accordance with the specification of the product. |
+  | No change required    | The issue didn’t require any change of the product, such as a question issue.|
+  | Suspended             | The issue is postponed (for Acknowledged status).                            |
+  | Documentation updated | The documentation has been updated to resolve a misunderstanding causing the issue. |
+  | Won’t fix             | It is decided to keep the existing behavior.                                     |
--- a/dox/dev_guides/contribution_workflow/images/OCCT_ContributionWorkflow_V3_image001.png
+++ b/dox/dev_guides/contribution_workflow/images/OCCT_ContributionWorkflow_V3_image001.png
--- a/dox/dev_guides/contribution_workflow/images/OCCT_ContributionWorkflow_V3_image001.svg
+++ b/dox/dev_guides/contribution_workflow/images/OCCT_ContributionWorkflow_V3_image001.svg
--- a/dox/dev_guides/debug/debug.md
+++ b/dox/dev_guides/debug/debug.md
@@ -59,8 +59,8 @@ const char* DBRep_Set (const char* theNameStr, void* theShapePtr)
 ~~~~~

 Sets the specified shape as a value of DRAW interpreter variable with the given name.
- *theNameStr* - the DRAW interpreter variable name to set.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
+- *theNameStr* -- the DRAW interpreter variable name to set.
+- *theShapePtr* -- a pointer to *TopoDS_Shape* variable.

 ~~~~~
 const char* DrawTrSurf_Set (const char* theNameStr, void* theHandlePtr)
@@ -69,10 +69,10 @@ const char* DrawTrSurf_SetPnt2d (const char* theNameStr, void* thePnt2dPtr)
 ~~~~~

 Sets the specified geometric object as a value of DRAW interpreter variable with the given name.
- *theNameStr* - the DRAW interpreter variable name to set.
- *theHandlePtr* - a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
- *thePntPtr* - a pointer to the variable of type *gp_Pnt* to be set.
- *thePnt2dPtr* - a pointer to the variable of type *gp_Pnt2d* to be set.
+- *theNameStr* -- the DRAW interpreter variable name to set.
+- *theHandlePtr* -- a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
+- *thePntPtr* -- a pointer to the variable of type *gp_Pnt* to be set.
+- *thePnt2dPtr* -- a pointer to the variable of type *gp_Pnt2d* to be set.

 All these functions are defined in *TKDraw* toolkit and return a string indicating the result of execution.

@@ -85,8 +85,8 @@ const char* BRepTools_Write (const char* theFileNameStr, void* theShapePtr)
 ~~~~~

 Saves the specified shape to a file with the given name.
- *theFileNameStr* - the name of the file where the shape is saved.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
+- *theFileNameStr* -- the name of the file where the shape is saved.
+- *theShapePtr* -- a pointer to *TopoDS_Shape* variable.

 ~~~~~
 const char* BRepTools_Dump (void* theShapePtr)
@@ -94,7 +94,7 @@ const char* BRepTools_DumpLoc (void* theShapePtr)
 ~~~~~

 Dumps shape or its location to cout.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
+- *theShapePtr* -- a pointer to *TopoDS_Shape* variable.

 The following function is provided by *TKMesh* toolkit:

@@ -103,8 +103,8 @@ const char* BRepMesh_Dump (void* theMeshHandlePtr, const char* theFileNameStr)
 ~~~~~

 Stores mesh produced in parametric space to BREP file.
- *theMeshHandlePtr* - a pointer to *Handle(BRepMesh_DataStructureOfDelaun)* variable.
- *theFileNameStr* - the name of the file where the mesh is stored.
+- *theMeshHandlePtr* -- a pointer to *Handle(BRepMesh_DataStructureOfDelaun)* variable.
+- *theFileNameStr* -- the name of the file where the mesh is stored.

 The following additional function is provided by *TKGeomBase* toolkit:

@@ -113,7 +113,7 @@ const char* GeomTools_Dump (void* theHandlePtr)
 ~~~~~

 Dump geometric object to cout.
- *theHandlePtr* - a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
+- *theHandlePtr* -- a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.

@section occt_debug_vstudio Using Visual Studio debugger 

--- a/dox/dev_guides/debug/occt.natvis
+++ b/dox/dev_guides/debug/occt.natvis
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="gp_XY">
+<Type Name="gp_XY">
    <DisplayString>[{(float)x} {(float)y}]</DisplayString>
  </Type>
  <Type Name="gp_Pnt2d">
@@ -40,18 +40,25 @@
  </Type>
  <Type Name="Handle_Standard_Transient">
    <DisplayString Condition="entity==0x00000000">NULL</DisplayString>
-    <DisplayString Condition="entity!=0x00000000">[count={entity->count}]</DisplayString>
+    <DisplayString Condition="entity!=0x00000000">[cnt={entity->count}]</DisplayString>
    <Expand>
      <ExpandedItem>*entity</ExpandedItem>
    </Expand>
  </Type>
  <Type Name="NCollection_Handle&lt;*&gt;">
    <DisplayString Condition="entity==0x00000000">NULL</DisplayString>
-    <DisplayString Condition="entity!=0x00000000">[count={entity->count}]</DisplayString>
+    <DisplayString Condition="entity!=0x00000000">{(void*)entity} [cnt={entity->count}]</DisplayString>
    <Expand>
      <ExpandedItem>*((NCollection_Handle&lt;$T1&gt;::Ptr*)entity)->myPtr</ExpandedItem>
    </Expand>
  </Type>
+  <Type Name="opencascade::handle&lt;*&gt;">
+    <DisplayString Condition="entity==0x00000000">NULL</DisplayString>
+    <DisplayString Condition="entity!=0x00000000">{(void*)entity} [cnt={entity->count} {*entity}]</DisplayString>
+    <Expand>
+      <ExpandedItem>(opencascade::handle&lt;$T1&gt;::element_type*)entity</ExpandedItem>
+    </Expand>
+  </Type>
  <Type Name="TCollection_AsciiString">
    <DisplayString>{mylength}: {mystring,s}</DisplayString>
  </Type>
@@ -101,6 +108,17 @@
      </LinkedListItems>
    </Expand>
  </Type>
+  <Type Name="NCollection_Sequence&lt;*&gt;">
+    <DisplayString>NCollection_Sequence [{mySize}]</DisplayString>
+    <Expand>
+      <LinkedListItems>
+        <Size>mySize</Size>
+        <HeadPointer>myFirstItem</HeadPointer>
+        <NextPointer>myNext</NextPointer>
+        <ValueNode>*($T1*)(sizeof(NCollection_SeqNode) + ((char *)this))</ValueNode>
+      </LinkedListItems>
+    </Expand>
+  </Type>
  <Type Name="Bnd_B2f">
    <AlternativeType Name="Bnd_B2d"></AlternativeType>
    <DisplayString Condition="myCenter[0] &gt; 1000000000000000000.">VOID</DisplayString>
@@ -143,4 +161,97 @@
  <Type Name="OpenGl_Context">
    <DisplayString>[{myGlVerMajor}.{myGlVerMinor}]</DisplayString>
  </Type>
+
+<!--ArrayItems Expansion-->
+<Type Name="TColStd_Array1OfInteger">
+    <DisplayString Condition="isAllocated != 1">empty</DisplayString> 
+    <DisplayString>{{size = {myUpperBound - myLowerBound + 1}}}</DisplayString>
+    <Expand>
+        <Item Condition="isAllocated == 1" Name="[size]">myUpperBound - myLowerBound + 1</Item>
+        <ArrayItems Condition="isAllocated == 1">
+            <Size>myUpperBound - myLowerBound + 1</Size>
+            <ValuePointer>(Standard_Integer*)(myStart) + myLowerBound</ValuePointer>
+        </ArrayItems>
+    </Expand>
+</Type>
+
+<Type Name="TColStd_Array1OfReal">
+    <DisplayString Condition="isAllocated != 1">empty</DisplayString> 
+    <DisplayString>{{size = {myUpperBound - myLowerBound + 1}}}</DisplayString>
+    <Expand>
+        <Item Condition="isAllocated == 1" Name="[size]">myUpperBound - myLowerBound + 1</Item>
+        <ArrayItems Condition="isAllocated == 1">
+            <Size>myUpperBound - myLowerBound + 1</Size>
+            <ValuePointer>(Standard_Real*)(myStart) + myLowerBound</ValuePointer>
+        </ArrayItems>
+    </Expand>
+</Type>
+
+<!--Multi-dimensional Arrays-->
+<Type Name="TColStd_Array2OfInteger">
+    <DisplayString Condition="(myUpperColumn == myLowerColumn) &amp;&amp; (myUpperRow == myLowerRow)">empty</DisplayString>
+    <DisplayString>extent = {(myUpperColumn-myLowerColumn+1) * (myUpperRow-myLowerRow+1)}</DisplayString>
+</Type>
+
+
+<!--LinkedListItems Expansion-->
+<Type Name="TColStd_ListNodeOfListOfInteger">
+    <DisplayString>{{current = {myValue}}}</DisplayString>
+    <Expand>
+        <LinkedListItems>
+            <HeadPointer>this</HeadPointer>
+            <NextPointer>(TColStd_ListNodeOfListOfInteger*)myNext</NextPointer>
+            <ValueNode>this-&gt;myValue</ValueNode>
+        </LinkedListItems>
+    </Expand>
+</Type>
+
+<Type Name="TColStd_ListOfInteger">
+    <DisplayString Condition="myFirst == 0">empty</DisplayString>
+    <Expand>
+        <Item Name="values">(TColStd_ListNodeOfListOfInteger*)(myFirst)</Item>
+    </Expand>
+</Type>
+
+<Type Name="TColStd_ListNodeOfListOfReal">
+    <DisplayString>{{current = {myValue}}}</DisplayString>
+    <Expand>
+        <LinkedListItems>
+            <HeadPointer>this</HeadPointer>
+            <NextPointer>(TColStd_ListNodeOfListOfReal*)myNext</NextPointer>
+            <ValueNode>this-&gt;myValue</ValueNode>
+        </LinkedListItems>
+    </Expand>
+</Type>
+
+<Type Name="TColStd_ListOfReal">
+    <DisplayString Condition="myFirst == 0">empty</DisplayString>
+    <Expand>
+        <Item Name="values">(TColStd_ListNodeOfListOfReal*)(myFirst)</Item>
+    </Expand>
+</Type>
+
+<Type Name="BRep_ListOfCurveRepresentation">
+    <DisplayString Condition="myFirst == 0">empty</DisplayString>
+    <Expand>
+        <Item Name="values">(BRep_ListNodeOfListOfCurveRepresentation*)(myFirst)</Item>
+    </Expand>
+</Type>
+
+<Type Name="TopoDS_Shape">
+    <DisplayString>{myOrient} {myTShape} loc={myLocation}</DisplayString>
+</Type>
+
+<Type Name="TopoDS_TShape">
+    <DisplayString>subshapes={myShapes} flags={myFlags}</DisplayString>
+</Type>
+
+<Type Name="BOPDS_Pave">
+    <DisplayString>{{{myIndex} {myParameter}}}</DisplayString>
+</Type>
+
+<Type Name="BOPDS_PaveBlock">
+    <DisplayString>edge={myEdge} orig={myOriginalEdge} pave1={myPave1} pave2={myPave2} extpaves={myExtPaves}</DisplayString>
+</Type>
+
 </AutoVisualizer>
--- a/dox/dev_guides/documentation/documentation.md
+++ b/dox/dev_guides/documentation/documentation.md
@@ -117,16 +117,16 @@ If you want to use the same image for several documents, you can place it in *do


 The documentation is generated in subfolder *doc* :
-* *html* - a directory for generated HTML pages;
-* *pdf* - a directory for generated PDF files.
+* *html* -- a directory for generated HTML pages;
+* *pdf* -- a directory for generated PDF files.

@section  OCCT_DM_SECTION_4 Adding a New Document

 Place a new document in the folder taking into account its logical position in the documentation hierarchy. For instance, the document *svn.md* about the use of SVN to work with OCCT source code can be placed into <i>/dox/dev_guides/</i>. 

 If there are images in the document, it should be placed in its own folder containing a subfolder for images. For instance:
-* <i> /dox/dev_guides/svn/ </i> - for *svn.md* file;
-* <i> /dox/dev_guides/svn/images/ </i> - for images.
+* <i> /dox/dev_guides/svn/ </i> -- for *svn.md* file;
+* <i> /dox/dev_guides/svn/images/ </i> -- for images.

 Add a relative path to *svn.md* in file <i>dox/FILES.txt</i>. For instance

@@ -136,7 +136,7 @@ dev_guides/svn/svn.md

 **Note** that the order of paths to documents in *FILES.txt* is reproduced in the Table of Contents in the HTML output. Please, place them logically.

-**Note** that you should specify a file tag, not the document name. See <a href="#OCCT_DM_SECTION_A_1">Header section</a> for details.
+**Note** that you should specify a file tag, not the document name. See @ref OCCT_DM_SECTION_A_1 "Header and hierarchic document structure" section for details.

@section  OCCT_DOC_SECTION_5 Additional Resources

@@ -168,9 +168,9 @@ The table of contents, page numbers (in PDF), and figure numbers (in PDF) are ge
@subsection  OCCT_DM_SECTION_A_1 Headers and hierarchic document structure

 Headers of different levels can be specified with the following tags:
-* <i>\@section</i> - for the first-level headers; 
-* <i>\@subsection</i> - for the second level headers;
-* <i>\@subsubsection</i> - for the third level headers.
+* <i>\@section</i> -- for the first-level headers; 
+* <i>\@subsection</i> -- for the second level headers;
+* <i>\@subsubsection</i> -- for the third level headers.

 For example:

--- a/dox/dev_guides/git_guide/git_guide.md
+++ b/dox/dev_guides/git_guide/git_guide.md
@@ -66,7 +66,7 @@ The official repository contains:
  Integration of contributions that have passed certification testing is made exclusively by the Bugmaster. 
  Normally this is made by rebasing the contribution branch on the current master 
  and squashing it into a single commit. This is made to have the master branch history plain and clean, 
-  following the general rule “one issue – one commit”. 
+  following the general rule “one issue -- one commit”. 
  The description of the commit integrated to the master branch is taken from the Mantis issue 
  (ID, 'Summary', followed by the information from 'Documentation' field if present).
  
@@ -97,25 +97,14 @@ The official repository contains:

@subsubsection occt_gitguide_2_1_1 Installation of Git for Windows

-  Download Git for Windows distributive from http://code.google.com/p/msysgit/downloads/list.
+  Download Git for Windows distributive from https://git-for-windows.github.io/
  During the installation:

-  * Select Windows Explorer integration options:
-    * Git Bash Here
-    * Git GUI Here
-    
-@image html OCCT_GitGuide_V2_image001.png
-@image latex OCCT_GitGuide_V2_image001.png
-
-  * To avoid a mess in your PATH, we recommend selecting ‘Run Git from Windows Prompt’ in the environment settings dialog: 
-  
-@image html OCCT_GitGuide_V2_image002.png
-@image latex OCCT_GitGuide_V2_image002.png
-
+  * Check-in "Windows Explorer integration" options:
+    * "Git Bash Here";
+    * "Git GUI Here".
+  * To avoid a mess in your PATH, we recommend selecting "Run Git from Windows Prompt" in the environment settings dialog: 
  * In "Configuring the line ending conversions" dialog, select "Checkout Windows-style, commit Unix style endings".
-  
-@image html OCCT_GitGuide_V2_image003.png
-@image latex OCCT_GitGuide_V2_image003.png
 
  Note that by default Git user interface is localized to the system default language. 
  If you prefer to work with the English interface, remove or rename .msg localization file 
@@ -128,15 +117,12 @@ The official repository contains:
  Download TortoiseGit distributive from http://code.google.com/p/tortoisegit/downloads/list. 
  Launch the installation.

-  * Select your SSH client. Choose OpenSSH if you prefer to use command-line tools 
-   for SSH keys generation, or TortoisePLink if you prefer to use GUI tool (PuttyGen, see 3.2):
-   
-@image html OCCT_GitGuide_V2_image004.png
-@image latex OCCT_GitGuide_V2_image004.png
-
-  * Complete the installation.
+ * Select your SSH client. Choose option 
+	  * "OpenSSH, Git default SSH Client" if you prefer to use command-line tools for SSH keys generation, or
+	  * "TortoisePLink, coming from Putty, integrates with Windows better" if you prefer to use GUI tool (PuttyGen, see 3.2).
+ * Complete the installation.
  
-  TortoiseGit integrates to Windows Explorer, thus it is possible to use context menu in Windows Explorer to access its functionality:  
+  TortoiseGit integrates into Windows Explorer, thus it is possible to use context menu in Windows Explorer to access its functionality:  
  
@image html OCCT_GitGuide_V2_image005.png
@image latex OCCT_GitGuide_V2_image005.png
@@ -236,8 +222,8 @@ The official repository contains:
  
  On Windows, make sure to note the complete path to the generated files (the location of your $HOME might be not obvious). Two key files will be created in the specified location (by default in $HOME/.ssh/):
  
-  * *id_rsa* - private key
-  * *id_rsa.pub* - public key
+  * *id_rsa* -- private key
+  * *id_rsa.pub* -- public key
  
  The content of the public key file (one text line) is the key to be added to the user account on the site (see below).

@@ -250,11 +236,10 @@ The official repository contains:
@subsection occt_gitguide_3_3 Adding public key in your account

 Log in on the portal http://dev.opencascade.org and click on **My account** link to the right. If you have a Contributor status, you will see **SSH keys** tab to the right. 
+
 Click on that tab, then click **Add a public key**, and paste the text of the public key (see above sections on how to generate the key) into the text box. 
-  Click **Save** to input the key to the system. 
-  
-@image html OCCT_GitGuide_V2_image008.png
-@image latex OCCT_GitGuide_V2_image008.png  
+
+Click **Save** to input the key to the system. 

  Note that a user can have several SSH keys. 
  You can distinguish between these keys by the Title field ID; by default it is taken from SSH key comment. 
@@ -335,10 +320,6 @@ In the console:
 In TortoiseGit: 
  * Go to the local copy of the repository. 
  * Right-click in the Explorer window, then choose **Git Create Branch**.
-  
-@image html OCCT_GitGuide_V2_image011.png
-@image latex OCCT_GitGuide_V2_image011.png
-
  * Select **Base On** Branch *remotes/origin/master*.  

@image html OCCT_GitGuide_V2_image012.png
@@ -377,7 +358,7 @@ In TortoiseGit:
    > git commit -a -m "Write meaningful commit message here"
 ~~~~~

-  Option –a tells the command to automatically include (stage) files 
+  Option -a tells the command to automatically include (stage) files 
  that have been modified or deleted, but it will omit the new files that might have been added by you. 
  To commit such new files, you must add (stage) them before commit command.

@@ -456,7 +437,7 @@ Note that Git forbids pushing a branch if the corresponding remote branch alread
@image html OCCT_GitGuide_V2_image019.png
@image latex OCCT_GitGuide_V2_image019.png

-Note that the local branches of your repository are the primary place, where your changes are stored until they get integrated to the official version of OCCT (master branch). The branches submitted to official repository are for collaborative work, review, and integration - that repository should not be used for long-term storage of incomplete changes. 
+Note that the local branches of your repository are the primary place, where your changes are stored until they get integrated to the official version of OCCT (master branch). The branches submitted to official repository are for collaborative work, review, and integration -- that repository should not be used for long-term storage of incomplete changes. 
  
 Remove the local branches that you do not need any more. Note that you cannot delete the current branch. It means that you need to switch to another one (e.g. master) if the branch you are going to delete is the current one.
  
@@ -539,7 +520,7 @@ To rebase your branch into a single commit, you need to do the following:

  Use of TortoiseGit is recommended for convenient code review:

-  * Fetch the changes from the remote repository as described in <a href="#occt_gitguide_4_7">Synchronizing with remote repository</a> section.   
+  * Fetch the changes from the remote repository as described in @ref occt_gitguide_4_7 "Synchronizing with remote repository" section.   
  * Right-click on the repository, choose **TortoiseGit** -> **Show** log;
  * Locate the remote branch you need to review;
  * To review commits one-by-one, select each commit in the log. The list of changed files is shown at the bottom of the window; double-click on the file will open visual compare tool.
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image001.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image001.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image002.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image002.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image003.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image003.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image004.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image004.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image006.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image006.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image007.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image007.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image008.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image008.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image009.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image009.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image011.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image011.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image012.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image012.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image013.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image013.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image014.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image014.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image015.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image015.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image016.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image016.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image018.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image018.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image019.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image019.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image020.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image020.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image021.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image021.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image022.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image022.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image023.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image023.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image024.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image024.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image025.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image025.png
--- a/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image026.png
+++ b/dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_image026.png
--- a/dox/dev_guides/tests/images/tests_image001.png
+++ b/dox/dev_guides/tests/images/tests_image001.png
--- a/dox/dev_guides/tests/tests.md
+++ b/dox/dev_guides/tests/tests.md
@@ -3,15 +3,15 @@

@tableofcontents

-@section testmanual_1 Introduction
+@section testmanual_intro Introduction

 This document provides OCCT developers and contributors with an overview and practical guidelines for work with OCCT automatic testing system.

 Reading the Introduction should be sufficient for developers to use the test system to control non-regression of the modifications they implement in OCCT. Other sections provide a more in-depth description of the test system, required for modifying the tests and adding new test cases. 

-@subsection testmanual_1_1 Basic Information
+@subsection testmanual_intro_basic Basic Information

-OCCT automatic testing system is organized around DRAW Test Harness @ref occt_user_guides__test_harness "DRAW Test Harness", a console application based on Tcl (a scripting language) interpreter extended by OCCT-related commands.
+OCCT automatic testing system is organized around @ref occt_user_guides__test_harness "DRAW Test Harness", a console application based on Tcl (a scripting language) interpreter extended by OCCT-related commands.

 Standard OCCT tests are included with OCCT sources and are located in subdirectory *tests* of the OCCT root folder. Other test folders can be included in the test system, e.g. for testing applications based on OCCT.

@@ -21,7 +21,7 @@ The tests are organized in three levels:
  * Grid: a set of test cases within a group, usually aimed at testing some particular aspect or mode of execution of the relevant functionality (e.g. buildevol);
  * Test case: a script implementing an individual test (e.g. K4).
  
-See <a href="#testmanual_5_1">Test Groups</a> for the current list of available test groups and grids.
+See @ref testmanual_5_1 "Test Groups" chapter for the current list of available test groups and grids.

 Some tests involve data files (typically CAD models) which are located separately and are not included with OCCT code. The archive with publicly available test data files should be downloaded and installed independently on OCCT sources (see http://dev.opencascade.org).

@@ -98,10 +98,10 @@ Example:
    Detailed logs are saved in D:/occt/results_2012-06-04T0919
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-The tests are considered as non-regressive if only OK, BAD (i.e. known problem), and SKIPPED (i.e. not executed, typically because of lack of a data file) statuses are reported. See <a href="#testmanual_3_5">Interpretation of test results</a> for details.
+The tests are considered as non-regressive if only OK, BAD (i.e. known problem), and SKIPPED (i.e. not executed, typically because of lack of a data file) statuses are reported. See @ref testmanual_details_results "Interpretation of test results" for details.

 The results and detailed logs of the tests are saved by default to a new subdirectory of the subdirectory *results* in the current folder, whose name is generated automatically using the current date and time, prefixed by Git branch name (if Git is available and current sources are managed by Git).
-If necessary, a non-default output directory can be specified using option <i> –outdir</i> followed by a path to the directory. This directory should be new or empty; use option <i>–overwrite</i> to allow writing results in the existing non-empty directory. 
+If necessary, a non-default output directory can be specified using option <i> -outdir</i> followed by a path to the directory. This directory should be new or empty; use option <i>-overwrite</i> to allow writing results in the existing non-empty directory. 

 Example:
 ~~~~~
@@ -109,6 +109,14 @@ Draw[]> testgrid -outdir d:/occt/last_results -overwrite
 ~~~~~
 In the output directory, a cumulative HTML report <i>summary.html</i> provides links to reports on each test case. An additional report in JUnit-style XML format can be output for use in Jenkins or other continuous integration system.

+To re-run the test cases, which were detected as regressions on the previous run, option <i>-regress dirname</i> should be used.
+<i>dirname</i> is a path to the directory containing the results of the previous run. Only the test cases with *FAILED* and *IMPROVEMENT* statuses will be tested.
+
+Example:
+~~~~~
+Draw[]> testgrid -regress d:/occt/last_results
+~~~~~
+
 Type <i>help testgrid</i> in DRAW prompt to get help on options supported by *testgrid* command:

 ~~~~~
@@ -122,8 +130,10 @@ testgrid: Run all tests, or specified group, or one grid
    -overwrite: force writing logs in existing non-empty directory
    -xml filename: write XML report for Jenkins (in JUnit-like format)
    -beep: play sound signal at the end of the tests
-    Groups, grids, and test cases to be executed can be specified by list of file 
-    masks, separated by spaces or comma; default is all (*).
+    -regress dirname: re-run only a set of tests that have been detected as regressions on the previous run.
+                      Here "dirname" is a path to the directory containing the results of the previous run.
+    Groups, grids, and test cases to be executed can be specified by the list of file 
+    masks separated by spaces or commas; default is all (*).
 ~~~~~

@subsubsection testmanual_1_3_3 Running a Single Test
@@ -165,14 +175,14 @@ test: Run specified test case
        This key will be ignored if the "-echo" key is already set.
 ~~~~~

-@subsubsection testmanual_1_3_4 Creating a New Test
+@subsubsection testmanual_intro_quick_create Creating a New Test

-The detailed rules of creation of new tests are given in <a href="#testmanual_3">section 3</a>. The following short description covers the most typical situations:
+The detailed rules of creation of new tests are given in @ref testmanual_3 "Creation and modification of tests" chapter. The following short description covers the most typical situations:

 Use prefix <i>bug</i> followed by Mantis issue ID and, if necessary, additional suffixes, for naming the test script, data files, and DRAW commands specific for this test case.

 1.	If the test requires C++ code, add it as new DRAW command(s) in one of files in *QABugs* package. 
-2.	Add script(s) for the test case in the subfolder corresponding to the relevant OCCT module of the group *bugs* <i>($CASROOT/tests/bugs)</i>. See <a href="#testmanual_5_2">the correspondence map</a>.
+2.	Add script(s) for the test case in the subfolder corresponding to the relevant OCCT module of the group *bugs* <i>($CASROOT/tests/bugs)</i>. See @ref testmanual_5_2 "the correspondence map".
 3.	In the test script:
 	*	Load all necessary DRAW modules by command *pload*.
 	*	Use command *locate_data_file* to get a path to data files used by test script. (Make sure to have this command not inside catch statement if it is used.)
@@ -189,7 +199,7 @@ Example:
 * Added files:

 ~~~~~
-git status –short
+git status -short
 A tests/bugs/heal/data/bug210_a.brep
 A tests/bugs/heal/data/bug210_b.brep
 A tests/bugs/heal/bug210_1
@@ -288,7 +298,7 @@ This file is a TCL script. It is executed after every test in the current group.

 Note: *TEST COMPLETED* string should be present in the output to indicate that the test is finished without crash. 

-See <a href="#testmanual_3">section 3</a> for more information.
+See @ref testmanual_3 "Creation and modification of tests" chapter for more information.

 Example:
 ~~~~~
@@ -321,7 +331,7 @@ Example:

 Lines starting with a *#* character and blank lines are ignored to allow comments and spacing.

-See <a href="#testmanual_3_5">Interpretation of test results</a> chapter for details.
+See @ref testmanual_details_results "Interpretation of test results" chapter for details.

 If a line matches several rules, the first one applies. Rules defined in the grid are checked first, then rules in the group, then rules in the test root directory. This allows defining some rules on the grid level with status *IGNORE* to ignore messages that would otherwise be treated as errors due to the group level rules.

@@ -334,7 +344,7 @@ Example:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@subsubsection testmanual_2_2_6  Directory "data"
-The test group may contain subdirectory *data*, where test scripts shared by different test grids can be put. See also <a href="#testmanual_2_3_5">Directory *data*</a>.
+The test group may contain subdirectory *data*, where test scripts shared by different test grids can be put. See also @ref testmanual_2_3_5 "Directory data".

@subsection testmanual_2_3 Test Grids

@@ -440,7 +450,7 @@ This section describes how to add new tests and update existing ones.

 The new tests are usually added in the frame of processing issues in OCCT Mantis tracker. 
 Such tests in general should be added to group bugs, in the grid 
-corresponding to the affected OCCT functionality. See <a href="#testmanual_5_2">Mapping of OCCT functionality to grid names in group *bugs*</a>.
+corresponding to the affected OCCT functionality. See @ref testmanual_5_2 "Mapping of OCCT functionality to grid names in group bugs".

 New grids can be added as necessary to contain tests for the functionality not yet covered by existing test grids. 
 The test case name in the bugs group should be prefixed by the ID of the corresponding issue in Mantis (without leading zeroes) with prefix *bug*. It is recommended to add a suffix providing a hint on the tested situation. If more than one test is added for a bug, they should be distinguished by suffixes; either meaningful or just ordinal numbers.
@@ -560,10 +570,10 @@ Other Tcl variables defined during the test execution are:

 In order to ensure that the test works as expected in different environments, observe the following additional rules:
 * Avoid using external commands such as *grep, rm,* etc., as these commands can be absent on another system (e.g. on Windows); use facilities provided by Tcl instead.
-* Do not put call to *locate_data_file* in catch statement – this can prevent correct interpretation of the missing data file by the test system.
+* Do not put call to *locate_data_file* in catch statement -- this can prevent correct interpretation of the missing data file by the test system.
 * Do not use commands *decho* and *dlog* in the test script, to avoid interference with use of these commands by the test system.

-@subsection testmanual_3_5 Interpretation of test results
+@subsection testmanual_details_results Interpretation of test results

 The result of the test is evaluated by checking its output against patterns defined in the files *parse.rules* of the grid and group.

@@ -630,11 +640,11 @@ puts "REQUIRED ListOfPlatforms: RegularExpression"

 Here *ListOfPlatforms* and *RegularExpression* have the same meaning as in TODO statements described above.

-The REQUIRED statament can also be used to mask message that would normally be interpreted as error (according to rules defined in *parse.rules*) but should not be considered as such within current test.
+The REQUIRED statement can also be used to mask message that would normally be interpreted as error (according to rules defined in *parse.rules*) but should not be considered as such within current test.

 Example:
 ~~~~~
-puts "TODO REQUIRED Linux: Faulty shapes in variables faulty_1 to faulty_5"
+puts "REQUIRED Linux: Faulty shapes in variables faulty_1 to faulty_5"
 ~~~~~

 This statement notifies test system that errors reported by *checkshape* command are expected in that test case, and test should be considered as OK if this message appears, despite of presence of general rule stating that 'Faulty' signals failure.
@@ -695,15 +705,15 @@ testdiff dir1 dir2 [groupname [gridname]] [options...]
 Here *dir1* and *dir2* are directories containing logs of two test runs.

 Possible options are:
-* <i>-save \<filename\> </i> - saves the resulting log in a specified file (<i>$dir1/diff-$dir2.log</i> by default). HTML log is saved with the same name and extension .html;
-* <i>-status {same|ok|all}</i> - allows filtering compared cases by their status:
-	* *same* - only cases with same status are compared (default);
-	* *ok*   - only cases with OK status in both logs are compared;
-	* *all*  - results are compared regardless of status;
-* <i>-verbose \<level\> </i> - defines the scope of output data:
-	* 1 - outputs only differences;
-	* 2 - additionally outputs the list of logs and directories present in one of directories only;
-	* 3 - (by default) additionally outputs progress messages;
+* <i>-save \<filename\> </i> -- saves the resulting log in a specified file (<i>$dir1/diff-$dir2.log</i> by default). HTML log is saved with the same name and extension .html;
+* <i>-status {same|ok|all}</i> -- allows filtering compared cases by their status:
+	* *same* -- only cases with same status are compared (default);
+	* *ok*   -- only cases with OK status in both logs are compared;
+	* *all*  -- results are compared regardless of status;
+* <i>-verbose \<level\> </i> -- defines the scope of output data:
+	* 1 -- outputs only differences;
+	* 2 -- additionally outputs the list of logs and directories present in one of directories only;
+	* 3 -- (by default) additionally outputs progress messages;

 Example:

@@ -750,9 +760,9 @@ This group allows testing Boolean operations.
 DRAW module: MODELING (packages *BOPTest* and *BRepTest*).

 Grids names are based on name of the command used, with suffixes: 
-* <i>_2d</i> – for tests operating with 2d objects (wires, wires, 3d objects, etc.); 
-* <i>_simple</i> – for tests operating on simple shapes (boxes, cylinders, toruses, etc.);
-* <i>_complex</i> – for tests dealing with complex shapes.
+* <i>_2d</i> -- for tests operating with 2d objects (wires, wires, 3d objects, etc.); 
+* <i>_simple</i> -- for tests operating on simple shapes (boxes, cylinders, toruses, etc.);
+* <i>_complex</i> -- for tests dealing with complex shapes.

 | Grid	| Commands	| Functionality |
 | :---- | :----- | :------- | 
@@ -786,7 +796,7 @@ Grids names are based on name of the command used, with suffixes:
 This group allows testing cases coming from Mantis issues.

 The grids are organized following OCCT module and category set for the issue in the Mantis tracker. 
-See <a href="#testmanual_5_2">Mapping of OCCT functionality to grid names in group *bugs*</a> for details.
+See @ref testmanual_5_2 "Mapping of OCCT functionality to grid names in group bugs" chapter for details.

@subsubsection testmanual_5_1_5 caf

@@ -1055,6 +1065,7 @@ Error : Number of faults is UNSTABLE
 ~~~~~

@subsubsection testmanual_5_3_2 Shape tolerance
+
 The maximal tolerance of sub-shapes of each kind of the resulting shape can be extracted from output of tolerance command as follows:

 ~~~~~
@@ -1069,10 +1080,10 @@ It is possible to use command *checkmaxtol* to check maximal tolerance of shape
 Use: checkmaxtol shape [options...]

 Allowed options are:
- *   -ref: reference value of maximum tolerance
- *   -source: list of shapes to compare with
- *   -min_tol: minimum tolerance for comparison
- *   -multi_tol: tolerance multiplier
+ *   <i>-ref</i> -- reference value of maximum tolerance;
+ *   <i>-source</i> -- list of shapes to compare with;
+ *   <i>-min_tol</i> -- minimum tolerance for comparison;
+ *   <i>-multi_tol</i> -- tolerance multiplier.

 The default syntax of *checkmaxtol* command for comparison with the reference value:
 ~~~~~
@@ -1111,9 +1122,10 @@ if { abs($area - $expected) > 0.1 + 0.01 * abs ($area) } {

@subsubsection testmanual_5_3_4 Memory leaks

-The test system measures the amount of memory used by each test case, and considerable deviations (as well as overall difference) comparing with reference results will be reported by *testdiff* command.
+The test system measures the amount of memory used by each test case. Considerable deviations (as well as the overall difference) in comparison with reference results can be reported by command *testdiff*  (see @ref testmanual_4_4).

-The typical approach to checking memory leak on a particular operation is to run this operation in cycle measuring memory consumption at each step and comparing it with some threshold value. Note that file begin in group bugs defines command *checktrend* that can be used to analyze a sequence of memory measurements to get statistically based evaluation of the leak presence.
+To check memory leak on a particular operation, run it in a cycle, measure the memory consumption at each step and compare it with a threshold value.
+The command *checktrend* (defined in *tests/bugs/begin*) can be used to analyze a sequence of memory measurements and to get a statistically based evaluation of the leak presence.

 Example: 
 ~~~~~
@@ -1132,7 +1144,7 @@ for {set i 1} {$i < 100} {incr i} {

@subsubsection testmanual_5_3_5 Visualization

-Take a snapshot of the viewer, give it the name of the test case, and save in the directory indicated by Tcl variable *imagedir*. 
+The following command sequence allows you to take a snapshot of the viewer, give it the name of the test case, and save in the directory indicated by Tcl variable *imagedir*. 

 ~~~~~
 vinit
@@ -1146,27 +1158,71 @@ vdump $imagedir/${casename}_shading.png

 This image will be included in the HTML log produced by *testgrid* command and will be checked for non-regression through comparison of images by command *testdiff*.

+Also it is possible to use command *checkview* to make a snapshot of the viewer.
+
+Use: checkview [options...]
+Allowed options are:
+*   <i>-display shapename </i>  -- displays shape with name *shapename*;
+*   <i>-3d </i> -- displays shape in 3d viewer;
+*   <i>-2d [ v2d / smallview ] </i> - displays shape in 2d viewer (the default viewer is *smallview*);
+*   <i>-path PATH</i> -- sets the location of the saved viewer screenshot;
+*   <i>-vdispmode N</i> -- sets *vdispmode* for 3d viewer (default value is 1)
+*   <i>-screenshot</i> -- makes a screenshot of already created viewer
+*   The procedure can check a property of shape (length, area or volume) and compare it with value *N*:
+	* <i>-l [N]</i>
+	* <i>-s [N]</i>
+	* <i>-v [N]</i>
+	* If the current property is equal to value *N*, the shape is marked as valid in the procedure.
+	* If value *N* is not given, the procedure will mark the shape as valid if the current property is non-zero.
+*   <i>-with {a b c}</i> -- displays shapes *a, b* and *c* together with the shape (if the shape is valid)
+*   <i>-otherwise {d e f}</i> -- displays shapes *d, e* and *f* instead of the shape (if the shape is NOT valid)
+
+Note that is required to use either option <i> -2d </i> or option <i> -3d</i>.
+
+Examples:
+~~~~~
+checkview -display result -2d -path ${imagedir}/${test_image}.png
+checkview -display result -3d -path ${imagedir}/${test_image}.png
+checkview -display result_2d -2d v2d -path ${imagedir}/${test_image}.png
+~~~~~
+
+~~~~~
+box a 10 10 10
+box b 5 5 5 10 10 10
+bcut result b a
+set result_vertices [explode result v]
+checkview -display result -2d -with ${result_vertices} -otherwise { a b } -l -path ${imagedir}/${test_image}.png
+~~~~~
+
+~~~~~
+box a 10 10 10
+box b 5 5 5 10 10 10
+bcut result b a
+vinit
+vdisplay a b
+vfit
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+~~~~~
+
@subsubsection testmanual_5_3_6 Number of free edges

-To check the number of free edges run the command *checkfreebounds*.
-
-It compares number of free edges with reference value.
+Procedure *checkfreebounds* compares the number of free edges with a reference value.

 Use: checkfreebounds shape ref_value [options...]

 Allowed options are:
- * -tol N: used tolerance (default -0.01)
- * -type N: used type, possible values are "closed" and "opened" (default "closed")
+ * <i>-tol N</i> -- used tolerance (default -0.01);
+ * <i>-type N</i> -- used type, possible values are "closed" and "opened" (default "closed").

 ~~~~~
 checkfreebounds result 13
 ~~~~~

-Option -tol N is used to set tolerance for command *freebounds*, which is used within command *checkfreebounds*.
+Option <i>-tol N</i> defines tolerance for command *freebounds*, which is used within command *checkfreebounds*.

-Option -type N is used to select the type of counted free edges - closed or opened.
+Option <i>-type N</i> is used to select the type of counted free edges: closed or open.

-If the number of free edges in the resulting shape is unstable, reference value should be set to "-1".
+If the number of free edges in the resulting shape is unstable, the reference value should be set to "-1".
 As a result command *checkfreebounds* will return the following error:

 ~~~~~
@@ -1176,7 +1232,7 @@ Error : Number of free edges is UNSTABLE

@subsubsection testmanual_5_3_7 Compare numbers

-Procedure to check equality of two reals with some tolerance (relative and absolute)
+Procedure *checkreal* checks the equality of two reals with a tolerance (relative and absolute).

 Use: checkreal name value expected tol_abs tol_rel

@@ -1186,11 +1242,12 @@ checkreal "Some important value" $value 5 0.0001 0.01

@subsubsection testmanual_5_3_8 Check number of sub-shapes

-Compare number of sub-shapes in "shape" with given reference data
+Procedure *checknbshapes* compares the number of sub-shapes in "shape" with the given reference data.

 Use: checknbshapes shape [options...]
+
 Allowed options are:
- * -vertex N
+ * <i>-vertex N
 * -edge N
 * -wire N
 * -face N
@@ -1199,9 +1256,9 @@ Allowed options are:
 * -compsolid N
 * -compound N
 * -shape N
- * -t: compare the number of sub-shapes in "shape" counting
+ * -t</i> -- compares the number of sub-shapes in "shape" counting
      the same sub-shapes with different location as different sub-shapes.
- * -m msg: print "msg" in case of error
+ * <i>-m msg</i> -- prints "msg" in case of error

 ~~~~~
 checknbshapes result -vertex 8 -edge 4
@@ -1209,18 +1266,127 @@ checknbshapes result -vertex 8 -edge 4

@subsubsection testmanual_5_3_9 Check pixel color

-To check pixel color command *checkcolor* can be used.
+Command *checkcolor* can be used to check pixel color.

 Use: checkcolor x y red green blue

-  x y - pixel coordinates
+where:
+ * <i>x, y</i> -- pixel coordinates;
+ * <i>red green blue</i> -- expected pixel color (values from 0 to 1).

-  red green blue - expected pixel color (values from 0 to 1)
-
-This procedure checks color with tolerance (5x5 area)
+This procedure checks color with tolerance (5x5 area).

 Next example will compare color of point with coordinates x=100 y=100 with RGB color R=1 G=0 B=0.
 If colors are not equal, procedure will check the nearest ones points (5x5 area)
 ~~~~~
 checkcolor 100 100 1 0 0
 ~~~~~
+
+@subsubsection testmanual_5_3_10 Compute length, area and volume of input shape
+
+Procedure *checkprops* computes length, area and volume of the input shape.
+
+Use: checkprops shapename [options...]
+
+Allowed options are:
+ * <i>-l LENGTH</i> -- command *lprops*, computes the mass properties of all edges in the shape with a linear density of 1;
+ * <i>-s AREA</i> -- command *sprops*, computes the mass properties of all faces with a surface density of 1; 
+ * <i>-v VOLUME</i> -- command *vprops*, computes the mass properties of all solids with a density of 1;
+ * <i>-eps EPSILON</i> -- the epsilon defines relative precision of computation;
+ * <i>-equal SHAPE</i> -- compares area, volume and length of input shapes. Puts error if they are not equal;
+ * <i>-notequal SHAPE</i> -- compares area, volume and length of input shapes. Puts error if they are equal.
+
+Options <i> -l, -s </i> and <i> -v</i> are independent and can be used in any order. Tolerance *epsilon* is the same for all options.
+
+~~~~~
+checkprops result -s 6265.68 
+checkprops result -s -equal FaceBrep
+~~~~~
+
+@subsubsection testmanual_5_3_11 Parse output dump and compare it with reference values
+
+Procedure *checkdump* is used to parse output dump and compare it with reference values.
+
+Use: checkdump shapename [options...]
+
+Allowed options are:
+ * <i>-name NAME</i> -- list of parsing parameters (e.g. Center, Axis, etc.);
+ * <i>-ref VALUE</i> -- list of reference values for each parameter in *NAME*; 
+ * <i>-eps EPSILON</i> -- the epsilon defines relative precision of computation.
+
+~~~~~
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-70 0} {-1 -0} {-1 -0} {0 -1} {20 10}} -eps 0.01
+~~~~~
+
+@subsubsection testmanual_5_3_12 Compute length of input curve
+
+Procedure *checklength* computes length of the input curve.
+
+Use: checklength curvename [options...]
+  
+Allowed options are:
+ * <i>-l LENGTH</i> -- command *length*, computes the length of the input curve with precision of computation;
+ * <i>-eps EPSILON</i> -- the epsilon defines a relative precision of computation;
+ * <i>-equal CURVE</i> -- compares the length of input curves. Puts error if they are not equal;
+ * <i>-notequal CURVE</i> -- compares the length of input curves. Puts error if they are equal.
+
+~~~~~
+checklength cp1 -l 7.278
+checklength res -l -equal ext_1
+~~~~~
+@subsubsection testmanual_5_3_13 Check maximum deflection, number of triangles and nodes in mesh
+
+Command *checktrinfo* can be used to to check the maximum deflection, as well as the number of nodes and triangles in mesh.
+
+Use: checktrinfo shapename [options...]
+
+Allowed options are:
+ * <i>-tri [N]</i> --  compares the current number of triangles in *shapename* mesh with the given reference data.
+      If reference value N is not given and the current number of triangles is equal to 0, procedure *checktrinfo* will print an error.
+ * <i>-nod [N]</i> --  compares the current number of nodes in *shapename* mesh with the given reference data.
+      If reference value N is not given and the current number of nodes is equal to 0, procedure *checktrinfo* will print an error.
+ * <i>-defl [N]</i> -- compares the current value of maximum deflection in *shapename* mesh with the given reference data.
+      If reference value N is not given and current maximum deflection is equal to 0, procedure *checktrinfo* will print an error.
+ * <i>-max_defl N</i> --     compares the current value of maximum deflection in *shapename* mesh with the max possible value.
+ * <i>-tol_abs_tri N</i> --  absolute tolerance for comparison of number of triangles (default value 0).
+ * <i>-tol_rel_tri N</i> --  relative tolerance for comparison of number of triangles (default value 0).
+ * <i>-tol_abs_nod N</i> --  absolute tolerance for comparison of number of nodes (default value 0).
+ * <i>-tol_rel_nod N</i> --  relative tolerance for comparison of number of nodes (default value 0).
+ * <i>-tol_abs_defl N</i> -- absolute tolerance for deflection comparison (default value 0).
+ * <i>-tol_rel_defl N</i> -- relative tolerance for deflection comparison (default value 0).
+ * <i>-ref [trinfo a]</i> -- compares deflection, number of triangles and nodes in *shapename* and *a*.
+
+Note that options <i> -tri, -nod </i> and <i> -defl </i> do not work together with option <i> -ref</i>.
+
+Examples:
+
+Comparison with some reference values:
+~~~~~
+checktrinfo result -tri 129 -nod 131 -defl 0.01
+~~~~~
+
+Comparison with another mesh:
+~~~~~
+checktrinfo result -ref [tringo a]
+~~~~~
+
+Comparison of deflection with the max possible value:
+~~~~~
+checktrinfo result -max_defl 1
+~~~~~
+
+Check that the current values are not equal to zero:
+~~~~~
+checktrinfo result -tri -nod -defl
+~~~~~
+
+Check that the number of triangles and the number of nodes are not equal to some specific values:
+~~~~~
+checktrinfo result -tri !10 -nod !8
+~~~~~
+
+It is possible to compare current values with reference values with some tolerances.
+Use options <i>-tol_\* </i> for that.
+~~~~~
+checktrinfo result -defl 1 -tol_abs_defl 0.001
+~~~~~
--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -5,53 +5,53 @@ Upgrade from older OCCT versions  {#occt_dev_guides__upgrade}

@section upgrade_intro Introduction

-This document provides technical details on changes made in particular versions of OCCT, and is aimed to help upgrading user applications based on previous versions of OCCT to newer ones.
+This document provides technical details on changes made in particular versions of OCCT. It can help to upgrade user applications based on previous versions of OCCT to newer ones.

@subsection upgrade_intro_precautions Precautions

-Back-up your code before upgrade.
-We strongly recommend using version control system during upgrade process, saving one or several commits for each step of upgrade, until overall result is verified.
-This will facilitate identification and correction of possible problems that can occur on intermediate steps of upgrade.
-Carefully document each step to be able to repeat it if necessary.
+Back-up your code before the upgrade.
+We strongly recommend using version control system during the upgrade process and saving one or several commits at each step of upgrade, until the overall result is verified.
+This will facilitate identification and correction of possible problems that can occur at the intermediate steps of upgrade.
+It is advisable to document each step carefully to be able to repeat it if necessary.

@subsection upgrade_intro_disclaim Disclaimer

-This document describes known issues that have been encountered in porting of OCCT and some applications, and approaches that helped to resolve these issues in known cases.
+This document describes known issues that have been encountered during porting of OCCT and some applications and approaches that have helped to resolve these issues in known cases.
 It does not pretend to cover all possible migration issues that can appear in your application.
-Please take this document with discretion; apply your expertise and knowledge of your application to ensure correct result. 
+Take this document with discretion; apply your expertise and knowledge of your application to ensure the correct result. 

-The automatic upgrade tool is provided as-is, without warranty of any kind, and we explicitly disclaim any liability for possible errors that may appear due to use of this tool. 
+The automatic upgrade tool is provided as is, without warranty of any kind, and we explicitly disclaim any liability for possible errors that may appear due to use of this tool. 
 It is your responsibility to ensure that the changes you made in your code are correct. 
-When upgrading your code by automatic script, make sure to carefully review the changes made by it, on each step, before committing them.
+When you upgrade the code by an automatic script, make sure to carefully review the introduced changes at each step before committing them.

@section upgrade_700 Upgrade to OCCT 7.0.0

@subsection upgrade_700_persist Removal of legacy persistence

-Legacy persistence for shapes and OCAF data based on Storage_Schema (toolkits TKShapeShcema, TLStdLSchema, TKStdSchema, TKXCAFSchema) has been removed in OCCT 7.0.0.
-Applications that used these persistence tools for their data need to be updated to use other persistence mechanisms.
+Legacy persistence for shapes and OCAF data based on *Storage_Schema* (toolkits *TKShapeShcema, TLStdLSchema, TKStdSchema* and *TKXCAFSchema*) has been removed in OCCT 7.0.0.
+The applications that used these data persistence tools need to be updated to use other persistence mechanisms.

-The existing data files in standard formats can be converted using OCCT 6.9.0 or previous version, as follows.
+The existing data files in standard formats can be converted using OCCT 6.9.0 or a previous version, as follows.

 #### CSFDB files

 Files in CSFDB format (usually with extension .csfdb) contain OCCT shape data that can be converted to BRep format. 
 The easiest way to do that is to use ImportExport sample provided with OCCT 6.9.0 (or earlier):

- Start ImportExport sample
- Select File / New
- Select File / Import / CSFDB... and specify the file to be converted
- Drag mouse with right button pressed across the view to select all shapes by rectangle
- Select File / Export / BREP... and specify location and name for the resulting file
+- Start ImportExport sample;
+- Select File / New;
+- Select File / Import / CSFDB... and specify the file to be converted;
+- Drag the mouse with the right button pressed across the view to select all shapes by the rectangle;
+- Select File / Export / BREP... and specify the location and name for the resulting file

 #### OCAF and XCAF documents

-Files containing OCAF data saved in old format usually have extensions .std or .sgd or .dxc (XDE documents).
+Files containing OCAF data saved in the old format usually have extensions <i>.std, .sgd</i> or <i>.dxc</i> (XDE documents).
 These files can be converted to XML or binary OCAF formats using DRAW Test Harness commands available in OCCT 6.9.0 or earlier.

 For that, start *DRAWEXE* and perform the following commands: 

-  * for the conversion of the "*.std" and "*.sgd" file formats to the binary format "*.cbf" (Created document should be in **BinOcaf** format instead of **MDTV-Standard**):
+  * To convert <i>*.std</i> and <i>*.sgd</i> file formats to binary format <i>*.cbf</i> (The created document should be in *BinOcaf* format instead of *MDTV-Standard*):

  @code
  Draw[]> pload ALL
@@ -60,7 +60,7 @@ For that, start *DRAWEXE* and perform the following commands:
  Draw[]> SaveAs Doc [path to the new file]
  @endcode

-  * for the conversion of the "*.dxc" file format to the binary format "*.xbf" (Created document should be in **BinXCAF** format instead of **MDTV-XCAF**):
+  * To convert <i>*.dxc</i> file format to binary format <i>*.xbf</i> (The created document should be in *BinXCAF* format instead of *MDTV-XCAF*):

  @code
  Draw[]> pload ALL
@@ -69,24 +69,26 @@ For that, start *DRAWEXE* and perform the following commands:
  Draw[]> XSave Doc [path to the new file]
  @endcode

-On Windows, be careful to replace back slashes in the file path by either direct slash or pairs of back slashes.
-Use "XmlOcaf" or "XmlXCAF" instead of "BinOcaf" and "BinXCAF", respectively, to save in XML format instead of binary one.
+On Windows, it is necessary to replace back slashes in the file path by  direct slashes or pairs of back slashes.
+
+Use *XmlOcaf* or *XmlXCAF* instead of *BinOcaf* and *BinXCAF*, respectively, to save in XML format instead of binary one.

@subsection upgrade_occt700_cdl Removal of CDL and WOK

 OCCT code has been completely refactored in version 7.0 to get rid of obsolete technologies used since its inception: CDL (Cas.Cade Definition Language) and WOK (Workshop Organization Kit).
+
 C++ code previously generated by WOK from CDL declarations is now included directly in OCCT sources.

 This modification did not change names, API, and behavior of existing OCCT classes, thus in general the code based on OCCT 6.x should compile and work fine with OCCT 7.0.
 However, due to redesign of basic mechanisms (CDL generic classes, Handles and RTTI) using C++ templates, some changes may be necessary in the code when porting to OCCT 7.0, as described below.

-WOK is not necessary anymore for building OCCT from sources, though it still can be used in traditional way -- auxiliary files required for that are preserved.
+WOK is not necessary anymore for building OCCT from sources, though it still can be used in a traditional way -- auxiliary files required for that are preserved.
 The recommended method for building OCCT 7.x is CMake, see @ref occt_dev_guides__building_cmake.
-Alternative solution is to use legacy generator of project files (extracted from WOK), see @ref occt_dev_guides__building_wok.
+The alternative solution is to use legacy generator of project files (extracted from WOK), see @ref occt_dev_guides__building_wok.

@subsubsection upgrade_occt700_cdl_auto Automatic upgrade

-Most of typical changes required for upgrading code to use OCCT 7.0 can be done automatically using the *upgrade* tool included in OCCT 7.0.
+Most of typical changes required for upgrading code for OCCT 7.0 can be done automatically using the *upgrade* tool included in OCCT 7.0.
 This tool is a Tcl script, thus Tcl should be available on your workstation to run it.

 Example:
@@ -96,49 +98,54 @@ Example:
 % upgrade -recurse -all -src=<path_to_your_sources>
 ~~~~~

-On Windows, helper batch script upgrade.bat can be used, provided that Tcl is either available in PATH, or configured via custom.bat script (for instance, if you use OCCT installed from Windows installer package). Start it from command prompt:
+On Windows, the helper batch script *upgrade.bat* can be used, provided that Tcl is either available in *PATH*, or configured via *custom.bat* script (for instance, if you use OCCT installed from Windows installer package). Start it from the command prompt:

 ~~~~~
 cmd> <path_to_occt>\upgrade.bat -recurse -all -inc=<path_to_occt>\inc -src=<path_to_your_sources> [options]
 ~~~~~

-Run upgrade tool without arguments to see the list of available options.
+Run the upgrade tool without arguments to see the list of available options.

-Upgrade tool performs the following changes in the code.
+The upgrade tool performs the following changes in the code.

-1. Adds second argument to macro DEFINE_STANDARD_RTTI indicating base class for its argument class (if inheritance is recognized by the script):
+1. Replaces macro *DEFINE_STANDARD_RTTI* by *DEFINE_STANDARD_RTTIEXT*, with second argument indicating base class for the main argument class (if inheritance is recognized by the script):
 ~~~~~
-DEFINE_STANDARD_RTTI(Class) -> DEFINE_STANDARD_RTTI(Class, Base)
+DEFINE_STANDARD_RTTI(Class) -> DEFINE_STANDARD_RTTIEXT(Class, Base)
 ~~~~~

-2. Replaces forward declarations of collection classes previously generated from CDL generics (defined in TCollection package) by \#include of corresponding header:
+   @note If macro *DEFINE_STANDARD_RTTI* with two arguments (used in intermediate development versions of OCCT 7.0) is found, the script will convert it to either *DEFINE_STANDARD_RTTIEXT* or *DEFINE_STANDARD_RTTI_INLINE*. 
+   The former case is used if current file is header and source file with the same name is found in the same folder. 
+   In this case, macro *IMPLEMENT_STANDARD_RTTI* is injected in the corresponding source file.
+   The latter variant defines all methods for RTTI as inline, and does not require *IMPLEMENT_STANDARD_RTTIEXT* macro. 
+
+2. Replaces forward declarations of collection classes previously generated from CDL generics (defined in *TCollection* package) by inclusion of the corresponding header:
 ~~~~~
 class TColStd_Array1OfReal; -> #include <TColStd_Array1OfReal.hxx>
 ~~~~~

-3. Replaces underscored names of Handle classes by usage of a macro:
+3. Replaces underscored names of *Handle* classes by usage of a macro:
 ~~~~~
 Handle_Class -> Handle(Class)
 ~~~~~
-  This change is not applied if source or header file is recognized as containing definition of Qt class with signals or slots, to avoid possible compilation errors of MOC files caused by inability of MOC to recognize macros (see http://doc.qt.io/qt-4.8/signalsandslots.html).
-  The file is considered as defining Qt object if it contains strings "Q_OBJECT" and either "slots:" or "signals". 
+  This change is not applied if the source or header file is recognized as containing the definition of Qt class with signals or slots, to avoid possible compilation errors of MOC files caused by inability of MOC to recognize macros (see http://doc.qt.io/qt-4.8/signalsandslots.html).
+  The file is considered as defining a Qt object if it contains strings *Q_OBJECT* and either *slots:* or *signals:*. 

-4. Removes forward declarations of classes with names Handle(C) or Handle_C, replacing these either by forward declaration of its argument class, or (for files defining Qt objects) \#include statement for header with name of the argument class and extension .hxx:
+4. Removes forward declarations of classes with names <i>Handle(C)</i> or *Handle_C*, replacing them either by forward declaration of its argument class, or (for files defining Qt objects) <i>\#include</i> statement for a header with the name of the argument class and extension .hxx:
 ~~~~~
 class Handle(TColStd_HArray1OfReal); -> #include <TColStd_HArray1OfReal.hxx>
 ~~~~~

-5. Removes \#includes of files Handle_...hxx disappeared in OCCT 7.0:
+5. Removes <i> \#includes </i> of files <i>Handle_...hxx</i> that have disappeared in OCCT 7.0:
 ~~~~~
 #include <Handle_Geom_Curve.hxx> ->
 ~~~~~

-6. Removes typedef statements that use Handle macro to generate name:
+6. Removes *typedef* statements that use *Handle* macro to generate the name:
 ~~~~~
 typedef NCollection_Handle<Message_Msg> Handle(Message_Msg); ->
 ~~~~~

-7. Converts C-style casts applied to Handles to calls to DownCast() method:
+7. Converts C-style casts applied to Handles into calls to <i>DownCast()</i> method:
 ~~~~~
    ((Handle(A)&)b)     -> Handle(A)::DownCast(b)
    (Handle(A)&)b       -> Handle(A)::DownCast(b)
@@ -147,21 +154,23 @@ typedef NCollection_Handle<Message_Msg> Handle(Message_Msg); ->
    (*(Handle(A)*)&b)   -> Handle(A)::DownCast(b)
 ~~~~~

-8. Moves Handle() macro out of namespace scope:
+8. Moves <i>Handle()</i> macro out of namespace scope:
 ~~~~~
 Namespace::Handle(Class) -> Handle(Namespace::Class)
 ~~~~~

-9. Converts local variables of reference type initialized by temporary object returned by call to DownCast(), to non-references (to avoid using reference to destroyed memory):
+9. Converts local variables of reference type, which are initialized by a temporary object returned by call to <i>DownCast()</i>, to the variables of non-reference type (to avoid using references to destroyed memory):
 ~~~~~
    const Handle(A)& a = Handle(B)::DownCast (b); -> Handle(A) a (Handle(B)::DownCast (b));
 ~~~~~

-10. Adds \#include for all classes used as argument to macro STANDARD_TYPE(), except of already included ones;
+10. Adds  <i>\#include</i> for all classes used as argument to macro <i>STANDARD_TYPE()</i>, except for already included ones;

-11. Removes uses of obsolete macros IMPLEMENT_DOWNCAST() and IMPLEMENT_STANDARD_*().
+11. Removes uses of obsolete macros *IMPLEMENT_DOWNCAST* and *IMPLEMENT_STANDARD_*..., except *IMPLEMENT_STANDARD_RTTIEXT*.

-  > If you plan to keep compatibility of your code with older versions of OCCT, add option "-compat" to avoid the latter change. See also @ref upgrade_occt700_cdl_compat.
+    @note If you plan to keep compatibility of your code with older versions of OCCT, add option <i>-compat</i> to avoid this change. See also @ref upgrade_occt700_cdl_compat.
+
+.

 As long as the upgrade routine runs, some information messages are sent to the standard output. 
 In some cases the warnings or errors like the following may appear:
@@ -170,20 +179,20 @@ In some cases the warnings or errors like the following may appear:
  Error in {HEADER_FILE}: Macro DEFINE_STANDARD_RTTI used for class {CLASS_NAME} whose declaration is not found in this file, cannot fix
 ~~~~~

-Be sure to check carefully all reported errors and warnings, as corresponding places likely will require manual corrections.
-In some cases these messages may help you to detect errors in your code, for instance, cases where DEFINE_STANDARD_RTTI macro passes invalid class name as an argument.
+Be sure to check carefully all reported errors and warnings, as the corresponding code will likely require manual corrections.
+In some cases these messages may help you to detect errors in your code, for instance, cases where *DEFINE_STANDARD_RTTI* macro is used with incorrect class name as an argument.

@subsubsection upgrade_occt700_cdl_compiler Possible compiler errors

-Some situations requiring upgrade cannot be detected and / or handled by automatic procedure.
-If you get compiler errors or warnings when trying to build upgraded code, you will need to fix them manually. 
+Some situations requiring upgrade cannot be detected and / or handled by the automatic procedure.
+If you get compiler errors or warnings when trying to build the upgraded code, you will need to fix them manually. 
 The following paragraphs list known situations of this kind.

 #### Missing header files

-Use of handle objects (construction, comparison using operators == or !=, use of function STANDRAD_TYPE() and method DownCast()) now requires the type of the object pointed by Handle to be completely known at compile time. Thus it may be necessary to include header of the corresponding class to make the code compilable.
+The use of handle objects (construction, comparison using operators == or !=, use of function <i>STANDRAD_TYPE()</i> and method <i>DownCast()</i>) now requires the type of the object pointed by Handle to be completely known at compile time. Thus it may be necessary to include header of the corresponding class to make the code compilable.

-For example, the following lines will fail to compile if Geom_Line.hxx is not included:
+For example, the following lines will fail to compile if *Geom_Line.hxx* is not included:

 ~~~~~
 Handle(Geom_Line) aLine = 0;
@@ -198,8 +207,8 @@ This will eliminate the need to include the header *A* in each source file where

 #### Ambiguity of calls to overloaded functions

-This issue appears in compilers that do not support default arguments in template functions (known cases are Visual C++ 10 and 11): compiler reports ambiguity error if handle is used in argument of call to function that has two or move overloaded versions, accepting handles to different types. 
-The problem is that operator const handle<T2>& is defined for any type T2, thus compiler cannot make a right choice.
+This issue appears in the compilers that do not support default arguments in template functions (known cases are Visual C++ 10 and 11): the compiler reports an ambiguity error if a handle is used in the argument of a call to the function that has two or move overloaded versions, accepting handles to different types. 
+The problem is that operator  <i> const handle<T2>& </i> is defined for any type *T2*, thus the compiler cannot make the right choice.

 Example:
 ~~~~~
@@ -210,14 +219,16 @@ Handle(Geom_TrimmedCurve) aCurve = new Geom_TrimmedCurve (...);
 func (aCurve); // ambiguity error in VC++ 10
 ~~~~~

-To resolve this ambiguity, change your code so that argument type corresponds exactly to the function signature. 
-In some cases this can be done by using relevant type for the corresponding variable, like in the example above:
+Note that this problem does not appear if macro *OCCT_HANDLE_NOCAST* is used, see @ref upgrade_occt700_cdl_nocast "below".
+
+To resolve this ambiguity, change your code so that argument type should correspond exactly to the function signature. 
+In some cases this can be done by using the relevant type for the corresponding variable, like in the example above:

 ~~~~~
 Handle(Geom_Curve) aCurve = new Geom_TrimmedCurve (...);  
 ~~~~~

-Other variants are assigning the argument to local variable of correct type, using direct cast or constructor:
+Other variants consist in assigning the argument to a local variable of the correct type and using the direct cast or constructor:

 ~~~~~
 const Handle(Geom_Curve)& aGCurve (aTrimmedCurve);
@@ -226,12 +237,12 @@ func (static_cast(aCurve)); // OK - direct cast
 func (Handle(Geom_Curve)(aCurve)); // OK - temporary handle is constructed
 ~~~~~

-Another possibility is defining additional templated variant of the overloaded function causing ambiguity, and use SFINAE to resolve the ambiguity.
-For example of this technique, see definition of the template variant of the method IGESData_IGESWriter::Send().
+Another possibility consists in defining additional template variant of the overloaded function causing ambiguity, and using *SFINAE* to resolve the ambiguity.
+This technique can be illustrated by the definition of the template variant of method <i>IGESData_IGESWriter::Send()</i>.

 #### Lack of implicit cast to base type

-Due to the fact that now cast of handle to reference to handle to the base type is user-defined operation, conversions that require this cast combined with other user-defined cast will not be resolved automatically by compiler.
+As the cast of a handle to the reference to another handle to the base type has become a user-defined operation, the conversions that require this cast together with another user-defined cast will not be resolved automatically by the compiler.

 For example:

@@ -239,25 +250,35 @@ For example:
 Handle(Geom_Geometry) aC = GC_MakeLine (p, v); // compiler error
 ~~~~~

-The problem here is that class GCE2d_MakeSegment has user-defined conversion to const Handle(Geom_TrimmedCurve)&, which is not the same as type of the local variable aC.
+The problem is that the class *GCE2d_MakeSegment* has a user-defined conversion to <i>const Handle(Geom_TrimmedCurve)&,</i> which is not the same as the type of the local variable *aC*.

-To resolve this, use method Value():
+To resolve this, use method <i>Value()</i>:

 ~~~~~
 Handle(Geom_Geometry) aC = GC_MakeLine (p, v).Value(); // ok
 ~~~~~

-or use variable of appropriate type:
+or use variable of the appropriate type:

 ~~~~~
 Handle(Geom_TrimmedCurve) aC = GC_MakeLine (p, v); // ok
 ~~~~~

+With GCC compiler, similar problem appears when const handle to derived type is used to construct handle to base type via assignment (and in some cases in return statement), for instance:
+
+~~~~~
+  const Handle(Geom_Line) aLine;
+  Handle(Geom_Curve) c1 = aLine; // GCC error 
+  Handle(Geom_Curve) c2 (aLine); // ok
+~~~~~
+
+This problem is specific to GCC and it does not appear if macro *OCCT_HANDLE_NOCAST* is used, see @ref upgrade_occt700_cdl_nocast "below".
+
 #### Incorrect use of STANDARD_TYPE and Handle macros

 You might need to clean your code from incorrect use of macros *STANDARD_TYPE*() and *Handle*().

-1. Explicit definitions of static functions with names generated by macro STANDARD_TYPE(), which are artifacts of old implementation of RTTI, should be removed.
+1. Explicit definitions of static functions with names generated by macro *STANDARD_TYPE()*, which are artifacts of old implementation of RTTI, should be removed.
   
   Example:
 ~~~~~
@@ -268,7 +289,7 @@ const Handle(Standard_Type)& STANDARD_TYPE(math_GlobOptMin)
 }
 ~~~~~

-2. Incorrect location of closing parenthesis of Handle() macro that was not detectable in OCCT 6.x will cause compiler error and must be corrected.
+2. Incorrect location of closing parenthesis of *Handle()* macro that was not detectable in OCCT 6.x will cause a compiler error and must be corrected.

   Example (note misplaced closing parenthesis):
 ~~~~~
@@ -277,21 +298,21 @@ aBSpline = Handle( Geom2d_BSplineCurve::DownCast(BS->Copy()) );

 #### Use of class Standard_AncestorIterator

-Class Standard_AncestorIterator has been removed; use method Parent() of Standard_Type class to parse inheritance chain.
+Class *Standard_AncestorIterator* has been removed; use method *Parent()* of *Standard_Type* class to parse the inheritance chain.

 #### Absence of cast to Standard_Transient*

-Handles in OCCT 7.0 do not have operator of conversion to Standard_Transient*, which was present in earlier versions.
+Handles in OCCT 7.0 do not have the operator of conversion to <i>Standard_Transient*,</i> which was present in earlier versions.
 This is done to prevent possible unintended errors like this:

 ~~~~~
 Handle(Geom_Line) aLine = ...;
 Handle(Geom_Surface) aSurf = ...;
 ...
-if (aLine == aSurf) {...} // will cause compiler error in OCCT 7.0, but not OCCT 6.x
+if (aLine == aSurf) {...} // will cause a compiler error in OCCT 7.0, but not OCCT 6.x
 ~~~~~

-Places where this implicit cast has been used should be corrected manually.
+The places where this implicit cast has been used should be corrected manually.
 The typical situation is when Handle is passed to stream:

 ~~~~~
@@ -299,16 +320,42 @@ Handle(Geom_Line) aLine = ...;
 os << aLine; // in OCCT 6.9.0, resolves to operator << (void*) 
 ~~~~~

-Call method get() explicitly to output address of the Handle.
+Call method <i>get()</i> explicitly to output the address of the Handle.
+
+#### Method DownCast for non-base types
+
+Method *DownCast()* in OCCT 7.0 is made templated; if it is used with argument which is not a base class, "deprecated" compiler warning is generated.
+This is done to prevent possible unintended errors like this:
+
+~~~~~
+Handle(Geom_Surface) aSurf = ;
+Handle(Geom_Line) aLine = 
+  Handle(Geom_Line)::DownCast (aSurf); // will cause a compiler warning in OCCT 7.0, but not OCCT 6.x
+~~~~~
+
+The places where this cast has been used should be corrected manually.
+
+If down casting is used in a template context where argument can have the same or unrelated type so that *DownCast()* may be not available in all cases, use C++ *dynamic_cast<>* instead, e.g.: 
+
+~~~~~
+template <class T>
+bool CheckLine (const Handle(T) theArg)
+{
+  Handle(Geom_Line) aLine = dynamic_cast<Geom_Line> (theArg.get());
+  ...
+}
+~~~~~

@subsubsection upgrade_occt700_cdl_runtime Possible runtime problems

-Known situations when problems are possible at run time after upgrade to OCCT 7.0 are listed here.
+Here is the list of known possible problems at run time after the upgrade to OCCT 7.0.

 #### References to temporary objects

-In previous versions, compiler was able to detect situation when local variable of reference type to Handle is initialized by temporary object, and ensured that lifetime of that object is longer than that of the variable. 
-Since OCCT 7.0, it will not work if types of the temporary object and variable are different (due to involvement of user-defined type cast), thus such temporary object will be destroyed immediately.
+In previous versions, the compiler was able to detect the situation when a local variable of a "reference to a Handle" type is initialized by temporary object, and ensured that lifetime of that object is longer than that of the variable. 
+In OCCT 7.0 with default options, it will not work if types of the temporary object and variable are different (due to involvement of user-defined type cast), thus such temporary object will be destroyed immediately.
+
+This problem does not appear if macro *OCCT_HANDLE_NOCAST* is used during compilation, see below.

 Example:

@@ -319,49 +366,93 @@ Handle(Geom_TrimmedCurve)::DownCast(aCurve);
 aBC->Transform (T); // access violation in OCCT 7.0
 ~~~~~

+@subsubsection upgrade_occt700_cdl_nocast Option to avoid cast of handle to reference to base type
+
+In OCCT 6.x and earlier versions the handle classes formed a hierarchy echoing hierarchy of corresponding object classes.
+This automatically enabled possibility to use handle to derived class in all contexts where handle to base class was needed, e.g. pass it in function by reference without copying:
+
+~~~~
+Standard_Boolean GetCurve (Handle(Geom_Curve)& theCurve);
+....
+Handle(Geom_Line) aLine;
+if (GetCurve (aLine)) {
+  // use aLine, unsafe
+}
+~~~~
+
+This feature was used in multiple places in OCCT and dependent projects.
+However it is potentially unsafe: in the above example no checks are done at compile time or at run time to ensure that argument handle is assigned a type compatible with the type of handle passed as argument. 
+If object of incompatible type (e.g. Geom_Circle) is assigned to *theCurve*, the behavior will be unpredictable.
+
+For compatibility with existing code, by default OCCT 7.0 keeps this possibility, providing operators of type cast to handle to base type.
+Besides being unsafe, in specific situations this feature may cause compile-time or run-time errors as described above.
+
+In order to provide safer behavior, this feature can be disabled by defining a compile-time macro *OCCT_HANDLE_NOCAST*.
+When it is defined, constructors and assignment operators are defined (instead of type cast operators) to convert from handle to defived type to handle to base type.
+This implies creation of temporary objects and hence may be more expensive at run time in some circumstances, however this way is more standard, safer, and in general recommended.
+
+The code that relies on possibility of casting to base should be amended so that handle of argument type is always used in function call, and to use DownCast() to safely convert the result to desired type.
+For instance, the code from the example below can be changed as follows:
+
+~~~~~
+Handle(Geom_Line) aLine;
+Handle(Geom_Curve) aCurve;
+if (GetCurve (aCure) && !(aLine = Handle(Geom_Line)::DownCast (aCurve)).IsNull()) {
+  // use aLine safely
+}
+~~~~~
+
@subsubsection upgrade_occt700_cdl_compat Preserving compatibility with OCCT 6.x

-If you like to preserve compatibility of your application code with OCCT versions 6.x even after upgrade to 7.0, consider the following suggestions:
+If you like to preserve the compatibility of your application code with OCCT versions 6.x even after the upgrade to 7.0, consider the following suggestions:

-1. When running automatic upgrade tool, add option *-compat*.
+1. If your code used sequences of macros *IMPLEMENT_STANDARD_*... generated by WOK, replace them by single macro *IMPLEMENT_STANDARD_RTTIEXT*

-2. In order to overcome incompatibility of macro DEFINE_STANDARD_RTTI which has additional argument in OCCT 7.0, you can replace (after upgrade) its use in your code by your own version-dependent macro, which resolves to either 6.x or 7.x version.
+2. When running automatic upgrade tool, add option <i>-compat</i>.
+
+3. Define macros *DEFINE_STANDARD_RTTIEXT* and *DEFINE_STANDARD_RTTI_INLINE* when building with previous versions of OCCT, resolving to *DEFINE_STANDARD_RTTI* with single argument 

   Example:
 ~~~~~   
 #if OCC_VERSION_HEX < 0x070000
-  #define DEFINE_STANDARD_RTTI_COMPAT(C1,C2) DEFINE_STANDARD_RTTI(C1) 
-#else
-  #define DEFINE_STANDARD_RTTI_COMPAT(C1,C2) DEFINE_STANDARD_RTTI(C1,C2) 
+  #define DEFINE_STANDARD_RTTIEXT(C1,C2) DEFINE_STANDARD_RTTI(C1)
+  #define DEFINE_STANDARD_RTTI_INLINE(C1,C2) DEFINE_STANDARD_RTTI(C1)
 #endif
 ~~~~~

@subsubsection upgrade_occt700_cdl_wok Applications based on CDL and WOK

-If you have application essentially based on CDL, and need to upgrade it to OCCT 7.0, you will very likely need to convert your application code to non-CDL form.
-This is non-trivial effort; the required actions would depend strongly on the structure of the code and used features of CDL.
+If your application is essentially based on CDL, and you need to upgrade it to OCCT 7.0, you will very likely need to convert your application code to non-CDL form.
+This is a non-trivial effort; the required actions would depend strongly on the structure of the code and used CDL features.

-The upgrade script and sources of specialized version of WOK used for upgrading OCCT code can be found in WOK Git repository in branch [CR0_700_2](http://git.dev.opencascade.org/gitweb/?p=occt-wok.git;a=log;h=refs/heads/CR0_700_2).
+The upgrade script and sources of a specialized WOK version used for OCCT code upgrade can be found in WOK Git repository in branch [CR0_700_2](http://git.dev.opencascade.org/gitweb/?p=occt-wok.git;a=log;h=refs/heads/CR0_700_2).

 [Contact us](http://www.opencascade.com/contact/) if you need more help.

@subsection upgrade_occt700_bspline Separation of BSpline cache

-Implementation of NURBS curves and surfaces has been revised: cache of polynomial coefficients, used to accelerate calculate values of B-spline, is separated from data objects (Geom2d_BSplineCurve, Geom_BSplineCurve, Geom_BSplineSurface), into dedicated classes (BSplCLib_Cache and BSplSLib_Cache). 
+Implementation of NURBS curves and surfaces has been revised: the cache of polynomial coefficients, which is used to accelerate calculate values of B-spline, has been separated from data objects *Geom2d_BSplineCurve, Geom_BSplineCurve* and *Geom_BSplineSurface* into the dedicated classes *BSplCLib_Cache* and *BSplSLib_Cache*. 

 The benefits of this change are:
-
 * Reduced memory footprint of OCCT shapes (up to 20% on some cases)
 * Possibility to evaluate the same B-Spline concurrently in parallel threads without data races and mutex locks 

-The drawback is that direct evaluation of B-Splines using methods of curves and surfaces becomes slower, due to absence of cache. The way to avoid slow down is to use adaptor classes (Geom2dAdaptor_Curve, GeomAdaptor_Curve and GeomAdaptor_Surface): they now use cache when the curve or surface is a B-spline.
+The drawback is that direct evaluation of B-Splines using methods of curves and surfaces becomes slower due to the absence of cache. The slow-down can be avoided by using adaptor classes *Geom2dAdaptor_Curve, GeomAdaptor_Curve* and *GeomAdaptor_Surface*, which now use cache when the curve or surface is a B-spline.

-OCCT algorithms are changed to use adaptors for B-spline calculations instead of direct methods of curves and surfaces.
-The same changes (use of adaptors instead of direct call to curve and surface methods) should be implemented in relevant places in applications based on OCCT in order to get maximum performance.
+OCCT algorithms have been changed to use adaptors for B-spline calculations instead of direct methods for  curves and surfaces.
+The same changes (use of adaptors instead of direct call to curve and surface methods) should be implemented in relevant places in the applications based on OCCT to get the maximum performance.
+
+@subsection upgrade_occt700_booleanresult Structural result of Boolean operations
+
+The result of Boolean operations became structured according to the structure of the input shapes. Therefore it may impact old applications that always iterate on direct children of the result compound assuming to obtain solids as iteration items, regardless of the structure of the input shapes. In order to get always solids as iteration items it is recommended to use TopExp_Explorer instead of TopoDS_Iterator.
+
+@subsection upgrade_occt700_brepextrema BRepExtrema_ExtCC finds one solution only
+
+Extrema computation between non-analytical curves in shape-shape distance calculation algorithm has been changed in order to return only one solution. So, if e.g. two edges are created on parallel b-spline curves the algorithm BRepExtrema_DistShapeShape will return only one solution instead of enormous number of solutions. There is no way to get algorithm working in old manner.

@subsection upgrade_occt700_sorttools Removal of SortTools package

-Package SortTools has been removed. 
+Package *SortTools* has been removed. 
 The code that used the tools provided by that package should be corrected manually.
 The recommended approach is to use sorting algorithms provided by STL.

@@ -382,22 +473,22 @@ can be replaced by:
 ...
 TCollection_Array1OfReal aValues = ...;
 ...
-std::stable_sort (aValues->begin(), aValues->end());
+std::stable_sort (aValues.begin(), aValues.end());
 ~~~~~

@subsection upgrade_occt700_2dlayers On-screen objects and ColorScale

-Old mechanism for rendering Underlay and Overlay on-screen 2D objects based on Visual3d_Layer and immediate drawing model (e.g. uncached and thus slow) have been removed.
-Classes Aspect_Clayer2d, OpenGl_GraphicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr, V3d_LayerMgrPointer have been deleted.
+The old mechanism for rendering Underlay and Overlay on-screen 2D objects based on *Visual3d_Layer* and immediate drawing model (uncached and thus slow) has been removed.
+Classes *Aspect_Clayer2d, OpenGl_GraphicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr* and *V3d_LayerMgrPointer* have been deleted.

-General AIS interactive objects with transformation persistence flag Graphic3d_TMF_2d can be used as replacement of Visual3d_LayerItem.
-Anchor point specified for transformation persistence defines a corner of window (or center in case of (0, 0) point).
-To keep on-screen 2D objects on the top of main screen, them could be assigned to appropriate Z-layer.
-Predefined Z-layers Graphic3d_ZLayerId_TopOSD and Graphic3d_ZLayerId_BotOSD are intended to replace Underlay and Overlay layers within old API.
+General AIS interactive objects with transformation persistence flag *Graphic3d_TMF_2d* can be used as a replacement of *Visual3d_LayerItem*.
+The anchor point specified for transformation persistence defines the window corner of  (or center in case of (0, 0) point).
+To keep on-screen 2D objects on top of the main screen, they can be assigned to the appropriate Z-layer.
+Predefined Z-layers *Graphic3d_ZLayerId_TopOSD* and *Graphic3d_ZLayerId_BotOSD* are intended to replace Underlay and Overlay layers within the old API.

-ColorScale object previously implemented using Visual3d_LayerItem has been moved to a new class AIS_ColorScale, with width and height specified explicitly.
-The property of V3d_View storing global ColorScale object has been removed with associated methods V3d_View::ColorScaleDisplay(), V3d_View::ColorScaleErase(), V3d_View::ColorScaleIsDisplayed(), V3d_View::ColorScale() and classes V3d_ColorScale, V3d_ColorScaleLayerItem, Aspect_ColorScale.
-Here is an example of creating ColorScale using updated API:
+*ColorScale* object previously implemented using *Visual3d_LayerItem* has been moved to a new class *AIS_ColorScale*, with width and height specified explicitly.
+The property of *V3d_View* storing the global *ColorScale* object has been removed with associated methods *V3d_View::ColorScaleDisplay(), V3d_View::ColorScaleErase(), V3d_View::ColorScaleIsDisplayed()* and *V3d_View::ColorScale()* as well as the classes *V3d_ColorScale, V3d_ColorScaleLayerItem* and *Aspect_ColorScale*.
+Here is an example of creating *ColorScale* using the updated API:

 ~~~~~
 Handle(AIS_ColorScale) aCS = new AIS_ColorScale();
@@ -414,14 +505,14 @@ aCS->SetToUpdate();
 theContextAIS->Display (aCS);
 ~~~~~

-To see how 2d objects are realized in OCCT you can call draw commands vcolorscale, vlayerline or vdrawtext (with -2d option).
-Draw command vcolorscale now requires a name of ColorScale object as an argument.
-To display this object use command vdisplay. Example:
+To see how 2d objects are implemented in OCCT you can call Draw commands *vcolorscale, vlayerline* or *vdrawtext* (with <i>-2d</i> option).
+Draw command *vcolorscale* now requires the name of *ColorScale* object as argument.
+To display this object use command *vdisplay*. For example:

 ~~~~~
 pload VISUALIZATION
 vinit
-vcolorscale cs –demo
+vcolorscale cs -demo
 pload MODELING
 box b 100 100 100
 vdisplay b
@@ -431,7 +522,7 @@ vlayerline 0 300 300 300 10
 vdrawtext t "2D-TEXT" -2d -pos 0 150 0 -color red
 ~~~~~

-Here is a small example in c++ how to display a custom AIS object in 2d:
+Here is a small example in C++ illustrating how to display a custom AIS object in 2d:
 ~~~~~
 Handle(AIS_InteractiveContext) aContext = ...;
 Handle(AIS_InteractiveObject) anObj =...; // create an AIS object
@@ -444,39 +535,37 @@ aContext->Display (anObj); // display the object

 #### Visual3d package

-Package Visual3d implementing intermediate layer between high-level V3d classes
+Package *Visual3d* implementing the intermediate layer between high-level *V3d* classes
 and low-level OpenGl classes for views and graphic structures management has been dropped.

-The OpenGl_View inherits from the new class Graphic3d_CView.
-Graphic3d_CView is an interface class that declares abstract methods for managing displayed structures,
+The *OpenGl_View* inherits from the new class *Graphic3d_CView*.
+*Graphic3d_CView* is an interface class that declares abstract methods for managing displayed structures,
 display properties and a base layer code that implements computation
 and management of HLR (or more broadly speaking view-depended) structures.

-In new implementation it takes place of eliminated Visual3d_View.
-As before the instance of Graphic3d_CView is still completely managed by V3d_View classes.
-It can be accessed through V3d_View interface but normally this should not be required as all its methods are completely wrapped.
+In the new implementation it takes place of the eliminated *Visual3d_View*.
+As before the instance of *Graphic3d_CView* is still completely managed by *V3d_View* classes.
+It can be accessed through *V3d_View* interface but normally it should not be required as all its methods are completely wrapped.

-In more details, a concrete specialization of Graphic3d_CView is created and returned by graphical driver on request.
-Right after creation the views is directly used for setting rendering properties and adding graphical structures to be displayed.
+In more details, a concrete specialization of *Graphic3d_CView* is created and returned by the graphical driver on request.
+Right after the creation the views are directly used for setting rendering properties and adding graphical structures to be displayed.

 The rendering of graphics is possible after mapping a window and activating the view.
-The direct setting of properties makes obsolete usage of intermediate structures with display parameter
-like Visual3d_ContextView and etc (the whole package of Visual3d become redundant).
+The direct setting of properties obsoletes the use of intermediate structures with display parameter
+like *Visual3d_ContextView*, etc. This means that the whole package *Visual3d* becomes redundant.

-New location of functionality previously provided by Visual3d package:
- Logic of managing display of structures was put from Visual3d_ViewManager into Graphic3d_StructureManager.
- Removed Visual3d_View class. Logic of managing computed structures was put into base layer of Graphi3d_CView.
- Removed all intermediate structures for storing view parameters e.g. Visual3d_ContextView.
-  All settings are kept by instances of Graphic3d_CView
- Removed Visual3d_Light intermediate class.
-  All light properties are still stored in Graphic3d_CLight structure.
-  The structure is directly access by instance of V3d_Light classes.
- Moved all needed enumerations into Graphic3d package.
+The functionality previously provided by *Visual3d* package has been redesigned in the following way :
+- The management of display of structures has been moved from *Visual3d_ViewManager* into *Graphic3d_StructureManager*.
+- The class *Visual3d_View* has been removed. The management of computed structures has been moved into the base layer of *Graphi3d_CView*.
+- All intermediate structures for storing view parameters, e.g. *Visual3d_ContextView*, have been removed.
+  The settings are now kept by instances of *Graphic3d_CView*.
+- The intermediate class *Visual3d_Light* has been removed. All light properties are stored in *Graphic3d_CLight* structure, which is directly accessed by instances of *V3d_Light* classes.
+- All necessary enumerations have been moved into *Graphic3d* package.

 #### Custom OpenGL rendering and UserDraw

-Old APIs based on global callback functions for creating UserDraw objects and for performing custom OpenGL rendering within the view have been dropped.
-UserDraw callbacks no more required since OpenGl_Group now inherits Graphic3d_Group and thus can be accessed directly from AIS_InteractiveObject:
+Old APIs based on global callback functions for creating *UserDraw* objects and for performing custom OpenGL rendering within the view have been dropped.
+*UserDraw* callbacks are no more required since *OpenGl_Group* now inherits *Graphic3d_Group* and thus can be accessed directly from *AIS_InteractiveObject*:

 ~~~~~
 //! Class implementing custom OpenGL element.
@@ -502,7 +591,7 @@ void UserDrawObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrs
 }
 ~~~~~

-For performing custom OpenGL code within view, user should inherit from class OpenGl_View.
+To perform a custom OpenGL code within the view, it is necessary to inherit from class *OpenGl_View*.
 See the following code sample:

 ~~~~~
@@ -556,7 +645,27 @@ public:

@subsection upgrade_occt700_localcontext Deprecation of Local Context

-Conception of Local Context has been deprecated.
-Related classes (AIS_LocalContext) and methods (AIS_InteractiveContext::OpenLocalContext() and others) will be removed within some future OCCT release.
+The conception of Local Context has been deprecated.
+The related classes, e.g. *AIS_LocalContext*, and methods ( <i>AIS_InteractiveContext::OpenLocalContext()</i> and others) will be removed in a future OCCT release.

 The main functionality provided by Local Context - selection of object subparts - can be now used within Neutral Point without opening any Local Context.
+
+@subsection upgrade_occt700_separate_caf_visualisation Separation of visualization part from TKCAF
+
+Visualization CAF attributes moved into new toolkit TKVCAF. 
+If your application uses the classes from TPrsStd package then add link to TKVCAF library.
+
+Verson numbers of BinOCAF and XmlOCAF formats are incremented; new files cannot be read by previous versions of OCCT.
+
+For loading OCAF files saved by previous versions and containing attribute TPrsStd_AISPresentation it is necessary that environment variable CSF_MIGRATION_TYPES should be defined, pointing to file src/StdResources/MigrationSheet.txt.
+When using documents loaded from a file, make sure to call method TPrsStd_AISViewer::New() prior to accessing TPrsStd_AISPresentation attributes in this document (that method will create them).
+
+
+@subsection Correction of interpretation of Euler angles in gp_Quaternion
+
+Conversion of gp_Quaternion to and from intrinsic Tait-Bryan angles (including gp_YawPitchRoll) is fixed.
+
+Before that fix the sequence of rotation axes was opposite to intended; e.g. gp_YawPitchRoll (equivalent to gp_Intrinsic_ZYX) actually was defining intrinsic rotations around X, then Y, then Z.
+Now this is fixed, and rotations are made in correct order.
+
+Applications that use gp_Quaternion to convert Yaw-Pitch-Roll angles (or other intrinsic Tait-Bryan sequences) may need to be updated to take this change into account.
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -59,8 +59,8 @@ OPEN CASCADE S.A.S.

 **Mac** and the Mac logo are trademarks of Apple Inc., registered in the U.S. and other countries.

- Acknowledgements
------------------
+ Acknowledgments
+-----------------

 The following parties are acknowledged for producing tools which are used within 
 Open CASCADE Technology libraries or for release preparation.
@@ -115,7 +115,7 @@ implementation of 3D viewer. OpenGL specification is developed by the
 Khronos group, http://www.khronos.org/opengl/. OCCT code includes header 
 file *glext.h* obtained from Khronos web site.

-**VTK** - The **Visualization Toolkit (VTK)** is an open-source, freely available software system for 3D computer graphics, image processing and visualization. OCCT VIS component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library. If you need further information on VTK, please, refer to VTK Homepage http://www.vtk.org/.
+**VTK** -- The **Visualization Toolkit (VTK)** is an open-source, freely available software system for 3D computer graphics, image processing and visualization. OCCT VIS component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library. If you need further information on VTK, please, refer to VTK Homepage http://www.vtk.org/.

 **Doxygen** developed by Dimitri van Heesch is open source documentation system for 
 C++, C, Java, Objective-C, Python, IDL, PHP and C#. This product is used in Open CASCADE Technology 
@@ -158,7 +158,7 @@ OCCT documentation is provided in several forms:
  which is a freeware and can be downloaded from the Adobe site. 

 - Full reference documentation covering all OCCT classes generated automatically by Doxygen 
-  software is provided in HTML format, in a separate package. 
+  software is provided in HTML format. 
  Reference documentation is presented in **Modules --> Toolkits --> Packages --> Classes** 
  logic structure with cross-references to all OCCT classes and complete in-browser search by all classes.

@@ -191,90 +191,64 @@ Linux (x86-64), MAC OS X (x86-64) and Android (4.0.4 armv7) platforms.
 The tables below describe the recommended hardware and software configurations
 for which OCCT is certified to work.

-@subsection OCCT_OVW_SECTION_5_1 Linux
+@subsection overview_req_os Operating System

-| Operating System  | Mandriva 2010, CentOS 5.5, CentOS 6.3, Fedora 17, Fedora 18, Ubuntu 13.04, Debian 6.0\*  |
-| ----- | ----- |
-| Minimum memory    | 512 MB, 1 GB recommended |
-| Free disk space (complete installation) | 600 MB approx. |
-| Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
-| C++      | GNU gcc 4.0.  - 4.7.3. |
-| TCL (for testing tools)    | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html |
-| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
-| Freetype (for text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (optional, for export contents of OCCT viewer to vector graphic files) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| VTK (for VTK Integration Services | VTK 6.1.0 http://www.vtk.org/VTK/resources/software.html |
+| OS        | Versions |
+| --------- | ----------- |
+| Windows   | 10, 8.1, 7 SP1, Vista SP2 |
+| Linux     | Mandriva 2010, CentOS 6.3, Fedora 18, Ubuntu 14.10 - 15.10, Debian 6.0, Debian 7.0 |
+| OS X      | 10.10 Yosemite / 10.9 Mavericks / 10.8 Mountain Lion / 10.7 Lion |
+| Android   | 6.x, 5.x, 4.0.4+ |

-* Debian 6.0 64 bit is a platform used for regular testing of contributions
+@subsection overview_req_cpp C++ Compiler / IDE

-@subsection OCCT_OVW_SECTION_5_2 Windows
+| OS        | Compiler |
+| --------- | ----------- |
+| Windows   | Microsoft Visual Studio: 2010 SP1\*, 2012 Update 4, 2013 Update 5, 2015 <br> Intel C++ Composer XE 2013 SP1 |
+| Linux     | GNU gcc 4.3+ <br> LLVM CLang 3.6+ |
+| OS X      | XCode 6 or newer |
+| Android   | NDK r10, GNU gcc 4.8 or newer |

-| Operating System | Windows 8.1 / 7 SP1 / Vista SP2 / XP SP3 |
-| ----- | ----- |
-| Minimum memory    | 512 MB, 1 GB recommended |
-| Free disk space (complete installation) | 600 MB approx. |
-| Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
-| C++ | Microsoft Visual Studio: 2005 SP1, 2008 SP1, 2010 SP1 \*, 2012 Update 3, 2013 <br>Intel C++ Composer XE 2013 SP1 |
-| TCL (for testing tools) | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html  |
-| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| VTK (for VTK Integration Services | VTK 6.1.0 http://www.vtk.org/VTK/resources/software.html |
-
-* VC++ 10 64-bit is used for certification of contributions and for building 
+* VC++ 10 64-bit is used for regular testing and for building 
  binary package of official release of OCCT on Windows.

-@subsection OCCT_OVW_SECTION_5_3 MAC OS X
+@subsection overview_req_libs Third-party libraries

-| Operating System | OS X 10.10 Yosemite / 10.9 Mavericks / 10.8 Mountain Lion / 10.7 Lion / 10.6.8 Snow Leopard |
-| ----- | ----- |
+| Component | Requirement |
+| --------- | ----------- |
+| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ <br> Direct3D 9 |
+| Qt (for samples and demos) | Desktop: Qt 4.8.6+ http://www.qt.io/download/ <br> Android: Qt 5.3.2+ http://www.qt.io/download/ |
+| TCL (for testing tools)    | Tcl/Tk 8.6.3+ http://www.tcl.tk/software/tcltk/download.html |
+| Freetype (for text rendering) | freetype-2.5.3+ http://sourceforge.net/projects/freetype/files/ |
+| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.16.0+ http://sourceforge.net/projects/freeimage/files |
+| gl2ps (optional, for export contents of OCCT viewer to vector formats) | gl2ps-1.3.8+  http://geuz.org/gl2ps/ |
+| Intel TBB (optional, for multithreaded algorithms) | TBB 4.x or 5.x http://www.threadingbuildingblocks.org/ |
+| VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/VTK/resources/software.html |
+
+@subsection overview_req_hw Hardware
+
+| Component | Requirement |
+| --------- | ----------- |
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
-| C++      | XCode 3.2 or newer (4.x is recommended) |
-| TCL (for testing tools)    | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html |
-| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |

-@subsection OCCT_OVW_SECTION_5_4 Android
-
-| Operating System  | Android 4.0.4+  |
-| ----- | ----- |
-| Minimum memory | 512 MB, 1 GB recommended |
-| C++      | NDK r10, GNU gcc 4.8 or newer |
-| Qt (for demonstration tools) | Qt 5.3.2 http://qt-project.org/downloads |
-| Freetype (for text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
-
-@subsection overview_req_graphics Graphic cards
-
-On desktop, 3D viewer requires graphic card or software implementation supporting OpenGL 1.1 or above. OpenGL 2.1+ is highly recommended.
-Ray tracing requires OpenGL 4.0+ or OpenGL 3.1+ with GL_ARB_texture_buffer_object_rgb32 extension. Textures within ray tracing will be available only when GL_ARB_bindless_texture extension is provided by driver.
+On desktop, 3D viewer for optimal performance requires graphics processing unit (GPU) supporting OpenGL 3.3 or above. 
+Ray tracing requires OpenGL 4.0+ or OpenGL 3.3+ with GL_ARB_texture_buffer_object_rgb32 extension.
+Textures within ray tracing will be available only when GL_ARB_bindless_texture extension is provided by driver.

 On mobile platforms, OpenGL ES 2.0+ is required for 3D viewer. The ray tracing is not yet available on mobile platforms.
 Some old hardware might be unable to execute complex GLSL programs (e.g. with high number of light sources, clipping planes).

 The following table lists graphic cards tested to work with OCCT.

-| Graphic card                     | Driver                           | OS                         | OpenGL (fixed pipeline) | OpenGL (shaders) | OpenGL (ray tracing) |
+| Graphic card  | Driver | OS | OpenGL (fixed pipeline) | OpenGL (shaders) | OpenGL (ray tracing) |
 | ---- | ---- | ---- | :----: | :----: | :----: |
 | NVIDIA GeForce GTX 650     | Driver 340.52, OpenGL 4.4        | Windows 7 64 bit           | OK | OK  | OK |
 | AMD/ATI RadeOn HD 7870     | Driver 14.100, OpenGL 4.4        | Windows 7 64-bit           | OK | OK  | OK |
 | Intel(R) HD Graphics 2500  | Driver 10.18.10.3621, OpenGL 4.0 | Windows 7 64 bit           | OK | OK  | limited (no textures) |
-| RadeOn 9600                | OpenGL 2.1.8454                  | Windows XP 32-bit          | OK | bad | unsupported by hardware |
-| NVIDIA GeForce 6600 GT     | OpenGL 2.1                       | Windows XP 32-bit          | OK | OK  | unsupported by hardware |
 | NVIDIA GeForce 320         | N/A                              | Mac OS X 10.6 / OS X 10.10 | OK | OK  | not yet supported by OCCT |
 | Apple software OpenGL      | N/A                              | Mac OS X 10.6 / OS X 10.10 | OK | OK  | N/A |
-| Mesa 10.2.4 \*             | "Gallium 0.4 on llvmpipe (LLVM 3.4, 256 bits)" OpenGL 3.0 | Windows 7 64 bit   | OK | OK  | unsupported by software |
-
-* Mesa implementation of OpenGL is used for certification testing of OCCT
+| Mesa 10.2.4 (software emulator) | "Gallium 0.4 on llvmpipe (LLVM 3.4, 256 bits)" OpenGL 3.0 | Windows 7 64 bit   | OK | OK  | unsupported by software |

@section OCCT_OVW_SECTION_4 Installation

@@ -338,7 +312,7 @@ To run any Open CASCADE Technology application you need to set the environment v

 You can define the environment variables with env.bat script located in the 
 $CASROOT folder. This script accepts two arguments to be used: 
-the version of Visual Studio (vc8 - vc12) and the architecture (win32 or win64).
+the version of Visual Studio (vc8 -- vc12) and the architecture (win32 or win64).

 The additional environment settings necessary for compiling OCCT libraries and samples 
 by Microsoft Visual Studio can be set using script custom.bat located in the same folder. 
@@ -595,9 +569,9 @@ There are two samples are representing usage OCCT framework on Android mobile pl
 jniviewer
@image html /overview/images/samples_java_android_occt.jpg
@image latex /overview/images/samples_java_android_occt.jpg
-Java - See \subpage samples_java_android_occt "Readme" for details.
+Java -- See \subpage samples_java_android_occt "Readme" for details.

 AndroidQt
@image html /overview/images/samples_qml_android_occt.jpg
@image latex /overview/images/samples_qml_android_occt.jpg
-Qt - See \subpage samples_qml_android_occt "Readme" for details.
+Qt -- See \subpage samples_qml_android_occt "Readme" for details.
--- a/dox/resources/occt_logo.png
+++ b/dox/resources/occt_logo.png
--- a/dox/resources/occt_pdf_template.tex
+++ b/dox/resources/occt_pdf_template.tex
@@ -97,7 +97,7 @@
 \fi
 \hypersetup{%
  colorlinks=true,%
-  linkcolor=black,%
+  linkcolor=blue,%
  citecolor=black,%
  urlcolor=blue,%
  unicode%
@@ -127,10 +127,12 @@
 \end{titlepage}
 \clearpage
 \pagenumbering{roman}
-\tableofcontents
 \newpage
 \pagenumbering{arabic}
-\hypersetup{pageanchor=true}
+    \begingroup
+    \hypersetup{pageanchor=true, linkcolor=black, colorlinks=true}
+    \tableofcontents
+    \endgroup

 \let\stdsection\section
  \renewcommand\section{\pagebreak\stdsection}
--- a/dox/resources/occt_ug_pdf.doxyfile
+++ b/dox/resources/occt_ug_pdf.doxyfile
@@ -41,7 +41,7 @@ GENERATE_TREEVIEW      = NO
 PREDEFINED             = PDF_ONLY
 GENERATE_LATEX         = YES
 COMPACT_LATEX          = YES
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = YES
 LATEX_OUTPUT           = latex
--- a/dox/technical_overview/technical_overview.md
+++ b/dox/technical_overview/technical_overview.md
@@ -75,13 +75,13 @@ Geometry types and utilities provide geometric data structures and services for:
 * Calculation of extrema between geometric objects. 
  
 Topology defines relationships between simple geometric entities.  A shape, which is a basic topological entity, can be divided into components (sub-shapes):
- * Vertex – a zero-dimensional shape corresponding to a point;
- * Edge - a shape corresponding to a curve and bounded by a vertex at each extremity;
- * Wire - a sequence of edges connected by their vertices;
- * Face - a part of a plane (in 2D) or a surface (in 3D) bounded by wires;
- * Shell - a collection of faces connected by edges of their wire boundaries;
- * Solid - a finite closed part of 3D space bounded by shells;
- * Compound solid - a collection of solids connected by faces of their shell boundaries.
+ * Vertex -- a zero-dimensional shape corresponding to a point;
+ * Edge -- a shape corresponding to a curve and bounded by a vertex at each extremity;
+ * Wire -- a sequence of edges connected by their vertices;
+ * Face -- a part of a plane (in 2D) or a surface (in 3D) bounded by wires;
+ * Shell -- a collection of faces connected by edges of their wire boundaries;
+ * Solid -- a finite closed part of 3D space bounded by shells;
+ * Compound solid -- a collection of solids connected by faces of their shell boundaries.

 Complex shapes can be defined as assemblies of simpler entities.

@@ -123,9 +123,9 @@ Top-level API provides the following functionality:
 	* Spheres;
 	* Toruses.
 * Kinematic Modeling: 
-	* Prisms - linear sweeps;
-	* Revolutions - rotational sweeps;
-	* Pipes - general-form sweeps;
+	* Prisms -- linear sweeps;
+	* Revolutions -- rotational sweeps;
+	* Pipes -- general-form sweeps;
 	* Lofting.

@figure{/technical_overview/images/0001.png "Shapes containing pipes with variable radius produced by sweeping"}  
@@ -285,10 +285,7 @@ OCAF differs from any other CAD framework in the organization of application dat

 OCAF organizes and embeds these attributes in a document. OCAF documents, in their turn, are managed by an OCAF application.

-For more details see @ref occt_user_guides__ocaf "OCAF User's Guide" and the OCAF white papers:
-* @ref occt_user_guides__ocaf_wp "Application Framework"
-* @ref occt_user_guides__ocaf_tree_wp "Distribution of Data through OCAF Tree"
-* @ref occt_user_guides__ocaf_functionmechanism_wp "Application Framework Function Mechanism"
+For more details see @ref occt_user_guides__ocaf "OCAF User's Guide". 

 See also: our <a href="http://www.opencascade.com/content/tutorial-learning">E-learning & Training</a> offerings.

--- a/dox/user_guides/boolean_operations/boolean_operations.md
+++ b/dox/user_guides/boolean_operations/boolean_operations.md
@@ -30,12 +30,12 @@ The operator can be represented as:
 <i>R<sub>B</sub>=B<sub>j</sub> (G<sub>1</sub>, G<sub>2</sub>),</i>	

 where:
-* *R<sub>B</sub>* - result of the operation;
-* *B<sub>j</sub>* - operation of type *j* (Common, Fuse, Cut);
+* *R<sub>B</sub>* -- result of the operation;
+* *B<sub>j</sub>* -- operation of type *j* (Common, Fuse, Cut);
 * *G<sub>1</sub>={S<sub>11</sub>, S<sub>12</sub> ... S<sub>1n1</sub>}*  group of arguments (Objects); 
 * *G<sub>2</sub>={S<sub>21</sub>, S<sub>22</sub> ... S<sub>2n2</sub>}*  group of arguments (Tools);
-* *n<sub>1</sub>* - Number of arguments in *Objects* group; 
-* *n<sub>2</sub>* - Number of arguments in *Tools* group.
+* *n<sub>1</sub>* -- Number of arguments in *Objects* group; 
+* *n<sub>2</sub>* -- Number of arguments in *Tools* group.


 **Note** There is an operation *Cut21*, which is an extension for forward Cut operation, i.e <i>Cut21=Cut(G2, G1)</i>.
@@ -49,9 +49,9 @@ The GFA operator can be represented as:
 <i>R<sub>GF</sub> = GF (S<sub>1</sub>, S<sub>2</sub> ... S<sub>n</sub>), </i>	

 where
-* *R<sub>GF</sub>* - result of the operation,
-* *S<sub>1</sub>, S<sub>2</sub> ... S<sub>n</sub>* - arguments of the operation,
-* *n* - number of arguments.
+* *R<sub>GF</sub>* -- result of the operation,
+* *S<sub>1</sub>, S<sub>2</sub> ... S<sub>n</sub>* -- arguments of the operation,
+* *n* -- number of arguments.

 The result of the Boolean operator, *R<sub>B</sub>*, can be obtained from *R<sub>GF</sub>*.

@@ -79,11 +79,11 @@ The PA operator can be represented as follows:

 <i>R<sub>PA</sub>=PA (G<sub>1</sub>, G<sub>2</sub>),</i>
 where:
-* <i>R<sub>PA</sub></i> - is the result of the operation; 
+* <i>R<sub>PA</sub></i> -- is the result of the operation; 
 * *G<sub>1</sub>={S<sub>11</sub>, S<sub>12</sub> ... S<sub>1n1</sub>}*  group of arguments (Objects); 
 * *G<sub>2</sub>={S<sub>21</sub>, S<sub>22</sub> ... S<sub>2n2</sub>}*  group of arguments (Tools);
-* *n<sub>1</sub>* - Number of arguments in *Objects* group; 
-* *n<sub>2</sub>* - Number of arguments in *Tools* group.
+* *n<sub>1</sub>* -- Number of arguments in *Objects* group; 
+* *n<sub>2</sub>* -- Number of arguments in *Tools* group.

 The result *R<sub>PA</sub>* can be obtained from *R<sub>GF</sub>* .

@@ -105,9 +105,9 @@ The fact that the *R<sub>GF</sub>* contains the components of *R<sub>PA</sub>* a
 The Section operator *SA* can be applied to arbitrary number of arguments in terms of *TopoDS_Shape*. The result of *SA* contains vertices and edges in accordance with interferences between the arguments 
 The SA operator can be represented as follows:
 <i>R<sub>SA</sub>=SA(S1, S2… Sn)</i>, where
-* <i>R<sub>SA</sub></i> – is result of the operation;
-* <i>S1, S2 … Sn</i> - Arguments of the operation;
-* *n* - Number of arguments.
+* <i>R<sub>SA</sub></i> -- the operation result;
+* <i>S1, S2 ... Sn</i> -- the operation arguments;
+* *n* -- the number of arguments.

@subsection occt_algorithms_2_2 Parts of algorithms 

@@ -127,7 +127,7 @@ This chapter provides the background terms and definitions that are necessary to

 There are two groups of interferences.

-At first, each shape having a boundary representation (vertex, edge, face) has an internal value of geometrical tolerance. The shapes interfere with each other in terms of their tolerances. The shapes that have a boundary representation interfere when there is a part of 3D space where the distance between the underlying geometry of shapes is less or equal to the sum of tolerances of the shapes. Three types of shapes - vertex, edge and face - produce six types of **BRep interferences:**
+At first, each shape having a boundary representation (vertex, edge, face) has an internal value of geometrical tolerance. The shapes interfere with each other in terms of their tolerances. The shapes that have a boundary representation interfere when there is a part of 3D space where the distance between the underlying geometry of shapes is less or equal to the sum of tolerances of the shapes. Three types of shapes: vertex, edge and face -- produce six types of **BRep interferences:**
 * Vertex/Vertex,
 * Vertex/Edge,
 * Vertex/Face,
@@ -350,7 +350,7 @@ If the pave blocks *PBi* geometrically coincide with a face *Fj*, the pave block

 In general case a common block *CB* contains:
 * Pave blocks *PBi (i=0,1,2, 3… NbPB)*.
-* A set of faces *Fj (j=0,1... NbF), NbF* - number of faces.
+* A set of faces *Fj (j=0,1... NbF), NbF* -- number of faces.


@subsection occt_algorithms_3_6 FaceInfo
@@ -702,12 +702,12 @@ The input data for this step is the DS after computing Face/Face interferences.

 | No | Contents	| Implementation  |
 | :---- | :---- | :---- |
-| 1 | For each Face/Face interference *nFi, nFj*, retrieve @ref occt_algorithms_4_6 "FaceInfo". Create draft vertices from intersection points *VPk (k=1, 2…, NbVP)*, where *NbVP* is the number of new vertices, and the draft vertex *VPk* is created from an intersection point if *VPk ≠ Vm (m = 0, 1, 2… NbVm)*, where *Vm* is an existing vertex for the faces *nFi* and *nF,j* (*On* or *In* in terms of *TopoDs_Shape*),  *NbVm* is the number of vertices existing on faces *nFi* and *nF,j* and ≠ - means non-coincidence in terms of @ref occt_algorithms_3_1_1 "Vertex/Vertex interference". | *BOPAlgo_PaveFiller::MakeBlocks()* |
+| 1 | For each Face/Face interference *nFi, nFj*, retrieve @ref occt_algorithms_4_6 "FaceInfo". Create draft vertices from intersection points *VPk (k=1, 2…, NbVP)*, where *NbVP* is the number of new vertices, and the draft vertex *VPk* is created from an intersection point if *VPk ≠ Vm (m = 0, 1, 2… NbVm)*, where *Vm* is an existing vertex for the faces *nFi* and *nF,j* (*On* or *In* in terms of *TopoDs_Shape*),  *NbVm* is the number of vertices existing on faces *nFi* and *nF,j* and ≠ -- means non-coincidence in terms of @ref occt_algorithms_3_1_1 "Vertex/Vertex interference". | *BOPAlgo_PaveFiller::MakeBlocks()* |
 | 2	| For each intersection curve *Cijk* | |	
 | 2.1 | Create paves PVc for the curve using existing vertices, i.e. vertices On or In (in terms of *FaceInfo*) for faces *nFi* and *nFj*. Append the paves *PVc* | *BOPAlgo_PaveFiller::PutPaveOnCurve()* and *BOPDS_PaveBlock::AppendExtPave()* |
 | 2.2 |	Create technological vertices *Vt*, which are the bounding points of an intersection curve (with the value of tolerance *Tol(Cijk)*). Each vertex *Vt* with parameter *Tt* on curve *Cijk* forms pave *PVt* on curve *Cijk*. Append technological paves. | *BOPAlgo_PaveFiller::PutBoundPaveOnCurve()* |
 | 2.3 |	Create pave blocks *PBk* for the curve using paves <i>(k=1, 2…, NbPB)</i>, where *NbPB* is the number of pave blocks |	*BOPAlgo_PaveFiller::MakeBlocks()* |
-| 2.4 |	Build draft section edges *ESk* using the pave blocks <i>(k=1, 2…, NbES)</i>, where *NbES* is the number of draft section edges	The draft section edge is created from a pave block *PBk* if *PBk* has state *In* or *On* for both faces *nFi* and *nF,j* and *PBk ≠ PBm (m=0, 1, 2… NbPBm)*, where *PBm* is an existing pave block for faces *nFi* and *nF,j* (*On* or *In* in terms of *FaceInfo*), *NbVm* is the number of existing pave blocks for faces *nFi* and *nF,j* and ≠ - means non-coincidence (in terms of @ref occt_algorithms_3_1_3 "Vertex/Face interference"). | *BOPTools_Tools::MakeEdge()* |
+| 2.4 |	Build draft section edges *ESk* using the pave blocks <i>(k=1, 2…, NbES)</i>, where *NbES* is the number of draft section edges	The draft section edge is created from a pave block *PBk* if *PBk* has state *In* or *On* for both faces *nFi* and *nF,j* and *PBk ≠ PBm (m=0, 1, 2… NbPBm)*, where *PBm* is an existing pave block for faces *nFi* and *nF,j* (*On* or *In* in terms of *FaceInfo*), *NbVm* is the number of existing pave blocks for faces *nFi* and *nF,j* and ≠ -- means non-coincidence (in terms of @ref occt_algorithms_3_1_3 "Vertex/Face interference"). | *BOPTools_Tools::MakeEdge()* |
 | 3	| Intersect the draft vertices *VPk (k=1, 2…, NbVP)* and the draft section edges *ESk (k=1, 2…, NbES)*. For this: a) create new object *PFn* of type *BOPAlgo_PaveFiller* with its own DS; b) use vertices *VPk* and edges *ESk* as arguments (in terms of @ref occt_algorithms_4_1 "Arguments") of *PFn*; c) invoke	method *Perform()* for *PFn*. Resulting vertices *VPXk (k=1, 2… NbVPX)* and edges *ESXk (k=1, 2… NbESX)* are obtained via mapping between *VPk, ESk* and the results of *PVn*. | *BOPAlgo_PaveFiller::PostTreatFF()* |
 | 4	| Update face info (sections about pave blocks and vertices) | *BOPAlgo_PaveFiller::PerformFF()* |

@@ -736,9 +736,9 @@ Building Part (BP) is used to
 * Provide history information (in terms of <i>\::Generated(), \::Modified()</i> and <i>\::IsDeleted()</i>)
 BP uses the DS prepared by *BOPAlgo_PaveFiller* described at chapter 5 as input data.
 BP is implemented in the following classes:
-* *BOPAlgo_Builder* - for the General Fuse operator  (GFA).
-* *BOPAlgo_BOP* - for the Boolean Operation operator   (BOA).
-* *BOPAlgo_Section* - for the Section operator  (SA).
+* *BOPAlgo_Builder* -- for the General Fuse operator  (GFA).
+* *BOPAlgo_BOP* -- for the Boolean Operation operator   (BOA).
+* *BOPAlgo_Section* -- for the Section operator  (SA).

@figure{/user_guides/boolean_operations/images/operations_image020.svg, "Diagram for BP classes"}

@@ -934,8 +934,8 @@ This step is the same as @ref occt_algorithms_7_4_4 "Building Result of Type Ver

 The input data for this step is: 
 * *BOPAlgo_Builder* object after building result of type *Edge*;
-* Original Shape - Wire
-* *Type* - the shape type <i>(TopAbs_WIRE).</i>
+* Original Shape -- Wire
+* *Type* -- the shape type <i>(TopAbs_WIRE).</i>

 | No | Contents | Implementation |
 | :---- | :---- | :----- | 
@@ -981,8 +981,8 @@ This step is the same as @ref occt_algorithms_7_4_4 "Building Result of Type Ver
@subsubsection occt_algorithms_7_4_11	Build Images for Shells
 The input data for this step is:
 * *BOPAlgo_Builder* object  after building result of type face;
-* *Original Shape* - Shell;
-* *Type* - the type of the shape <i>(TopAbs_SHELL)</i>.
+* *Original Shape* -- a Shell;
+* *Type* -- the type of the shape <i>(TopAbs_SHELL)</i>.

 The procedure is the same as for building images for wires. 

@@ -1011,8 +1011,8 @@ This step is the same as @ref occt_algorithms_7_4_4 "Building Result of Type Ver

 The input data for this step is:
 * *BOPAlgo_Builder* object after building result of type solid;
-* *Original Shape* - Compsolid;
-* *Type* - the type of the shape <i>(TopAbs_COMPSOLID)</i>.
+* *Original Shape* -- a Compsolid;
+* *Type* -- the type of the shape <i>(TopAbs_COMPSOLID)</i>.

 The procedure is the same as for building images for wires. 

@@ -1021,9 +1021,9 @@ This step is the same as @ref occt_algorithms_7_4_4 "Building Result of Type Ver

@subsubsection occt_algorithms_7_4_17 Build Images for Compounds
 The input data for this step is as follows:
-* *BOPAlgo_Builder* object after building results of type compsolid;
-* *Original Shape* - Compound;
-* *Type* - the type of the shape <i>(TopAbs_COMPOUND)</i>.
+* *BOPAlgo_Builder* object after building results of type *compsolid*;
+* *Original Shape* -- a Compound;
+* *Type* -- the type of the shape <i>(TopAbs_COMPOUND)</i>.

 The procedure is the same as for building images for wires. 

@@ -1845,7 +1845,7 @@ The chapter describes the problems that are considered as Algorithm limitations.

 A lot of failures of GFA algorithm can be caused by bugs in low-level algorithms: Intersection Algorithm, Projection Algorithm, Approximation Algorithm, Classification Algorithm, etc.
 * The Intersection, Projection and Approximation Algorithms are mostly used at the Intersection step. Their bugs directly cause wrong section results (i.e. incorrect section edges, section points, missing section edges or micro edges). It is not possible to obtain a correct final result of the GFA if a section result is wrong.
-* The Projection Algorithm is used at the Intersection step. The purpose of Projection Algorithm is to compute 2D-curves on surfaces. Wrong results here lead to incorrect or missing faces in the final GFA result. 
+* The Projection Algorithm is used at the Intersection step. The purpose of Projection Algorithm is to compute 2D curves on surfaces. Wrong results here lead to incorrect or missing faces in the final GFA result. 
 * The Classification Algorithm is used at the Building step. The bugs in the Classification Algorithm lead to errors in selecting shape parts (edges, faces, solids) and ultimately to a wrong final GFA result.

 The description below illustrates some known GFA limitations. It does not enumerate exhaustively all problems that can arise in practice. Please, address cases of Algorithm failure to the OCCT Maintenance Service.
@@ -1863,11 +1863,11 @@ However, it is important to note that class *BRepCheck_Analyzer* is just a tool

 Let us consider the following example:

-The Analyzer checks distances between couples of 3D check-points <i>(Pi, PSi)</i> of edge *E* on face *F*. Point *Pi* is obtained from the 3D-curve (at the parameter *ti*) of the edge. *PSi* is obtained from 2D-curve (at the parameter *ti*) of the edge on surface *S* of face *F*. To be valid the distance should be less than *Tol(E)* for all couples of check-points. The number of these check-points is a pre-defined value (e.g. 23). 
+The Analyzer checks distances between couples of 3D check-points <i>(Pi, PSi)</i> of edge *E* on face *F*. Point *Pi* is obtained from the 3D curve (at the parameter *ti*) of the edge. *PSi* is obtained from 2D curve (at the parameter *ti*) of the edge on surface *S* of face *F*. To be valid the distance should be less than *Tol(E)* for all couples of check-points. The number of these check-points is a predefined value (e.g. 23). 

 Let us consider the case when edge *E* is recognized valid (in terms of *BRepCheck_Analyzer*).

-Further, after some operation, edge *E* is split into two edges *E1* and *E2*. Each split edge has the same 3D-curve and 2D-curve as the original edge *E*. 
+Further, after some operation, edge *E* is split into two edges *E1* and *E2*. Each split edge has the same 3D curve and 2D curve as the original edge *E*. 

 Let us check *E1* (or E2). The Analyzer again checks the distances between the couples of check-points points <i>(Pi, PSi)</i>. The number of these check-points is the same constant value (23), but there is no guarantee that the distances will be less than *Tol(E)*, because the points chosen for *E1* are not the same as for *E*. 

@@ -2071,7 +2071,7 @@ The Fuzzy option is useful on the shapes with gaps or embeddings between the ent

 Most likely, the Basic Operations will give unsatisfactory results on such models. The result may contain unexpected and unwanted small entities, faulty entities (in terms of *BRepCheck_Analyzer*), or there can be no result at all.

-With the Fuzzy option it is possible to get the expected result - it is just necessary to define the appropriate value of fuzzy tolerance for the operation. To define that value it is necessary to measure the value of the gap (or the value of embedding depth) between the entities of the models, slightly increase it (to make the shifted entities coincident in terms of their tolerance plus the additional one) and pass it to the algorithm.
+With the Fuzzy option it is possible to get the expected result -- it is just necessary to define the appropriate value of fuzzy tolerance for the operation. To define that value it is necessary to measure the value of the gap (or the value of embedding depth) between the entities of the models, slightly increase it (to make the shifted entities coincident in terms of their tolerance plus the additional one) and pass it to the algorithm.

 Fuzzy option is included in interface of Intersection Part (class *BOPAlgo_PaveFiller*) and application programming interface (class  *BRepAlgoAPI_BooleanOperation*)

@@ -2143,13 +2143,13 @@ The chapter contains some examples of the OCCT Boolean Component usage. The usag
 The package *BRepAlgoAPI* provides the Application Programming Interface of the Boolean Component.

 The package consists of the following classes:
-* *BRepAlgoAPI_Algo* – the root class that provides the interface for algorithms. 
-* *BRepAlgoAPI_BuilderAlgo* - the class API level of General Fuse algorithm.
-* *BRepAlgoAPI_BooleanOperation* – the root class for the classes *BRepAlgoAPI_Fuse*. *BRepAlgoAPI_Common*, *BRepAlgoAPI_Cut* and *BRepAlgoAPI_Section*.
-* *BRepAlgoAPI_Fuse* – the class provides Boolean fusion operation. 
-* *BRepAlgoAPI_Common* - the class provides Boolean common operation.
-* *BRepAlgoAPI_Cut* - the class provides Boolean cut operation.
-* *BRepAlgoAPI_Section* - the class provides Boolean section operation.
+* *BRepAlgoAPI_Algo* -- the root class that provides the interface for algorithms. 
+* *BRepAlgoAPI_BuilderAlgo* -- the class API level of General Fuse algorithm.
+* *BRepAlgoAPI_BooleanOperation* -- the root class for the classes *BRepAlgoAPI_Fuse*. *BRepAlgoAPI_Common*, *BRepAlgoAPI_Cut* and *BRepAlgoAPI_Section*.
+* *BRepAlgoAPI_Fuse* -- the class provides Boolean fusion operation. 
+* *BRepAlgoAPI_Common* -- the class provides Boolean common operation.
+* *BRepAlgoAPI_Cut* -- the class provides Boolean cut operation.
+* *BRepAlgoAPI_Section* -- the class provides Boolean section operation.

@figure{/user_guides/boolean_operations/images/operations_image065.svg, "Diagram of BRepAlgoAPI package"} 

@@ -2158,8 +2158,8 @@ The detailed description of the classes can be found in corresponding .cdl files
@subsection occt_algorithms_11b_2 Package BOPTest
 The package *BOPTest* provides the usage of the Boolean Component on Tcl level. The method *BOPTest::APICommands* contains corresponding Tcl commands: 

-* *bapibuild* – for General Fuse Operator;
-* *bapibop* – for Boolean Operator and Section Operator.
+* *bapibuild* -- for General Fuse Operator;
+* *bapibop* -- for Boolean Operator and Section Operator.

 The examples of how to use the commands are below in this chapter.

--- a/dox/user_guides/brep_wp/brep_wp.md
+++ b/dox/user_guides/brep_wp/brep_wp.md
@@ -121,13 +121,13 @@ Q\cdot(x\;y\;z\;1)^{T} =

 *Q* may be a composition of matrices for the following elementary transformations:  
 
-  *  parallel translation –
+  *  parallel translation --
     @f$ \begin{pmatrix}
     1 &0 &0 &{q}_{1,4}\\ 
 	 0 &1 &0 &{q}_{2,4}\\ 
 	 0 &0 &1 &{q}_{3,4}
 	 \end{pmatrix}; @f$  
-  *  rotation around an axis with a direction *D(D<sub>x</sub>, D<sub>y</sub>, D<sub>z</sub>)* by an angle @f$ \varphi @f$ –  
+  *  rotation around an axis with a direction *D(D<sub>x</sub>, D<sub>y</sub>, D<sub>z</sub>)* by an angle @f$ \varphi @f$ --  

 	@f[ \begin{pmatrix}
 	D_{x}^{2} \cdot (1-cos(\varphi)) + cos(\varphi) &D_{x} \cdot D_{y} \cdot (1-cos(\varphi)) - D_{z} \cdot sin(\varphi) &D_{x} \cdot D_{z} \cdot (1-cos(\varphi)) + D_{y} \cdot sin(\varphi) &0\\
@@ -135,10 +135,10 @@ Q\cdot(x\;y\;z\;1)^{T} =
 	D_{x} \cdot D_{z} \cdot (1-cos(\varphi)) - D_{y} \cdot sin(\varphi) &D_{y} \cdot D_{z} \cdot (1-cos(\varphi)) + D_{x} \cdot sin(\varphi) &D_{z}^{2} \cdot (1-cos(\varphi)) + cos(\varphi) &0
 	\end{pmatrix}; @f]  
 
-  *  scaling – @f$ \begin{pmatrix} s &0 &0 &0\\ 0 &s &0 &0\\ 0 &0 &s &0 \end{pmatrix} @f$ where @f$ S \in (-\infty,\; \infty)/\left \{ 0 \right \}; @f$ 
-  *  central symmetry – @f$ \begin{pmatrix} -1 &0 &0 &0\\ 0 &-1 &0 &0\\ 0 &0 &-1 &0 \end{pmatrix}; @f$  
-  *  axis symmetry – @f$ \begin{pmatrix} -1 &0 &0 &0\\ 0 &-1 &0 &0\\ 0 &0 &1 &0 \end{pmatrix}; @f$  
-  *  plane symmetry – @f$ \begin{pmatrix} 1 &0 &0 &0\\ 0 &1 &0 &0\\ 0 &0 &-1 &0 \end{pmatrix}. @f$ 
+  *  scaling -- @f$ \begin{pmatrix} s &0 &0 &0\\ 0 &s &0 &0\\ 0 &0 &s &0 \end{pmatrix} @f$ where @f$ S \in (-\infty,\; \infty)/\left \{ 0 \right \}; @f$ 
+  *  central symmetry -- @f$ \begin{pmatrix} -1 &0 &0 &0\\ 0 &-1 &0 &0\\ 0 &0 &-1 &0 \end{pmatrix}; @f$  
+  *  axis symmetry -- @f$ \begin{pmatrix} -1 &0 &0 &0\\ 0 &-1 &0 &0\\ 0 &0 &1 &0 \end{pmatrix}; @f$  
+  *  plane symmetry -- @f$ \begin{pmatrix} 1 &0 &0 &0\\ 0 &1 &0 &0\\ 0 &0 &-1 &0 \end{pmatrix}. @f$ 
 
 \<location data 2\> is interpreted as a composition of locations raised to a power and placed above this \<location data 2\> in  the section \<locations\>. \<location data 2\> is a sequence @f$l_{1}p_{1} ... l_{n}p_{n}@f$ of @f$ n \geq 0 @f$ integer pairs @f$ l_{i}p_{i} \; (1 \leq i \leq n) @f$. \<flag\> 0 is the indicator  of the sequence end. The sequence is interpreted as a composition @f$ L_{l_{1}}^{p_{1}} \cdot ... \cdot L_{l_{n}}^{p_{n}} @f$ where @f$ L_{l_{i}} @f$ is a location from @f$ l_{i} @f$-th \<location  record\> in the section locations. \<location record\> numbering  starts from 1.  
 
@@ -232,7 +232,7 @@ The example record is interpreted as a line which  passes through a point *P*=(1
 
 **BNF-like Definition**
 
-@verbatim
+~~~~
    <3D curve record 2> = "2" <_> <3D circle center> <_> <3D circle N> <_> <3D circle Dx> <_> <3D circle Dy> <_> <3D circle radius> <_\n>;  
     
    <3D circle center> = <3D point>;  
@@ -244,7 +244,7 @@ The example record is interpreted as a line which  passes through a point *P*=(1
    <3D circle Dy> = <3D direction>;  
     
    <3D circle radius> = <real>;  
-@endverbatim 
+~~~~
 
 **Description**  
 
@@ -265,7 +265,7 @@ The  example record is interpreted as a circle which has its center *P*=(1, 2, 3
 
 **BNF-like Definition**

-@verbatim 
+~~~~
    <3D curve record 3> = "3" <_> <3D ellipse center> <_> <3D ellipse N> <_> <3D ellipse Dmaj> <_> <3D ellipse Dmin> <_> <3D ellipse Rmaj> <_> <3D ellipse Rmin> <_\n>;  
     
    <3D ellipse center> = <3D point>;  
@@ -279,7 +279,7 @@ The  example record is interpreted as a circle which has its center *P*=(1, 2, 3
    <3D ellipse Rmaj> = <real>;  
     
    <3D ellipse Rmin> = <real>;  
-@endverbatim 
+~~~~
 
 **Description**  
 
@@ -300,7 +300,7 @@ The  example record is interpreted as an ellipse which has its center *P*=(1, 2,
 
 **BNF-like Definition**  

-@verbatim
+~~~~
    <3D curve record 4> = "4" <_> <3D parabola origin> <_> <3D parabola N> <_> <3D parabola Dx> <_> <3D parabola Dy> <_> <3D parabola focal length> <_\n>;  
     
    <3D parabola origin> = <3D point>;  
@@ -312,7 +312,7 @@ The  example record is interpreted as an ellipse which has its center *P*=(1, 2,
    <3D parabola Dy> = <3D direction>;  
     
    <3D parabola focal length> = <real>;  
-@endverbatim 
+~~~~
 
 **Description**  
 
@@ -334,7 +334,7 @@ The  example record is interpreted as a parabola in plane which passes through a
 
 **BNF-like Definition**  

-@verbatim
+~~~~
    <3D curve record 5> = "5" <_> <3D hyperbola origin> <_> <3D hyperbola N> <_> <3D hyperbola Dx> <_> <3D hyperbola Dy> <_> <3D hyperbola Kx> <_> <3D hyperbola Ky> <_\n>;  
     
    <3D hyperbola origin> = <3D point>;  
@@ -348,7 +348,7 @@ The  example record is interpreted as a parabola in plane which passes through a
    <3D hyperbola Kx> = <real>;  
     
    <3D hyperbola Ky> = <real>;  
-@endverbatim
+~~~~
 
 **Descripton**  
 
@@ -410,7 +410,7 @@ The example record is interpreted as a Bezier curve with a rational flag *r*=1,
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<3D curve record 7> = "7" <_> <3D B-spline rational flag> <_> "0" <_> <3D B-spline degree> <_> 
 	<3D B-spline pole count> <_> <3D B-spline multiplicity knot count> <3D B-spline weight poles> 
 	<_\n> <3D B-spline multiplicity knots> <_\n>;
@@ -430,7 +430,7 @@ The example record is interpreted as a Bezier curve with a rational flag *r*=1,
 	<3D B-spline multiplicity knots> = (<_> <3D B-spline multiplicity knot>) ^ <3D B-spline multiplicity knot count>;

 	<3D B-spline multiplicity knot> = <real> <_> <int>;  
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -474,13 +474,13 @@ The example record is interpreted as a B-spline curve  with a rational flag *r*=
 
 **BNF-like Definition**  

-@verbatim
+~~~~
 	<3D curve record 8> = "8" <_> <3D trimmed curve u min> <_> <3D trimmed curve u max> <_\n> <3D curve record>;

 	<3D trimmed curve u min> = <real>;

 	<3D trimmed curve u max> = <real>;  
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -746,7 +746,7 @@ where @f$ V(v)=(5,2,0)+4 \cdot (cos(v) \cdot (1,0,0)+sin(v) \cdot (0,1,0)), V_{D
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<surface record 8> = "8" <_> <Bezier surface u rational flag> <_> <Bezier surface v rational flag> <_> <Bezier surface u degree> <_> <Bezier surface v degree> <_> 
 	<Bezier surface weight poles>;

@@ -765,7 +765,7 @@ where @f$ V(v)=(5,2,0)+4 \cdot (cos(v) \cdot (1,0,0)+sin(v) \cdot (0,1,0)), V_{D
 	(<_> <Bezier surface weight pole>) ^ <Bezier surface v degree>;

 	<Bezier surface weight pole> = <3D point> [<_> <real>];  
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -781,12 +781,13 @@ where @f$ 0^{0} \equiv 1 @f$.
 
 The example record is interpreted as a Bezier surface  with a u rational flag *r<sub>u</sub>*=1, v rational flag *r<sub>v</sub>*=1, u degree *m<sub>u</sub>*=2, v degree *m<sub>v</sub>*=1, weight poles *B<sub>0,0</sub>*=(0, 0, 1), *h<sub>0,0</sub>*=7, *B<sub>0,1</sub>*=(1, 0, -4), *h<sub>0,1</sub>*=10, *B<sub>1,0</sub>*=(0, 1, -2), *h<sub>1,0</sub>*=8, *B<sub>1,1</sub>*=(1, 1, 5), *h<sub>1,1</sub>*=11, *B<sub>2,0</sub>*=(0, 2, 3), *h<sub>2,0</sub>*=9 and *B<sub>2,1</sub>*=(1, 2, 6), *h<sub>2,1</sub>*=12. The surface is defined by  the following parametric equation:  
 
-@f[ S(u,v)= [ (0,0,1) \cdot 7 \cdot (1-u)^{2} \cdot (1-v)+(1,0,-4) \cdot 10 \cdot (1-u)^{2} \cdot v+ \\
-(0,1,-2) \cdot 8 \cdot 2 \cdot u \cdot (1-u) \cdot (1-v)+(1,1,5) \cdot 11 \cdot 2 \cdot u \cdot (1-u) \cdot v+ \\
-(0,2,3) \cdot 9 \cdot u^{2} \cdot (1-v)+(1,2,6) \cdot 12 \cdot u^{2} \cdot v] \div \\
-[7 \cdot (1-u)^{2} \cdot (1-v)+10 \cdot (1-u)^{2} \cdot v+ \\
-8 \cdot 2 \cdot u \cdot (1-u) \cdot (1-v)+11 \cdot 2 \cdot u \cdot (1-u) \cdot v+ \\
-9 \cdot u^{2} \cdot (1-v)+12 \cdot u^{2} \cdot v ] @f]
+@f[
+\begin{align}
+S(u,v)= [ (0,0,1) \cdot 7 \cdot (1-u)^{2} \cdot (1-v)+(1,0,-4) \cdot 10 \cdot (1-u)^{2} \cdot v+ (0,1,-2) \cdot 8 \cdot 2 \cdot u \cdot (1-u) \cdot (1-v) + \\
+(1,1,5) \cdot 11 \cdot 2 \cdot u \cdot (1-u)  \cdot v+ (0,2,3) \cdot 9 \cdot u^{2} \cdot (1-v)+(1,2,6) \cdot 12 \cdot u^{2} \cdot v] \div [7 \cdot (1-u)^{2} \cdot (1-v)+ \\
+10 \cdot (1-u)^{2} \cdot v+ 8 \cdot 2 \cdot u \cdot (1-u) \cdot (1-v)+ 11 \cdot 2 \cdot u \cdot (1-u) \cdot v+ 9 \cdot u^{2} \cdot (1-v)+12 \cdot u^{2} \cdot v ]
+\end{align}
+@f]
 
 
@subsubsection occt_brep_format_4_2_9 B-spline Surface - \< surface record 9 \> 
@@ -877,14 +878,19 @@ The B-spline surface is defined by the following  parametric equation:
 
 where functions *N<sub>i,j</sub>* and *M<sub>i,j</sub>* have the following recursion definition by *j*:  
 
-@f[ N_{i,1}(u)=\left\{\begin{matrix}
-1\Leftarrow \bar{u}_{i} \leq u \leq \bar{u}_{i+1}\\ 
-0\Leftarrow u < \bar{u}_{i} \vee  \bar{u}_{i+1} \leq u \end{matrix} \right.,\;
-N_{i,j}(u)=\frac{(u-\bar{u}_{i}) \cdot N_{i,j-1}(u) }{\bar{u}_{i+j-1}-\bar{u}_{i}}+ \frac{(\bar{u}_{i+j}-u) \cdot N_{i+1,j-1}(u)}{\bar{u}_{i+j}-\bar{u}_{i+1}},\;(2 \leq j \leq m_{u}+1); \\
+@f[
+\begin{align}
+N_{i,1}(u)= \left\{\begin{matrix}
+1\Leftarrow \bar{u}_{i} \leq u \leq \bar{u}_{i+1}
+0\Leftarrow u < \bar{u}_{i} \vee  \bar{u}_{i+1} \leq u \end{matrix}  \right.,\; \\
+N_{i,j}(u)=\frac{(u-\bar{u}_{i}) \cdot N_{i,j-1}(u) }{\bar{u}_{i+j-1}-\bar{u}_{i}}+  
+\frac{(\bar{u}_{i+j}-u) \cdot N_{i+1,j-1}(u)}{\bar{u}_{i+j}-\bar{u}_{i+1}},\;(2 \leq j \leq m_{u}+1), \; \\
 M_{i,1}(v)=\left\{\begin{matrix}
 1\Leftarrow \bar{v}_{i} \leq v \leq \bar{v}_{i+1}\\ 
-0\Leftarrow v < \bar{v}_{i} \vee  \bar{v}_{i+1} \leq v \end{matrix} \right.,\;
-M_{i,j}(v)=\frac{(v-\bar{v}_{i}) \cdot M_{i,j-1}(v) }{\bar{v}_{i+j-1}-\bar{v}_{i}}+ \frac{(\bar{v}_{i+j}-v) \cdot M_{i+1,j-1}(v)}{\bar{v}_{i+j}-\bar{v}_{i+1}},\;(2 \leq j \leq m_{v}+1); @f]  
+0\Leftarrow v < \bar{v}_{i} \vee  \bar{v}_{i+1} \leq v \end{matrix} \right.,\; \\
+M_{i,j}(v)=\frac{(v-\bar{v}_{i}) \cdot M_{i,j-1}(v) }{\bar{v}_{i+j-1}-\bar{v}_{i}}+ \frac{(\bar{v}_{i+j}-v) \cdot M_{i+1,j-1}(v)}{\bar{v}_{i+j}-\bar{v}_{i+1}},\;(2 \leq j \leq m_{v}+1); 
+\end{align}
+@f]  

 where   
@f[ \bar{u}_{i}=u_{j}\; (1 \leq j \leq k_{u},\; \sum_{l=1}^{j-1}q_{l} \leq i \leq \sum_{l=1}^{j}q_{l}), \\
@@ -892,13 +898,15 @@ where
 
 The example record is interpreted as a B-spline  surface with a u rational flag *r<sub>u</sub>*=1, v rational flag *r<sub>v</sub>*=1, u degree *m<sub>u</sub>*=1, v degree *m<sub>v</sub>*=1, u pole count *n<sub>u</sub>*=3, v pole count *n<sub>v</sub>*=2, u multiplicity knot count *k<sub>u</sub>*=5, v multiplicity knot count *k<sub>v</sub>*=4, weight poles *B<sub>1,1</sub>*=(0, 0, 1), *h<sub>1,1</sub>*=7, *B<sub>1,2</sub>*=(1, 0, -4), *h<sub>1,2</sub>*=10, *B<sub>2,1</sub>*=(0, 1, -2), *h<sub>2,1</sub>*=8, *B<sub>2,2</sub>*=(1, 1, 5), *h<sub>2,2</sub>*=11, *B<sub>3,1</sub>*=(0, 2, 3), *h<sub>3,1</sub>*=9 and *B<sub>3,2</sub>*=(1, 2, 6), *h<sub>3,2</sub>*=12, u multiplicity knots *u<sub>1</sub>*=0, *q<sub>1</sub>*=1, *u<sub>2</sub>*=0.25, *q<sub>2</sub>*=1, *u<sub>3</sub>*=0.5, *q<sub>3</sub>*=1, *u<sub>4</sub>*=0.75, *q<sub>4</sub>*=1 and *u<sub>5</sub>*=1, *q<sub>5</sub>*=1, v multiplicity  knots *v<sub>1</sub>*=0, *r<sub>1</sub>*=1, *v<sub>2</sub>*=0.3, *r<sub>2</sub>*=1, *v<sub>3</sub>*=0.7, *r<sub>3</sub>*=1 and *v<sub>4</sub>*=1, *r<sub>4</sub>*=1. The B-spline surface is defined  by the following parametric equation:  
 
-@f[ S(u,v)= [ (0,0,1) \cdot 7 \cdot N_{1,2}(u) \cdot M_{1,2}(v)+(1,0,-4) \cdot 10 \cdot N_{1,2}(u) \cdot M_{2,2}(v)+ \\
+@f[ 
+\begin{align} 
+S(u,v)= [ (0,0,1) \cdot 7 \cdot N_{1,2}(u) \cdot M_{1,2}(v)+(1,0,-4) \cdot 10 \cdot N_{1,2}(u) \cdot M_{2,2}(v)+ \\
 (0,1,-2) \cdot 8 \cdot N_{2,2}(u) \cdot M_{1,2}(v)+(1,1,5) \cdot 11 \cdot N_{2,2}(u) \cdot M_{2,2}(v)+ \\
 (0,2,3) \cdot 9 \cdot N_{3,2}(u) \cdot M_{1,2}(v)+(1,2,6) \cdot 12 \cdot N_{3,2}(u) \cdot M_{2,2}(v)] \div \\
-[7 \cdot N_{1,2}(u) \cdot M_{1,2}(v)+10 \cdot N_{1,2}(u) \cdot M_{2,2}(v)+ \\
-8 \cdot N_{2,2}(u) \cdot M_{1,2}(v)+11 \cdot N_{2,2}(u) \cdot M_{2,2}(v)+ \\
-9 \cdot N_{3,2}(u) \cdot M_{1,2}(v)+12 \cdot N_{3,2}(u) \cdot M_{2,2}(v) ] @f]  
- 
+[7 \cdot N_{1,2}(u) \cdot M_{1,2}(v)+10 \cdot N_{1,2}(u) \cdot M_{2,2}(v)+ 8 \cdot N_{2,2}(u) \cdot M_{1,2}(v)+ \\ 
+11 \cdot N_{2,2}(u) \cdot M_{2,2}(v)+ 9 \cdot N_{3,2}(u) \cdot M_{1,2}(v)+12 \cdot N_{3,2}(u) \cdot M_{2,2}(v) ] 
+\end{align} 
+@f]
 
@subsubsection occt_brep_format_4_2_10  Rectangular Trim Surface - \< surface  record 10 \>
 
@@ -1050,7 +1058,7 @@ The example record is interpreted as a line which  passes through a point *P*=(3
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<2D curve record 2> = "2" <_> <2D circle center> <_> <2D circle Dx> <_> <2D circle Dy> <_> <2D circle radius> <_\n>;

 	<2D circle center> = <2D point>;
@@ -1060,7 +1068,7 @@ The example record is interpreted as a line which  passes through a point *P*=(3
 	<2D circle Dy> = <2D direction>;

 	<2D circle radius> = <real>;  
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -1221,7 +1229,7 @@ The example record is interpreted as a Bezier curve  with a rational flag *r*=1,
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<2D curve record 7> = "7" <_> <2D B-spline rational flag> <_> "0" <_> <2D B-spline degree> <_> <2D B-spline pole count> <_> <2D B-spline multiplicity knot count> <2D B-spline weight poles> <_\n> <2D B-spline multiplicity knots> <_\n>;

 	<2D B-spline rational flag> = <flag>;
@@ -1240,7 +1248,7 @@ The example record is interpreted as a Bezier curve  with a rational flag *r*=1,
 	<2D B-spline multiplicity knot> ^ <2D B-spline multiplicity knot count>;

 	<2D B-spline multiplicity knot> = <_> <real> <_> <int>;
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -1404,7 +1412,7 @@ The example record describes a polyline from *m*=2 nodes with a parameter prese
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<triangulations> = <triangulation header> <_\n> <triangulation records>;

 	<triangulation header> = "Triangulations" <_> <triangulation count>;
@@ -1434,7 +1442,7 @@ The example record describes a polyline from *m*=2 nodes with a parameter prese
 	<triangulation triangles> = (<triangulation triangle> <_>) ^ <triangulation triangle count>;

 	<triangulation triangle> = <int> <_> <int> <_> <int>.  
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -1613,22 +1621,22 @@ An example of section shapes and a whole  *.brep file are given in chapter 7 @re
 
 \<shape flag word\> @f$ f_{1}\; f_{2}\; f_{3}\; f_{4}\; f_{5}\; f_{6}\; f_{7} @f$ \<flag\>s @f$ f_{i}\;(1\leq i \leq 7) @f$ are interpreted as shape  flags in the following way:  

-  *  @f$ f_{1} @f$ – free;  
-  *  @f$ f_{2} @f$ – modified;  
-  *  @f$ f_{3} @f$ – IGNORED(version 1) \\ checked (version 2);  
-  *  @f$ f_{4} @f$ – orientable;  
-  *  @f$ f_{5} @f$ – closed;  
-  *  @f$ f_{6} @f$ – infinite;  
-  *  @f$ f_{7} @f$ – convex.  
+  *  @f$ f_{1} @f$ -- free;  
+  *  @f$ f_{2} @f$ -- modified;  
+  *  @f$ f_{3} @f$ -- IGNORED(version 1) \\ checked (version 2);  
+  *  @f$ f_{4} @f$ -- orientable;  
+  *  @f$ f_{5} @f$ -- closed;  
+  *  @f$ f_{6} @f$ -- infinite;  
+  *  @f$ f_{7} @f$ -- convex.  
  
 The flags are used in a special way [1].  
 
 \<shape subshape orientation\> is interpreted in  the following way:  

-  *  + – forward;  
-  *  - – reversed;  
-  *  i – internal;  
-  *  e – external.  
+  *  + -- forward;  
+  *  - -- reversed;  
+  *  i -- internal;  
+  *  e -- external.  
  
 \<shape subshape orientation\> is used in a special  way [1].  
 
@@ -1636,14 +1644,14 @@ The flags are used in a special way [1].
 
 \<shape subrecord\> types are interpreted in the  following way: 
 
-  *  "Ve" – vertex;  
-  *  "Ed" – edge;  
-  *  "Wi" – wire;  
-  *  "Fa" – face;  
-  *  "Sh" – shell;  
-  *  "So" – solid;  
-  *  "CS" – compsolid;  
-  *  "Co" – compound.  
+  *  "Ve" -- vertex;  
+  *  "Ed" -- edge;  
+  *  "Wi" -- wire;  
+  *  "Fa" -- face;  
+  *  "Sh" -- shell;  
+  *  "So" -- solid;  
+  *  "CS" -- compsolid;  
+  *  "Co" -- compound.  
 
 \<shape final record\> determines the orientation  and location for the whole model.  
 
@@ -1750,7 +1758,7 @@ The usage of \<vertex data representation u  parameter\> *U* is  described belo
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<edge data> = <_> <edge data tolerance> <_> <edge data same parameter flag> <_> edge data same range flag> <_> <edge data degenerated flag> <_\n> <edge data representations>;

 	<edge data tolerance> = <real>;
@@ -1793,7 +1801,7 @@ The usage of \<vertex data representation u  parameter\> *U* is  described belo

 	<edge data representation data 7> = (<polygon on triangulation number> <_>) ^ 2 
 	<triangulation number> <_> <location number>;
-@endverbatim
+~~~~
 
 **Description**  
 
@@ -1820,13 +1828,13 @@ Flags \<edge data same parameter flag\>, \<edge data same range flag\> and \<edg
 
 **BNF-like Definition**

-@verbatim
+~~~~
 	<face data> = <face data natural restriction flag> <_> <face data tolerance> <_> <surface number> <_> <location number> <\n> ["2" <_> <triangulation number>];

 	<face data natural restriction flag> = <flag>;

 	<face data tolerance> = <real>;
-@endverbatim
+~~~~
 
 **Description**  
 
--- a/dox/user_guides/draw_test_harness/draw_test_harness.md
+++ b/dox/user_guides/draw_test_harness/draw_test_harness.md
@@ -72,7 +72,7 @@ Declaration of available plug-ins is done through the special resource file(s).

@subsubsection occt_draw_1_3_1 Launching DRAW Test Harness

-Test Harness executable *DRAWEXE* is located in the <i>$CASROOT/\<platform\>/bin</i> directory (where \<platform\> is Win for Windows and Linux for Linux operating systems). Prior to launching it is important to make sure that the environment is correctly set-up (usually this is done automatically after the installation process on Windows or after launching specific scripts on Linux).  
+Test Harness executable *DRAWEXE* is located in the <i>$CASROOT/\<platform\>/bin</i> directory (where \<platform\> is Win for Windows and Linux for Linux operating systems). Prior to launching it is important to make sure that the environment is correctly setup (usually this is done automatically after the installation process on Windows or after launching specific scripts on Linux).  


@subsubsection occt_draw_1_3_2 Plug-in resource file
@@ -103,8 +103,8 @@ pload [-PluginFileName] [[Key1] [Key2]...]

 where: 

-* <i>-PluginFileName</i> - defines the name of a plug-in resource file (prefix "-" is mandatory) described above. If this parameter is omitted then the default name *DrawPlugin* is used. 
-* *Key…* - defines the key(s) enumerating plug-ins to be loaded. If no keys are specified then the key named *DEFAULT* is used (if there is no such key in the file then no plug-ins are loaded). 
+* <i>-PluginFileName</i> -- defines the name of a plug-in resource file (prefix "-" is mandatory) described above. If this parameter is omitted then the default name *DrawPlugin* is used. 
+* *Key* -- defines the key(s) enumerating plug-ins to be loaded. If no keys are specified then the key named *DEFAULT* is used (if there is no such key in the file then no plug-ins are loaded). 

 According to the OCCT resource file management rules, to access the resource file the environment variable *CSF_PluginFileNameDefaults* (and optionally *CSF_PluginFileNameUserDefaults*) must be set and point to the directory storing the resource file. If it is omitted then the plug-in resource file will be searched in the <i>$CASROOT/src/DrawResources</i> directory. 

@@ -850,7 +850,7 @@ TopoDS_Solid B = DBRep::Get(argv[1]);

@section occt_draw_4 Graphic Commands

-Graphic commands are used to manage the Draw graphic system. Draw provides a 2d and a 3d viewer with up to 30 views. Views are numbered and the index of the view is displayed in the window’s title. Objects are displayed in all 2d views or in all 3d views, depending on their type. 2d objects can only be viewed in 2d views while 3d objects – only in 3d views correspondingly. 
+Graphic commands are used to manage the Draw graphic system. Draw provides a 2d and a 3d viewer with up to 30 views. Views are numbered and the index of the view is displayed in the window’s title. Objects are displayed in all 2d views or in all 3d views, depending on their type. 2d objects can only be viewed in 2d views while 3d objects -- only in 3d views correspondingly. 

@subsection occt_draw_4_1 Axonometric viewer

@@ -1272,9 +1272,9 @@ When an object is modified or erased, the whole view must be repainted. To avoid

 Graphic operations are buffered by Draw (and also by the X system). Usually the buffer is flushed at the end of a command and before graphic selection. If you want to flush the buffer from inside a script, use the **dflush** command. 

-See also: <a href="#occt_draw_4_1_11">pick</a> command.  
+See also: @ref occt_draw_4_1_11 "pick" command.  

-@subsection occt_draw_4_2 AIS viewer – view commands
+@subsection occt_draw_4_2 AIS viewer -- view commands

@subsubsection occt_draw_4_2_1 vinit

@@ -1544,13 +1544,13 @@ vstereo [0|1] [-mode Mode] [-reverse {0|1}] [-anaglyph Filter]

 Control stereo output mode.
 Available modes for -mode:
- * quadBuffer - OpenGL QuadBuffer stereo, requires driver support. Should be called BEFORE vinit!
- * anaglyph         - Anaglyph glasses
- * rowInterlaced    - row-interlaced display
- * columnInterlaced - column-interlaced display
- * chessBoard       - chess-board output
- * sideBySide       - horizontal pair
- * overUnder        - vertical pair
+ * quadBuffer -- OpenGL QuadBuffer stereo, requires driver support. Should be called BEFORE vinit!
+ * anaglyph         -- Anaglyph glasses
+ * rowInterlaced    -- row-interlaced display
+ * columnInterlaced -- column-interlaced display
+ * chessBoard       -- chess-board output
+ * sideBySide       -- horizontal pair
+ * overUnder        -- vertical pair
 Available Anaglyph filters for -anaglyph:
 * redCyan, redCyanSimple, yellowBlue, yellowBlueSimple, greenMagentaSimple

@@ -1576,7 +1576,7 @@ vfrustumculling [toEnable]
 Enables/disables objects clipping.


-@subsection occt_draw_4_3 AIS viewer – display commands
+@subsection occt_draw_4_3 AIS viewer -- display commands

@subsubsection occt_draw_4_3_1 vdisplay

@@ -1607,7 +1607,7 @@ Local selection context will be opened if there is not any.
 * *trsfPersPos* sets an anchor point for transform persistence.
 * *2d|-2dTopDown* displays object in screen coordinates.
 * *dispmode* sets display mode for objects.
-* *highmode* sets hilight mode for objects.
+* *highmode* sets highlight mode for objects.
 * *redisplay* recomputes presentation of objects.

 **Example:** 
@@ -1776,7 +1776,7 @@ vaspects [-noupdate|-update] [name1 [name2 [...]] | -defaults]
 Manage presentation properties of all, selected or named objects.
 When *-subshapes* is specified than following properties will be assigned to specified sub-shapes.
 When *-defaults* is specified than presentation properties will be assigned to all objects that have not their own specified properties and to all objects to be displayed in the future.
-If *-defaults* is used there should not be any objects' names and -subshapes specifier.
+If *-defaults* is used there should not be any names of objects and *-subshapes* specifier.

 Aliases:
 ~~~~~
@@ -2009,8 +2009,8 @@ vstate [-entities] [-hasSelected] [name1] ... [nameN]
 ~~~~~ 

 Reports show/hidden state for selected or named objects
- * *entities* - print low-level information about detected entities
- * *hasSelected* - prints 1 if context has selected shape and 0 otherwise
+ * *entities* -- prints low-level information about detected entities;
+ * *hasSelected* -- prints 1 if the context has a selected shape and 0 otherwise.

@subsubsection occt_draw_4_3_25 vraytrace

@@ -2032,17 +2032,17 @@ vrenderparams [-rayTrace|-raster] [-rayDepth 0..10] [-shadows {on|off}]
 ~~~~~

 Manages rendering parameters:
-* rayTrace     - Enables  GPU ray-tracing
-* raster       - Disables GPU ray-tracing
-* rayDepth     - Defines maximum ray-tracing depth
-* shadows      - Enables/disables shadows rendering
-* reflections  - Enables/disables specular reflections
-* fsaa         - Enables/disables adaptive anti-aliasing
-* gleam        - Enables/disables transparency shadow effects
-* gi           - Enables/disables global illumination effects
-* brng         - Enables/disables blocked RNG (fast coherent PT)
-* env          - Enables/disables environment map background
-* shadingModel - Controls shading model from enumeration color, flat, gouraud, phong
+* rayTrace     -- Enables  GPU ray-tracing
+* raster       -- Disables GPU ray-tracing
+* rayDepth     -- Defines maximum ray-tracing depth
+* shadows      -- Enables/disables shadows rendering
+* reflections  -- Enables/disables specular reflections
+* fsaa         -- Enables/disables adaptive anti-aliasing
+* gleam        -- Enables/disables transparency shadow effects
+* gi           -- Enables/disables global illumination effects
+* brng         -- Enables/disables blocked RNG (fast coherent PT)
+* env          -- Enables/disables environment map background
+* shadingModel -- Controls shading model from enumeration color, flat, gouraud, phong

 Unlike vcaps, these parameters dramatically change visual properties.
 Command is intended to control presentation quality depending on hardware capabilities and performance.
@@ -2082,7 +2082,7 @@ vinit
 vsetcolorbg 200 0 200
 ~~~~~

-@subsection occt_draw_4_4 AIS viewer – object commands
+@subsection occt_draw_4_4 AIS viewer -- object commands

@subsubsection occt_draw_4_4_1 vtrihedron

@@ -2186,8 +2186,8 @@ vplane name [PlaneName] [PointName]

 Creates a plane from named or interactively selected entities.
 TypeOfSensitivity:
- * 0 - Interior
- * 1 - Boundary
+ * 0 -- Interior
+ * 1 -- Boundary

 **Example:** 
 ~~~~~
@@ -2275,15 +2275,15 @@ vselmode [object] mode_number is_turned_on=(1|0)
 Sets the selection mode for an object. If the object value is not defined, the selection mode is set for all displayed objects. 
 *Mode_number* is non-negative integer that has different meaning for different interactive object classes.
 For shapes the following *mode_number* values are allowed:
- * 0 - shape
- * 1 - vertex
- * 2 - edge
- * 3 - wire
- * 4 - face
- * 5 - shell
- * 6 - solid
- * 7 - compsolid
- * 8 - compound
+ * 0 -- shape
+ * 1 -- vertex
+ * 2 -- edge
+ * 3 -- wire
+ * 4 -- face
+ * 5 -- shell
+ * 6 -- solid
+ * 7 -- compsolid
+ * 8 -- compound
 *is_turned_on* is:
 * 1 if mode is to be switched on
 * 0 if mode is to be switched off
@@ -2361,18 +2361,18 @@ vpointcloud name shape [-randColor] [-normals] [-noNormals]

 Creates an interactive object for an arbitary set of points from the triangulated shape.
 Additional options:
- * *randColor* - generate random color per point
- * *normals*   - generate normal per point (default)
- * *noNormals* - do not generate normal per point
+ * *randColor* -- generate random color per point
+ * *normals*   -- generate normal per point (default)
+ * *noNormals* -- do not generate normal per point

 ~~~~~
 vpointcloud name x y z r npts {surface|volume} [-randColor] [-normals] [-noNormals]
 ~~~~~
 Creates an arbitrary set of points (npts) randomly distributed on a spheric surface or within a spheric volume (x y z r).
 Additional options:
- * *randColor* - generate random color per point
- * *normals*   - generate normal per point (default)
- * *noNormals* - do not generate normal per point
+ * *randColor* -- generate random color per point
+ * *normals*   -- generate normal per point (default)
+ * *noNormals* -- do not generate normal per point

 **Example:**
 ~~~~~
@@ -2385,21 +2385,21 @@ vfit

 Syntax:
 ~~~~~
-vclipplane maxplanes <view_name> - gets plane limit for the view.
-vclipplane create <plane_name> - creates a new plane.
-vclipplane delete <plane_name> - delete a plane.
-vclipplane clone <source_plane> <plane_name> - clones the plane definition.
-vclipplane set/unset <plane_name> object <object list> - sets/unsets the plane for an IO.
-vclipplane set/unset <plane_name> view <view list> - sets/unsets plane for a view.
-vclipplane change <plane_name> on/off - turns clipping on/off.
-vclipplane change <plane_name> equation <a> <b> <c> <d> - changes plane equation.
-vclipplane change <plane_name> capping on/off - turns capping on/off.
-vclipplane change <plane_name> capping color <r> <g> <b> - sets color.
-vclipplane change <plane name> capping texname <texture> - sets texture.
-vclipplane change <plane_name> capping texscale <sx> <sy> - sets texture scale.
-vclipplane change <plane_name> capping texorigin <tx> <ty> - sets texture origin.
-vclipplane change <plane_name> capping texrotate <angle> - sets texture rotation.
-vclipplane change <plane_name> capping hatch on/off/<id> - sets hatching mask.
+vclipplane maxplanes <view_name> -- gets plane limit for the view.
+vclipplane create <plane_name> -- creates a new plane.
+vclipplane delete <plane_name> -- deletes a plane.
+vclipplane clone <source_plane> <plane_name> -- clones the plane definition.
+vclipplane set/unset <plane_name> object <object list> -- sets/unsets the plane for an IO.
+vclipplane set/unset <plane_name> view <view list> -- sets/unsets plane for a view.
+vclipplane change <plane_name> on/off -- turns clipping on/off.
+vclipplane change <plane_name> equation <a> <b> <c> <d> -- changes plane equation.
+vclipplane change <plane_name> capping on/off -- turns capping on/off.
+vclipplane change <plane_name> capping color <r> <g> <b> -- sets color.
+vclipplane change <plane name> capping texname <texture> -- sets texture.
+vclipplane change <plane_name> capping texscale <sx> <sy> -- sets texture scale.
+vclipplane change <plane_name> capping texorigin <tx> <ty> -- sets texture origin.
+vclipplane change <plane_name> capping texrotate <angle> -- sets texture rotation.
+vclipplane change <plane_name> capping hatch on/off/<id> -- sets hatching mask.
 ~~~~~

 Manages clipping planes
@@ -2498,7 +2498,7 @@ vmovedim dim1 -10 30 0
 ~~~~~


-@subsection occt_draw_4_5 AIS viewer – Mesh Visualization Service
+@subsection occt_draw_4_5 AIS viewer -- Mesh Visualization Service

 **MeshVS** (Mesh Visualization Service) component provides flexible means of displaying meshes with associated pre- and post- processor data.

@@ -2543,10 +2543,10 @@ meshselmode meshname selectionmode
 ~~~~~ 

 Changes the selection mode of object **meshname**. The *selectionmode* is integer OR-combination of mode flags. The basic flags are the following: 
-* *1* – node selection;
-* *2* – 0D elements (not supported in STL); 
-* *4* – links (not supported in STL); 
-* *8* – faces.
+* *1* -- node selection;
+* *2* -- 0D elements (not supported in STL); 
+* *4* -- links (not supported in STL); 
+* *8* -- faces.
 
 **Example:** 
 ~~~~~
@@ -2597,27 +2597,27 @@ meshmat meshname material
 Changes the material of object **meshname**.

 *material* is represented with an integer value as follows (equivalent to enumeration *Graphic3d_NameOfMaterial*): 
-* *0 - BRASS,* 
-* *1 - BRONZE,* 
-* *2 - COPPER,* 
-* *3 - GOLD,* 
-* *4 - PEWTER,* 
-* *5 - PLASTER,* 
-* *6 - PLASTIC,* 
-* *7 - SILVER,* 
-* *8 - STEEL,* 
-* *9 - STONE,* 
-* *10 - SHINY_PLASTIC,* 
-* *11 - SATIN,*
-* *12 - METALIZED,* 
-* *13 - NEON_GNC,* 
-* *14 - CHROME,*
-* *15 - ALUMINIUM,*
-* *16 - OBSIDIAN,* 
-* *17 - NEON_PHC,* 
-* *18 - JADE,*
-* *19 - DEFAULT,* 
-* *20 - UserDefined*
+* *0 -- BRASS,* 
+* *1 -- BRONZE,* 
+* *2 -- COPPER,* 
+* *3 -- GOLD,* 
+* *4 -- PEWTER,* 
+* *5 -- PLASTER,* 
+* *6 -- PLASTIC,* 
+* *7 -- SILVER,* 
+* *8 -- STEEL,* 
+* *9 -- STONE,* 
+* *10 -- SHINY_PLASTIC,* 
+* *11 -- SATIN,*
+* *12 -- METALIZED,* 
+* *13 -- NEON_GNC,* 
+* *14 -- CHROME,*
+* *15 -- ALUMINIUM,*
+* *16 -- OBSIDIAN,* 
+* *17 -- NEON_PHC,* 
+* *18 -- JADE,*
+* *19 -- DEFAULT,* 
+* *20 -- UserDefined*
 
 **Example:** 
 ~~~~~
@@ -2736,7 +2736,7 @@ Creates a window for VTK viewer.

@figure{/user_guides/draw_test_harness/images/draw_image001.png}

-@subsection occt_draw_4_6_2	ivtkdisplay
+@subsubsection occt_draw_4_6_2	ivtkdisplay

 Syntax:
 ~~~~~
@@ -2755,7 +2755,7 @@ ivtkdisplay c

@figure{/user_guides/draw_test_harness/images/draw_image002.png}

-@subsection occt_draw_4_6_3	ivtkerase
+@subsubsection occt_draw_4_6_3	ivtkerase

 Syntax:
 ~~~~~
@@ -2781,7 +2781,7 @@ ivtkerase cy
 ivtkerase s c
 ~~~~~

-@subsection occt_draw_4_6_4	 ivtkfit
+@subsubsection occt_draw_4_6_4	 ivtkfit

 Syntax:
 ~~~~~
@@ -2790,7 +2790,7 @@ ivtkfit

 Automatic zoom/panning.

-@subsection occt_draw_4_6_5	ivtkdispmode
+@subsubsection occt_draw_4_6_5	ivtkdispmode

 Syntax:
 ~~~~~
@@ -2813,7 +2813,7 @@ ivtksetdispmode c 1

@figure{/user_guides/draw_test_harness/images/draw_image003.png}
 
-@subsection occt_draw_4_6_6	ivtksetselmode
+@subsubsection occt_draw_4_6_6	ivtksetselmode

 Syntax:
 ~~~~~
@@ -2835,7 +2835,7 @@ ivtksetselmode a 4 1

@figure{/user_guides/draw_test_harness/images/draw_image004.png}
 
-@subsection occt_draw_4_6_7	ivtkmoveto
+@subsubsection occt_draw_4_6_7	ivtkmoveto

 Syntax:
 ~~~~~
@@ -2852,7 +2852,7 @@ ivtkdisplay c
 ivtkmoveto 40 50
 ~~~~~

-@subsection occt_draw_4_6_8	ivtkselect
+@subsubsection occt_draw_4_6_8	ivtkselect

 Syntax:
 ~~~~~
@@ -2869,7 +2869,7 @@ ivtkdisplay c
 ivtkselect 40 50
 ~~~~~

-@subsection occt_draw_4_6_9	ivtkdump
+@subsubsection occt_draw_4_6_9	ivtkdump

 Syntax:
 ~~~~~
@@ -2890,7 +2890,7 @@ ivtkdisplay c
 ivtkdump D:/ConeSnapshot.png rgb 768 768
 ~~~~~

-@subsection occt_draw_4_6_10	ivtkbgcolor
+@subsubsection occt_draw_4_6_10	ivtkbgcolor


 Syntax:
@@ -2949,7 +2949,7 @@ Syntax:
 IsInSession path
 ~~~~~ 

-Returns *0*, if **path** document is managed by the application session, *1* – otherwise. 
+Returns *0*, if **path** document is managed by the application session, *1* -- otherwise. 

 **Example:** 
 ~~~~~
@@ -2970,11 +2970,13 @@ Makes a list of documents handled during the session of the application.

 Syntax:       
 ~~~~~
-Open path docname
+Open path docname [-stream]
 ~~~~~ 

 Retrieves the document of file **docname** in the path **path**. Overwrites the document, if it is already in session. 

+option <i>-stream</i> activates usage of alternative interface of OCAF persistence working with C++ streams instead of file names.
+
 **Example:** 
 ~~~~~
 Open /myPath/myFile.std D
@@ -3012,10 +3014,12 @@ Save D

 Syntax:       
 ~~~~~
-SaveAs docname path
+SaveAs docname path [-stream]
 ~~~~~ 

-Saves the active document in the file **docname** in the path **path**. Overwrites the file if it already exists. 
+Saves the active document in the file **docname** in the path **path**. Overwrites the file if it already exists.
+
+option <i>-stream</i> activates usage of alternative interface of OCAF persistence working with C++ streams instead of file names.

 **Example:** 
 ~~~~~
@@ -3179,7 +3183,7 @@ Syntax:
 NewCommand docname
 ~~~~~ 

-This is a short-cut for Commit and Open transaction. 
+This is a shortcut for Commit and Open transaction. 

 **Example:** 
 ~~~~~
@@ -3761,7 +3765,7 @@ Finds or creates a Plane attribute at *entry* label and sets *plane* as generate

 **Example:** 
 ~~~~~
-plane pl 10 20 30 –1 0 0 
+plane pl 10 20 30 -1 0 0 
 SetPlane D 0:2 pl 
 ~~~~~

@@ -4234,7 +4238,7 @@ Syntax:
 AISMaterial docname entry [material] 
 ~~~~~

-Sets (if *material* is defined) or gets the value of transparency for *AISPresentation* attribute of an *entry* label. *material* is integer from 0 to 20 (see <a href="#occt_draw_4_5_6">meshmat</a> command). 
+Sets (if *material* is defined) or gets the value of transparency for *AISPresentation* attribute of an *entry* label. *material* is integer from 0 to 20 (see @ref occt_draw_4_5_6 "meshmat" command). 

 **Example:** 
 ~~~~~
@@ -4691,7 +4695,7 @@ Syntax:
 ~~~~~
 cone name [x y z [dx dy dz [ux uy uz]]] semi-angle radius 
 ~~~~~
-Creates a cone in the infinite coordinate system along the Z-axis. The radius is that of the circle at the intersection of the cone and the XY plane. The semi-angle is the angle formed by the cone relative to the axis; it should be between –90 and 90. If the radius is 0, the vertex is the origin. 
+Creates a cone in the infinite coordinate system along the Z-axis. The radius is that of the circle at the intersection of the cone and the XY plane. The semi-angle is the angle formed by the cone relative to the axis; it should be between -90 and 90. If the radius is 0, the vertex is the origin. 

 **Example:** 
 ~~~~~
@@ -5761,11 +5765,11 @@ normals s (length = 10), disp normals
 range name value value 
 ~~~~~

-* **orientation** assigns the orientation of shapes - simple and complex - to one of the following four values: *FORWARD, REVERSED, INTERNAL, EXTERNAL*. 
-* **complement** changes the current orientation of shapes to its complement, *FORWARD - REVERSED, INTERNAL - EXTERNAL*. 
-* **invert** creates a new shape which is a copy of the original with the orientation all subshapes reversed. For example, it may be useful to reverse the normals of a solid. 
-* *normals** returns the assignment of colors to orientation values. 
-* **range** defines the length of a selected edge by defining the values of a starting point and an end point.
+* **orientation** -- assigns the orientation of simple and complex shapes to one of the following four values: *FORWARD, REVERSED, INTERNAL, EXTERNAL*. 
+* **complement** -- changes the current orientation of shapes to its complement: *FORWARD* to *REVERSED* and  *INTERNAL* to *EXTERNAL*. 
+* **invert** -- creates a copy of the original shape with a reversed orientation of all subshapes. For example, it may be useful to reverse the normals of a solid. 
+* *normals** -- returns the assignment of colors to orientation values. 
+* **range** -- defines the length of a selected edge by defining the values of a starting point and an end point.
 
 **Example:** 
 ~~~~~
@@ -5847,7 +5851,7 @@ add name toname
 compound [name ...] compoundname 
 ~~~~~

-**emptycopy** returns an empty shape with the same orientation, location, and geometry as the target shape, but with no sub-shapes. If the newname argument is not given, the new shape is stored with the same name. This command is used to modify a frozen shape. A frozen shape is a shape used by another one. To modify it, you must emptycopy it. Its subshape may be reinserted with the **add** command. 
+**emptycopy** returns an empty shape with the same orientation, location, and geometry as the target shape, but with no sub-shapes. If the **newname** argument is not given, the new shape is stored with the same name. This command is used to modify a frozen shape. A frozen shape is a shape used by another one. To modify it, you must **emptycopy** it. Its subshape may be reinserted with the **add** command. 

 **add** inserts shape *C* into shape *S*. Verify that *C* and *S* reference compatible types of objects: 
  * Any *Shape* can be added to a *Compound*.
@@ -5880,10 +5884,10 @@ checkshape [-top] shape [result] [-short]
 ~~~~~

 Where: 
-* *top* – optional parameter, which allows checking only topological validity of a shape. 
-* *shape*– the only required parameter which represents the name of the shape to check. 
-* *result* – optional parameter which is the prefix of the output shape names. 
-* *short* – a short description of the check. 
+* *top* -- optional parameter, which allows checking only topological validity of a shape. 
+* *shape* -- the only required parameter which represents the name of the shape to check. 
+* *result* -- optional parameter which is the prefix of the output shape names. 
+* *short* -- a short description of the check. 

 **checkshape** examines the selected object for topological and geometric coherence. The object should be a three dimensional shape. 

@@ -6381,7 +6385,7 @@ All these commands create solid blocks in the default coordinate system, using t

 **psphere** creates a solid sphere centered on the origin. If two angles, *angle1* and *angle2*, are given, the solid will be limited by two planes at latitude *angle1* and *angle2*. The angles must be increasing and in the range -90,90. 

-**ptorus** creates a solid torus with the given radii, centered on the origin, which is a point along the z axis. If two angles increasing in degree in the range 0 – 360 are given, the solid will be bounded by two planar surfaces at those positions on the circle. 
+**ptorus** creates a solid torus with the given radii, centered on the origin, which is a point along the z axis. If two angles increasing in degree in the range 0 -- 360 are given, the solid will be bounded by two planar surfaces at those positions on the circle. 

 **Example:** 
 ~~~~~
@@ -6420,11 +6424,11 @@ halfspace hr b_3 0.5 0.5 0.5

 Sweeping creates shapes by sweeping out a shape along a defined path: 

-  * **prism** sweeps along a direction.
-  * **revol** sweeps around an axis.
-  * **pipe** sweeps along a wire.
-  * **mksweep** and **buildsweep** are commands to create sweeps by defining the arguments and algorithms.
-  * **thrusections** creates a sweep from wire in different planes.
+  * **prism** -- sweeps along a direction.
+  * **revol** -- sweeps around an axis.
+  * **pipe** -- sweeps along a wire.
+  * **mksweep** and **buildsweep** -- to create sweeps by defining the arguments and algorithms.
+  * **thrusections** -- creates a sweep from wire in different planes.


@subsubsection occt_draw_7_4_1  prism
@@ -6507,12 +6511,12 @@ options are :
 * *-G guide* 

 These commands are used to create a shape from wires. One wire is designated as the contour that defines the direction; it is called the spine. At least one other wire is used to define the the sweep profile. 
-* **mksweep** initializes the sweep creation and defines the wire to be used as the spine. 
-* **addsweep** defines the wire to be used as the profile. 
-* **deletesweep** cancels the choice of profile wire, without leaving the mksweep mode. You can re-select a profile wire. 
-* **setsweep** commands the algorithms used for the construction of the sweep. 
-* **simulsweep** can be used to create a preview of the shape. [n] is the number of sections that are used to simulate the sweep. 
-* **buildsweep** creates the sweep using the arguments defined by all the commands. 
+* **mksweep** -- initializes the sweep creation and defines the wire to be used as the spine. 
+* **addsweep** -- defines the wire to be used as the profile. 
+* **deletesweep** -- cancels the choice of profile wire, without leaving the mksweep mode. You can re-select a profile wire. 
+* **setsweep** -- commands the algorithms used for the construction of the sweep. 
+* **simulsweep** -- can be used to create a preview of the shape. [n] is the number of sections that are used to simulate the sweep. 
+* **buildsweep** -- creates the sweep using the arguments defined by all the commands. 

 **Example:** 
 ~~~~~
@@ -6564,9 +6568,9 @@ Tolerances obtenues   -- 3d : 0

 Transformations are applications of matrices. When the transformation is nondeforming, such as translation or rotation, the object is not copied. The topology localcoordinate system feature is used. The copy can be enforced with the **tcopy** command. 

-  * **tcopy** makes a copy of the structure of a shape.
-  * **ttranslate**, **trotate**, **tmove**, **reset** move a shape.
-  * **tmirror**, **tscale** always modify the shape.
+  * **tcopy** -- makes a copy of the structure of a shape.
+  * **ttranslate**, **trotate**, **tmove** and **reset** -- move a shape.
+  * **tmirror** and **tscale** -- always modify the shape.


@subsubsection occt_draw_7_5_1   tcopy
@@ -6871,19 +6875,19 @@ bop shape1 shape2
 bopsection result 
 ~~~~~

-* **bopsection** creates a compound object consisting of the edges for the intersection curves on the faces of two shapes.
-* **bop** fills data structure (DS) of boolean operation for *shape1* and *shape2*. 
-* **bopsection** command used after **bop** command.
+* **bopsection** -- creates a compound object consisting of the edges for the intersection curves on the faces of two shapes.
+* **bop** -- fills data structure (DS) of boolean operation for *shape1* and *shape2*. 
+* **bopsection** -- is used after **bop** command.
 
 Short variant syntax:      
 ~~~~~
 bsection result shape1 shape2 [-2d/-2d1/-2s2] [-a] 
 ~~~~~

-* <i>-2d</i>  -  PCurves are computed on both parts. 
-* <i>-2d1</i> - PCurves are computed on first part. 
-* <i>-2d2</i> - PCurves are computed on second part. 
-* <i>-a</i>  -   built geometries  are approximated. 
+* <i>-2d</i>  --  PCurves are computed on both parts. 
+* <i>-2d1</i> -- PCurves are computed on first part. 
+* <i>-2d2</i> -- PCurves are computed on second part. 
+* <i>-a</i>  --   built geometries  are approximated. 

 **Example:** 

@@ -6910,15 +6914,15 @@ bopargcheck shape1 [[shape2] [-F/O/C/T/S/U] [/R|F|T|V|E|I|P]] [#BF]

 **bopargcheck** checks the validity of argument(s) for boolean operations. 

-* Boolean Operation - (by default a section is made) : 
+* Boolean Operation -- (by default a section is made) : 
  * **F** (fuse) 
  * **O** (common) 
  * **C** (cut) 
  * **T** (cut21) 
  * **S** (section) 
  * **U** (unknown) 
-* Test Options - (by default all options are enabled) : 
-  * **R** (disable small edges (shrank range) test) 
+* Test Options -- (by default all options are enabled) : 
+  * **R** (disable small edges (shrink range) test) 
  * **F** (disable faces verification test) 
  * **T** (disable tangent faces searching test) 
  * **V** (disable test possibility to merge vertices) 
@@ -6926,8 +6930,8 @@ bopargcheck shape1 [[shape2] [-F/O/C/T/S/U] [/R|F|T|V|E|I|P]] [#BF]
  * **I** (disable self-interference test) 
  * **P** (disable shape type test) 
 * Additional Test Options :
-  * **B** (stop test on first faulty found) - by default it is off; 
-  * **F** (full output for faulty shapes) - by default the output is made in a short format.
+  * **B** (stop test on first faulty found) -- by default it is off; 
+  * **F** (full output for faulty shapes) -- by default the output is made in a short format.

 **Note** that Boolean Operation and Test Options are used only for a couple of argument shapes, except for <b>I</b> and <b>P</b> options that are always used to test a couple of shapes as well as a single shape.

@@ -7248,11 +7252,11 @@ xdistc2dc2dss curve2d_1 curve2d_2 surface_1 surface_2 startParam finishParam [Nu
 It is assumed that curves have the same parametrization range and *startParam* is less than *finishParam*.

 Commands with prefix *xdist* allow checking the distance between two objects on even grid:
-  * **xdistef** - distance between edge and face;
-  * **xdistcs** - distance between curve and surface. This means that the projection of each sample point to the surface is computed;
-  * **xdistcc** - distance between two 3D curves;
-  * **xdistcc2ds** - distance between 3d curve and 2d curve on surface;
-  * **xdistc2dc2dss** - distance between two 2d curves on surface.
+  * **xdistef** -- distance between edge and face;
+  * **xdistcs** -- distance between curve and surface. This means that the projection of each sample point to the surface is computed;
+  * **xdistcc** -- distance between two 3D curves;
+  * **xdistcc2ds** -- distance between 3d curve and 2d curve on surface;
+  * **xdistc2dc2dss** -- distance between two 2d curves on surface.
  
 **Examples**
 ~~~~~
@@ -7689,21 +7693,21 @@ See @ref occt_user_guides__boolean_operations "Boolean operations" user's guide
@subsection occt_draw_20_1 Definitions

 The following terms and definitions are used in this document:
-* **Objects** – list of shapes that are arguments of the algorithm.
-* **Tools** – list of shapes that are arguments of the algorithm. Difference between Objects and Tools is defined by specific requirements of the operations (Boolean Operations, Partition Operation).
-* **DS** – internal data structure used by the algorithm (*BOPDS_DS* object).
-* **PaveFiller** – intersection part of the algorithm (*BOPAlgo_PaveFiller* object).
-* **Builder** – builder part of the algorithm (*BOPAlgo_Builder* object).
-* **IDS Index** – the index of the vector *myLines*.
+* **Objects** -- list of shapes that are arguments of the algorithm.
+* **Tools** -- list of shapes that are arguments of the algorithm. Difference between Objects and Tools is defined by specific requirements of the operations (Boolean Operations, Partition Operation).
+* **DS** -- internal data structure used by the algorithm (*BOPDS_DS* object).
+* **PaveFiller** -- intersection part of the algorithm (*BOPAlgo_PaveFiller* object).
+* **Builder** -- builder part of the algorithm (*BOPAlgo_Builder* object).
+* **IDS Index** -- the index of the vector *myLines*.

@subsection occt_draw_20_2 General commands

-* **bclearobjects** - clears the list of Objects;	
-* **bcleartools**	- clears the list of Tools;	
-* **baddobjects** *S1 S2...Sn*	- adds shapes *S1, S2, ... Sn* as Objects;	
-* **baddtools** *S1 S2...Sn* - adds shapes *S1, S2, ... Sn* as Tools;
-* **bfillds** - performs the Intersection Part of the Algorithm;	
-* **bbuild** *r* - performs the Building Part of the Algorithm; *r* is the resulting shape.
+* **bclearobjects** -- clears the list of Objects;	
+* **bcleartools**	-- clears the list of Tools;	
+* **baddobjects** *S1 S2...Sn*	-- adds shapes *S1, S2, ... Sn* as Objects;	
+* **baddtools** *S1 S2...Sn* -- adds shapes *S1, S2, ... Sn* as Tools;
+* **bfillds** -- performs the Intersection Part of the Algorithm;	
+* **bbuild** *r* -- performs the Building Part of the Algorithm; *r* is the resulting shape.

@subsection occt_draw_20_3 Commands for Intersection Part

@@ -7713,14 +7717,14 @@ All commands listed below  are available when the Intersection Part of the algor
 	
 Syntax: 
 ~~~~
-bopds –v [e, f]	
+bopds -v [e, f]	
 ~~~~

 Displays:
 * all BRep shapes of arguments that are in the DS [default];
-* <i>–v</i> : only vertices of arguments that are in the DS;
-* <i>–e</i> : only edges of arguments that are in the DS;
-* <i>–f</i> : only faces of arguments that are in the DS.
+* <i>-v</i> : only vertices of arguments that are in the DS;
+* <i>-e</i> : only edges of arguments that are in the DS;
+* <i>-f</i> : only faces of arguments that are in the DS.

@subsubsection occt_draw_20_3_2 bopdsdump

@@ -7747,9 +7751,9 @@ Example:
 ~~~~

@code 0 : SOLID { 1 } @endcode has the following meaning:
-* *0* – index in the DS;
-* *SOLID* – type of the shape;
-* <i>{ 1 }</i> – a DS index of the successors.
+* *0* -- index in the DS;
+* *SOLID* -- type of the shape;
+* <i>{ 1 }</i> -- a DS index of the successors.

@subsubsection occt_draw_20_3_3 bopindex

@@ -7769,9 +7773,9 @@ bopiterator [t1 t2]
 Prints pairs of DS indices of source shapes that are intersected in terms of bounding boxes.

 <i>[t1 t2]</i> are types of the shapes:
-* *7* - vertex;
-* *6* - edge;
-* *4* – face.
+* *7* -- vertex;
+* *6* -- edge;
+* *4* -- face.

 Example:
 ~~~~
@@ -7785,7 +7789,7 @@ Example:
 ~~~~

 * *bopiterator 6 4* prints pairs of indices for types: edge/face;
-* *z58 z12* - DS indices of intersecting edge and face.
+* *z58 z12* -- DS indices of intersecting edge and face.


@subsubsection occt_draw_20_3_5 bopinterf
@@ -7809,9 +7813,9 @@ Example:
 ~~~~

 Here, record <i>(58, 12, 68)</i> means:
-* *58* – a DS index of the edge;
-* *12* – a DS index of the face;
-* *68* – a DS index of the new vertex.
+* *58* -- a DS index of the edge;
+* *12* -- a DS index of the face;
+* *68* -- a DS index of the new vertex.

@subsubsection occt_draw_20_3_6 bopsp	

@@ -7828,8 +7832,8 @@ Example:
 edge 38 : z38_84 z38_85
 ~~~~

-* *edge 58* – 58 is a DS index of the original edge.
-* *z58_74 z58_75* – split edges, where 74, 75 are DS indices of the split edges.
+* *edge 58* -- 58 is a DS index of the original edge.
+* *z58_74 z58_75* -- split edges, where 74, 75 are DS indices of the split edges.

@subsubsection occt_draw_20_3_7 bopcb

@@ -7851,13 +7855,13 @@ Example:
 ~~~~

 This command dumps common blocks for the source edge with index 17. 
-* *PB* – information about the Pave Block;
-	* *71* – a DS index of the split edge
-	* *17* – a DS index of the original edge
-* <i>Pave1 : { 68 3.000 }</i> – information about the Pave:
-	* *68* – a DS index of the vertex of the pave
-	* *3.000* – a parameter of vertex 68 on edge 17
-* *Faces: 36* – 36 is a DS index of the face the common block belongs to. 
+* *PB* -- information about the Pave Block;
+	* *71* -- a DS index of the split edge
+	* *17* -- a DS index of the original edge
+* <i>Pave1 : { 68 3.000 }</i> -- information about the Pave:
+	* *68* -- a DS index of the vertex of the pave
+	* *3.000* -- a parameter of vertex 68 on edge 17
+* *Faces: 36* -- 36 is a DS index of the face the common block belongs to. 


@subsubsection occt_draw_20_3_8 bopfin
@@ -7880,8 +7884,8 @@ Example:
 ~~~~


-* <i>PB:{ E:71 orE:17 Pave1: { 68 3.000 } Pave2: { 18 10.000 } }</i> – information about the Pave Block; 
-* <i>vrts In ... 18 – 18</i> a DS index of the vertex IN the face.
+* <i>PB:{ E:71 orE:17 Pave1: { 68 3.000 } Pave2: { 18 10.000 } }</i> -- information about the Pave Block; 
+* <i>vrts In ... 18 </i> -- a DS index of the vertex IN the face.

@subsubsection occt_draw_20_3_9 bopfon

@@ -7903,8 +7907,8 @@ Example:
 68 69 70 71
 ~~~~

-* <i>PB:{ E:72 orE:38 Pave1: { 69 0.000 } Pave2: { 68 10.000 } }</i> – information about the Pave Block; 
-* <i>vrts On: ... 68 69 70 71 – 68, 69, 70, 71 </i> DS indices of the vertices ON the face.
+* <i>PB:{ E:72 orE:38 Pave1: { 69 0.000 } Pave2: { 68 10.000 } }</i> -- information about the Pave Block; 
+* <i>vrts On: ... 68 69 70 71</i> -- DS indices of the vertices ON the face.

@subsubsection occt_draw_20_3_10 bopwho

@@ -7921,7 +7925,7 @@ Example:
 rank: 0
 ~~~~

-* *rank: 0* – means that shape 5 results from the Argument with index 0.
+* *rank: 0* -- means that shape 5 results from the Argument with index 0.

 Example:
 ~~~~
@@ -7933,9 +7937,9 @@ Example:
 ~~~~

 This means that shape 68 is a result of the following interferences:
-* *EF: (58, 12)* – edge 58 / face 12
-* *FF curves: (12, 56)* – edge from the intersection curve between faces 12 and 56
-* *FF curves: (12, 64)* – edge from the intersection curve between faces 12 and 64
+* *EF: (58, 12)* -- edge 58 / face 12
+* *FF curves: (12, 56)* -- edge from the intersection curve between faces 12 and 56
+* *FF curves: (12, 64)* -- edge from the intersection curve between faces 12 and 64

@subsubsection occt_draw_20_3_11 bopnews

@@ -7944,8 +7948,8 @@ Syntax:
 bopnews -v [-e]
 ~~~~

-* <i>-v</i> - displays all new vertices produced during the operation;
-* <i>-e</i> - displays all new edges produced during the operation.
+* <i>-v</i> -- displays all new vertices produced during the operation;
+* <i>-e</i> -- displays all new edges produced during the operation.

@subsection occt_draw_20_4	Commands for the Building Part

@@ -8098,11 +8102,11 @@ stepwrite mode shape_name file_name
 Writes an OCCT shape to a STEP file. 

 The following  modes are available : 
-    * *a* - as is – mode is selected automatically depending on the type & geometry of the shape; 
-    * *m* - *manifold_solid_brep* or *brep_with_voids* 
-    * *f* - *faceted_brep* 
-    * *w* - *geometric_curve_set* 
-    * *s* - *shell_based_surface_model* 
+    * *a* -- as is -- the mode is selected automatically depending on the type & geometry of the shape; 
+    * *m* -- *manifold_solid_brep* or *brep_with_voids* 
+    * *f* -- *faceted_brep* 
+    * *w* -- *geometric_curve_set* 
+    * *s* -- *shell_based_surface_model* 
 
 For further information see <a href="#user_guides__step.html#occt_step_6_5">Writing a STEP file</a>. 

@@ -8408,17 +8412,17 @@ tpstat [*|?]<symbol> [<selection>]

 Provides all statistics on the last transfer, including a list of transferred entities with mapping from IGES or STEP to OCCT types, as well as fail and warning messages. The parameter <i>\<symbol\></i> defines what information will be printed: 

-* *g* - General statistics (a list of results and messages)
-* *c* - Count of all warning and fail messages
-* *C* - List of all warning and fail messages
-* *f* - Count of all fail messages
-* *F* - List of all fail messages
-* *n* - List of all transferred roots
-* *s* - The same, with types of source entity and the type of result
-* *b* - The same, with messages
-* *t* - Count of roots for geometrical types
-* *r* - Count of roots for topological types
-* *l* - The same, with the type of the source entity
+* *g* -- General statistics (a list of results and messages)
+* *c* -- Count of all warning and fail messages
+* *C* -- List of all warning and fail messages
+* *f* -- Count of all fail messages
+* *F* -- List of all fail messages
+* *n* -- List of all transferred roots
+* *s* -- The same, with types of source entity and the type of result
+* *b* -- The same, with messages
+* *t* -- Count of roots for geometrical types
+* *r* -- Count of roots for topological types
+* *l* -- The same, with the type of the source entity

 The sign \* before parameters *n, s, b, t, r* makes it work on all entities (not only on roots).

@@ -8451,7 +8455,7 @@ xload /disk1/tmp/aaa.stp

@subsection occt_draw_8_4  Overview of XDE commands 

-These commands are used for translation of IGES and STEP files into an XCAF document (special document is inherited from CAF document and is intended for Extended Data Exchange (XDE) ) and working with it. XDE translation allows reading and writing of shapes with additional attributes – colors, layers etc. All commands can be divided into the following groups: 
+These commands are used for translation of IGES and STEP files into an XCAF document (special document is inherited from CAF document and is intended for Extended Data Exchange (XDE) ) and working with it. XDE translation allows reading and writing of shapes with additional attributes -- colors, layers etc. All commands can be divided into the following groups: 
  * XDE translation commands
  * XDE general commands
  * XDE shape’s commands
@@ -8459,7 +8463,7 @@ These commands are used for translation of IGES and STEP files into an XCAF docu
  * XDE layer’s commands
  * XDE property’s commands

-Reminding: All operations of translation are performed with parameters managed by command  <a href="#occt_draw_8_3_14">the command *param*</a>.
+Reminding: All operations of translation are performed with parameters managed by command @ref occt_draw_8_3_14 "param".

@subsubsection occt_draw_8_4_1  ReadIges

@@ -8572,7 +8576,7 @@ Syntax:
 XFromShape <shape>
 ~~~~~

-This command is similar to <a href="#occt_draw_8_3_7">the command *fromshape*</a>, but gives additional information about the file name. It is useful if a shape was translated from several files. 
+This command is similar to the command @ref occt_draw_8_3_7 "fromshape", but gives additional information about the file name. It is useful if a shape was translated from several files. 

 **Example:**
 ~~~~~
@@ -8603,7 +8607,7 @@ Syntax:
 XShow <document> [ <label1> … ]
 ~~~~~

-Shows a shape from a given label in the 3D viewer. If the label is not given – shows all shapes from the document. 
+Shows a shape from a given label in the 3D viewer. If the label is not given -- shows all shapes from the document. 

 **Example:**
 ~~~~~
@@ -8755,7 +8759,7 @@ XGetFreeShapes <document> [shape_prefix]
 ~~~~~

 Print labels or create DRAW shapes for all free shapes in the document. 
-If *shape_prefix* is absent – prints labels, else – creates DRAW shapes with names 
+If *shape_prefix* is absent -- prints labels, else -- creates DRAW shapes with names 
 <i>shape_prefix</i>_num (i.e. for example: there are 3 free shapes and *shape_prefix* = a therefore shapes will be created with names a_1, a_2 and a_3). 

 **Note**: a free shape is a shape to which no other shape refers to. 
@@ -8981,7 +8985,7 @@ Syntax:
 XGetShapeColor <document> <label> <colortype(s|c)>
 ~~~~~

-Returns the color defined by label. If <i>colortype</i>=’s’ – returns surface color, else – returns curve color. 
+Returns the color defined by label. If <i>colortype</i>=’s’ -- returns surface color, else -- returns curve color. 

 **Example:**
 ~~~~~
@@ -9231,7 +9235,7 @@ Syntax:
 XCheckProps <document> [ {0|deflection} [<shape>|<label>] ]
 ~~~~~

-Gets properties for a given shape (*volume*, *area* and <i>centroid</i>) and compares them with the results after internal calculations. If the second parameter is 0, the standard OCCT tool is used for the computation of properties. If the second parameter is not 0, it is processed as a deflection. If the deflection is positive the computation is done by triangulations, if it is negative – meshing is forced. 
+Gets properties for a given shape (*volume*, *area* and <i>centroid</i>) and compares them with the results after internal calculations. If the second parameter is 0, the standard OCCT tool is used for the computation of properties. If the second parameter is not 0, it is processed as a deflection. If the deflection is positive the computation is done by triangulations, if it is negative -- meshing is forced. 

 **Example:**
 ~~~~~
@@ -9350,7 +9354,7 @@ Syntax:
 XShapeMassProps <document> [ <deflection> [{<shape>|<label>}] ]
 ~~~~~

-Computes and returns real mass and real center of gravity for a given shape or for all shapes in a document. The second parameter is used for calculation of the volume and CG(center of gravity). If it is 0, then the standard CASCADE tool (geometry) is used for computation, otherwise - by triangulations with a given deflection. 
+Computes and returns real mass and real center of gravity for a given shape or for all shapes in a document. The second parameter is used for calculation of the volume and CG(center of gravity). If it is 0, then the standard CASCADE tool (geometry) is used for computation, otherwise -- by triangulations with a given deflection. 

 **Example:**
 ~~~~~
@@ -9399,7 +9403,7 @@ Syntax:
 checkfclass2d <face> <ucoord> <vcoord>
 ~~~~~

-Shows where a point which is given by coordinates is located in relation to a given face – outbound, inside or at the bounds. 
+Shows where a point which is given by coordinates is located in relation to a given face -- outbound, inside or at the bounds. 

 **Example:**
 ~~~~~
@@ -9530,14 +9534,14 @@ The following syntax is used:
  * "+" to set on or  
  * "*" to set default 
 * <i>\<parameter\></i> is identified by  letters: 
-  * l - FixLackingMode 
-  * o - FixOrientationMode 
-  * h - FixShiftedMode 
-  * m - FixMissingSeamMode 
-  * d - FixDegeneratedMode 
-  * s - FixSmallMode 
-  * i - FixSelfIntersectionMode 
-  * n - FixNotchedEdgesMode 
+  * l -- FixLackingMode 
+  * o -- FixOrientationMode 
+  * h -- FixShiftedMode 
+  * m -- FixMissingSeamMode 
+  * d -- FixDegeneratedMode 
+  * s -- FixSmallMode 
+  * i -- FixSelfIntersectionMode 
+  * n -- FixNotchedEdgesMode 
 For enhanced message output, use switch '+?' 

 **Example:**
@@ -9716,7 +9720,7 @@ DT_ClosedSplit <result> <shape>
 ~~~~~

 Divides all closed faces in the shape (for example cone) and returns result of given shape into shape, which is given as parameter result. Number of faces in resulting shapes will be increased. 
-Note: Closed face – it’s face with one or more seam. 
+Note: A closed face is a face with one or more seam. 

 **Example:**
 ~~~~~
@@ -9907,7 +9911,7 @@ void MyPack::CurveCommands(Draw_Interpretor& theCommands)
 ... 
 char* g = "Advanced curves creation"; 

-theCommands.Add ( "myadvcurve", "myadvcurve name p1 p2 p3 – Creates my advanced curve from points", 
+theCommands.Add ( "myadvcurve", "myadvcurve name p1 p2 p3 - Creates my advanced curve from points", 
                  __FILE__, myadvcurve, g ); 
 ... 
 } 
@@ -9942,7 +9946,7 @@ DPLUGIN(MyPack)
 As mentioned above, the plug-in resource file must be compliant with Open CASCADE Technology requirements (see *Resource_Manager.cdl* file for details). In particular, it should contain keys separated from their values by a colon (;:;). 
 For every created plug-in there must be a key. For better readability and comprehension it is recommended to have some meaningful name. 
 Thus, the resource file must contain a line mapping this name (key) to the library name. The latter should be without file extension (.dll on Windows, .so on Unix/Linux) and without the ;lib; prefix on Unix/Linux. 
-For several plug-ins one resource file can be created. In such case, keys denoting plug-ins can be combined into groups, these groups - into their groups and so on (thereby creating some hierarchy). Any new parent key must have its value as a sequence of child keys separated by spaces, tabs or commas. Keys should form a tree without cyclic dependencies. 
+For several plug-ins one resource file can be created. In such case, keys denoting plug-ins can be combined into groups, these groups -- into their groups and so on (thereby creating some hierarchy). Any new parent key must have its value as a sequence of child keys separated by spaces, tabs or commas. Keys should form a tree without cyclic dependencies. 

 **Examples** (file MyDrawPlugin): 
 ~~~~~
@@ -9957,14 +9961,14 @@ ADVCURV            : TKMyAdvCurv
 MESHING            : TKMyMesh 
 ~~~~~

-For other examples of the plug-in resource file refer to the <a href="#occt_draw_1_3_2">Plug-in resource file</a> chapter above or to the <i>$CASROOT/src/DrawPlugin</i> file shipped with Open CASCADE Technology. 
+For other examples of the plug-in resource file refer to the @ref occt_draw_1_3_2 "Plug-in resource file" chapter above or to the <i>$CASROOT/src/DrawPlugin</i> file shipped with Open CASCADE Technology. 


@subsection occt_draw_11_5 Dynamic loading and activation

-Loading a plug-in and activating its commands is described in the <a href="#occt_draw_1_3_3">Activation of the commands implemented in the plug-in</a> chapter. 
+Loading a plug-in and activating its commands is described in the @ref occt_draw_1_3_3 "Activation of the commands implemented in the plug-in" chapter. 

-The procedure consists in defining the system variables and using the pload commands in the Test Harness session. 
+The procedure consists in defining the system variables and using the *pload* commands in the Test Harness session. 

 **Example:** 
 ~~~~
--- a/dox/user_guides/foundation_classes/foundation_classes.md
+++ b/dox/user_guides/foundation_classes/foundation_classes.md
@@ -120,7 +120,7 @@ Inside a package, two data types cannot bear the same  name.
 * **Class  method** Does not work on individual  instances, only on the class itself. 

@subsubsection occt_fcug_2_a_3 Classes
-The fundamental software component in object-oriented software  development is the class. A class is the implementation of a **data type**.  It defines its **behavior** (the services offered by its functions) and its **representation** (the data structure of the class – the fields, which store its data). 
+The fundamental software component in object-oriented software  development is the class. A class is the implementation of a **data type**.  It defines its **behavior** (the services offered by its functions) and its **representation** (the data structure of the class -- the fields, which store its data). 

 Classes fall into three categories: 
 * Ordinary classes.
@@ -512,10 +512,10 @@ There are two approaches how to avoid such situation:

 Though generation of Handle class and related C++ code is  normally performed by CDL extractor, it is also possible to define a class managed  by handle without CDL. To facilitate that, several macros are provided in the  file Standard_DefineHandle.hxx: 

-* **DEFINE_STANDARD_HANDLE(class_name,ancestor_name)** - declares Handle class  for a class *class_name* that inherits class *ancestor_name* (for  instance, *Standard_Transient*). This macro should be put in a header file; the  declaration of the handle to a base class must be available (usually put before  or after the declaration of the class *class_name*, or into a separate  header file).  
-* **IMPLEMENT_STANDARD_HANDLE(class_name,ancestor_name)** - implements method  *DownCast()* of the *Handle* class. Should be located in a C++ file (normally the  file where methods of the class *class_name* are implemented). 
-* **DEFINE_STANDARD_RTTI(class_name)** - declares methods required for  RTTI in the class *class_name* declaration; should be in public: section. 
-* **IMPLEMENT_STANDARD_RTTIEXT(class_name,ancestor_name)** - implements above methods. Usually  put into the C++ file implementing class *class_name*. 
+* **DEFINE_STANDARD_HANDLE(class_name,ancestor_name)** -- declares Handle class  for a class *class_name* that inherits class *ancestor_name* (for  instance, *Standard_Transient*). This macro should be put in a header file; the  declaration of the handle to a base class must be available (usually put before  or after the declaration of the class *class_name*, or into a separate  header file).  
+* **IMPLEMENT_STANDARD_HANDLE(class_name,ancestor_name)** -- implements method  *DownCast()* of the *Handle* class. Should be located in a C++ file (normally the  file where methods of the class *class_name* are implemented). 
+* **DEFINE_STANDARD_RTTI(class_name)** -- declares methods required for  RTTI in the class *class_name* declaration; should be in public: section. 
+* **IMPLEMENT_STANDARD_RTTIEXT(class_name,ancestor_name)** -- implements above methods. Usually  put into the C++ file implementing class *class_name*. 
 Note that it is important to ensure correctness of macro  arguments, especially the ancestor name, otherwise the definition may be  inconsistent (no compiler warnings will be issued in case of mistake). 

 In *Appli_ExtSurface.hxx* file:
@@ -762,7 +762,7 @@ It is a widely used practice to include that kind of  protections in a debug bui
 ~~~~~
 where *ErrorTypeName* is the exception type, *condition*  is the logical expression leading to the raise of the exception, and *Error message* is the associated  message. 
  
-The entire call may be removed by defining one of the pre-processor symbols *No_Exception* or <i>No_<ErrorTypeName></i> at compile-time: 
+The entire call may be removed by defining one of the preprocessor symbols *No_Exception* or <i>No_<ErrorTypeName></i> at compile-time: 

 ~~~~~
 #define  No_Exception /* remove all raises */ 
@@ -809,9 +809,9 @@ void f(1)
 }
 ~~~~~

-Here, the first handler will catch exceptions of *Overflow* type and the second one - exceptions of *NumericError* type and all exceptions derived from it, including *Underflow* and *ZeroDivide*. 
+Here, the first handler will catch exceptions of *Overflow* type and the second one -- exceptions of *NumericError* type and all exceptions derived from it, including *Underflow* and *ZeroDivide*. 

-The handlers are checked in order of appearance, from the  nearest to the most distant try block, until one matches the raise expression.  For a try block, it would be a mistake to place a handler for a base exception  type ahead of a handler for its derived type since that would ensure that the  handler for the derived exception would never be invoked.  
+The handlers are checked in order of appearance, from the nearest to the try block to the most distant from it, until one matches the raise expression.  For a try block, it would be a mistake to place a handler for a base exception  type ahead of a handler for its derived type since that would ensure that the  handler for the derived exception would never be invoked.  

 ~~~~~
 void f(1)
@@ -1409,7 +1409,7 @@ The NCollection library provides a full replacement of all TCollection generic c

 Macro definitions of these classes are stored in *NCollection_Define\*.hxx* files. These definitions are now obsolete though still can be used, particularly for compatibility with the existing code. On the contrary, template classes in *NCollection_\*.hxx* files are recommended, they are supported by OPEN CASCADE Company and further developed according to various needs.

-The technology used in this unit continues and complements the one offered in the header file *Standard_DefineHandle* – allowing to implement outside CDL the classes managed by Handle, also providing OCCT RTTI support.
+The technology used in this unit continues and complements the one offered in the header file *Standard_DefineHandle* -- allowing to implement outside CDL the classes managed by Handle, also providing OCCT RTTI support.

@subsubsection occt_fcug_3_3_2 Instantiation of collection classes

@@ -1508,11 +1508,11 @@ There are 4 collection types provided as template classes:
 This type is implemented internally as a list of arrays of the same size. Its properties:
 * Direct (constant-time) access to members like in Array1 type; data are allocated in compact blocks, this provides faster iteration.
 * Can grow without limits, like List, Stack or Queue types.
-* Once having the size LEN, it cannot be reduced to any size less than LEN – there is no operation of removal of items.
+* Once having the size LEN, it cannot be reduced to any size less than LEN -- there is no operation of removal of items.

 Insertion in a Vector-type class is made by two methods:
-* _SetValue(ind, theValue)_ – array-type insertion, where ind is the index of the inserted item, can be any non-negative number. If it is greater than or equal to Length(), then the vector is enlarged (its Length() grows).
-* _Append(theValue)_ – list-type insertion equivalent to _myVec.SetValue(myVec.Length(), theValue)_ – incrementing the size of the collection.
+* _SetValue(ind, theValue)_ -- array-type insertion, where ind is the index of the inserted item, can be any non-negative number. If it is greater than or equal to Length(), then the vector is enlarged (its Length() grows).
+* _Append(theValue)_ -- list-type insertion equivalent to _myVec.SetValue(myVec.Length(), theValue)_, incrementing the size of the collection.

 Other essential properties coming from List and Array1 type collections:
 * Like in *List*, the method *Clear()* destroys all contained objects and releases the allocated memory.
@@ -1617,11 +1617,11 @@ NCollection defines some specific features, in addition to the public API inheri

 Every collection defines its Iterator class capable of iterating the members in some predefined order. Every Iterator is defined as a subtype of the particular collection type (e.g., MyPackage_StackOfPnt::Iterator ). The order of iteration is defined by a particular collection type. The methods of Iterator are: 

-* _void Init (const MyCollection&)_ - initializes the iterator on the collection object;
-* _Standard_Boolean More () const_ - makes a query if there is another non-iterated member;
-* _void Next ()_ - increments the iterator; 
-* _const ItemType& Value () const_ - returns the current member; 
-* _ItemType& ChangeValue () const_ - returns the mutable current member
+* _void Init (const MyCollection&)_ -- initializes the iterator on the collection object;
+* _Standard_Boolean More () const_ -- makes a query if there is another non-iterated member;
+* _void Next ()_ -- increments the iterator; 
+* _const ItemType& Value () const_ -- returns the current member; 
+* _ItemType& ChangeValue () const_ -- returns the mutable current member

 ~~~~~
 typedef Ncollection_Sequence<gp_Pnt>
@@ -1645,9 +1645,9 @@ There is a common abstract base class for all collections for a given item type

 This base class has the following public API:
 * abstract class Iterator as the base class for all Iterators descried above; 
-* _Iterator& CreateIterator () const_ - creates and returns the Iterator on this collection;
-* _Standard_Integer Size () const_ - returns the number of items in this collection;
-* *void Assign (const NCollection_BaseCollection& theOther)* - copies the contents of the Other to this collection object; 
+* _Iterator& CreateIterator () const_ -- creates and returns the Iterator on this collection;
+* _Standard_Integer Size () const_ -- returns the number of items in this collection;
+* *void Assign (const NCollection_BaseCollection& theOther)* -- copies the contents of the Other to this collection object; 

 These members enable accessing any collection without knowing its exact type. In particular, it makes possible to implement methods receiving objects of the abstract collection type: 

@@ -1672,8 +1672,8 @@ gp_Pnt COG(const MyPackage_BaseCollPnt& theColl)
 ~~~~~

 Note that there are fundamental differences between the shown type-independent iterator and the iterator belonging to a particular non-abstract collection:
-* Type-independent iterator can only be obtained via the call CreateIterator(); the typed iterator - only via the explicit construction. 
-* Type-independent iterator is an abstract class, so it is impossible to copy it or to assign it to another collection object; the typed iterators can be copied and reassigned using the method Init() . 
+* Type-independent iterator can only be obtained via the call <i>CreateIterator()</i>; the typed iterator -- only via the explicit construction. 
+* Type-independent iterator is an abstract class, so it is impossible to copy it or to assign it to another collection object; the typed iterators can be copied and reassigned using the method <i>Init()</i>. 
 * Type-independent iterator is actually destroyed when its collection object is destroyed; the typed iterator is destroyed as any other C++ object in the corresponding C++ scope. 

 The common point between them is that it is possible to create any number of both types of iterators on the same collection object. 
@@ -1926,7 +1926,7 @@ These are non-persistent classes.

@subsection occt_occt_fcug_4_5 Basic Geometric Libraries
 There are various library packages available which offer a  range of basic computations on curves and surfaces. 
-If you are dealing with objects created from the *gp* package,  the useful algorithms are in the elementary curves and surfaces libraries - the  *ElCLib* and *ElSLib* packages.
+If you are dealing with objects created from the *gp* package,  the useful algorithms are in the elementary curves and surfaces libraries -- the  *ElCLib* and *ElSLib* packages.
 * *EICLib* provides methods for analytic curves. This is a library of simple  computations on curves from the *gp* package (Lines, Circles and Conics).  It is possible to compute points with a given parameter or to compute the parameter for a point. 
 * *EISLib* provides methods for analytic surfaces. This is a library of simple  computations on surfaces from the package *gp* (Planes, Cylinders,  Spheres, Cones, Tori). It is possible to compute points with a given pair of parameters or to compute the parameter for a point. There is a library for calculating normals  on curves and surfaces. 

--- a/dox/user_guides/iges/iges.md
+++ b/dox/user_guides/iges/iges.md
@@ -179,8 +179,8 @@ Default value is 1.

 <h4>read.stdsameparameter.mode</h4>
 defines the using of  *BRepLib::SameParameter*. Its possible values are:  
-* 0 (Off) - *BRepLib::SameParameter* is not called,  
-* 1 (On) - *BRepLib::SameParameter* is called.  
+* 0 (Off) -- *BRepLib::SameParameter* is not called,  
+* 1 (On) -- *BRepLib::SameParameter* is called.  
 *BRepLib::SameParameter* is used through  *ShapeFix_Edge::SameParameter*. It ensures that the resulting edge will have the  lowest tolerance taking pcurves either unmodified from the IGES file or  modified by *BRepLib::SameParameter*.  
 Read this parameter  with:  
 ~~~~~
@@ -271,13 +271,8 @@ Please find an example of the resource file for IGES (which  defines parameters
 In order for the IGES translator to use that file, you have  to define the environment variable   *CSF_IGESDefaults*, which should point to the directory where the resource file  resides.   Note that if you change parameter *read.iges.resource.name*, you should change  the name   of the resource file and the name of the environment variable correspondingly.  The variable should contain a path to the resource file. 

 Default values:  
-* read.iges.resource.name - IGES,  
-* read.iges.sequence - FromIGES. 
-
-<h4>read.scale.unit</h4>
-This parameter is obsolete (the parameter *xstep.cascade.unit*  should be used instead   when necessary). If it is set to 'M', the shape is scaled 0.001 times (as if it  were in   meters) after translation from IGES or STEP. 
-
-Default value is MM.
+* read.iges.resource.name -- IGES,  
+* read.iges.sequence -- FromIGES. 

 <h4>xstep.cascade.unit</h4>
 This parameter defines units to which a shape should be  converted when translated   from IGES or STEP to CASCADE. Normally it is MM; only those applications that   work internally in units other than MM should use this parameter.
@@ -324,25 +319,25 @@ faces =  Reader.GiveList(“xst-type(!=SurfaceOfRevolution)”);
 ~~~~~

 <h4>List of predefined operators that can be used:</h4>
-  * *xst-model-all* - selects all entities. 
-  * *xst-model-roots* - selects all roots. 
-  * *xst-transferrable-all* - selects all translatable entities. 
-  * *xst-transferrable-roots* - selects all translatable roots (default). 
-  * *xst-sharing + \<selection\>* - selects all entities sharing at least one entity selected by  \<selection\>. 
-  * *xst-shared + \<selection\>* - selects all entities shared by at least one entity selected  by \<selection\>. 
-  * *iges-visible-roots* - selects all visible roots, whether translatable or not. 
-  * *iges-visible-transf-roots* - selects all visible and translatable roots. 
-  * *iges-blanked-roots* - selects all blank roots, whether translatable or not. 
-  * *iges-blanked-transf-roots* - selects all blank and translatable roots. 
-  * *iges-status-independant* - selects entities whose IGES Subordinate Status = 0. 
-  * *iges-bypass-group* Selects all root entities. If a root entity is a group  (402/7 or 402/9), the entities in the group are selected. 
-  * *iges-bypass-subfigure* Selects all root entities. If a root entity is a subfigure  definition (308), the entities in the subfigure definition are selected. 
-  * *iges-bypass-group-subfigure* Selects all root entities. If a root entity is a group  (402/7 or 402/9) or a subfigure definition (308), the entities in the group and  in the subfigure definition are selected. 
-  * *iges-curves-3d* - selects 3D curves, whether they are roots or not (e.g. a 3D  curve on a surface). 
-  * *iges-basic-geom* - selects 3D curves and untrimmed surfaces. 
-  * *iges-faces* - selects face-supporting surfaces (trimmed or not). 
-  * *iges-surfaces* - selects surfaces not supporting faces (i.e. with natural  bounds). 
-  * *iges-basic-curves-3d* selects the same entities as iges-curves-3d.  Composite Curves are broken down into their components and the components are  selected. 
+  * *xst-model-all* -- selects all entities. 
+  * *xst-model-roots* -- selects all roots. 
+  * *xst-transferrable-all* -- selects all translatable entities. 
+  * *xst-transferrable-roots* -- selects all translatable roots (default). 
+  * *xst-sharing + \<selection\>* -- selects all entities sharing at least one entity selected by  \<selection\>. 
+  * *xst-shared + \<selection\>* -- selects all entities shared by at least one entity selected  by \<selection\>. 
+  * *iges-visible-roots* -- selects all visible roots, whether translatable or not. 
+  * *iges-visible-transf-roots* -- selects all visible and translatable roots. 
+  * *iges-blanked-roots* -- selects all blank roots, whether translatable or not. 
+  * *iges-blanked-transf-roots* -- selects all blank and translatable roots. 
+  * *iges-status-independant* -- selects entities whose IGES Subordinate Status = 0. 
+  * *iges-bypass-group* -- selects all root entities. If a root entity is a group  (402/7 or 402/9), the entities in the group are selected. 
+  * *iges-bypass-subfigure* -- selects all root entities. If a root entity is a subfigure  definition (308), the entities in the subfigure definition are selected. 
+  * *iges-bypass-group-subfigure* -- selects all root entities. If a root entity is a group  (402/7 or 402/9) or a subfigure definition (308), the entities in the group and  in the subfigure definition are selected. 
+  * *iges-curves-3d* -- selects 3D curves, whether they are roots or not (e.g. a 3D  curve on a surface). 
+  * *iges-basic-geom* -- selects 3D curves and untrimmed surfaces. 
+  * *iges-faces* -- selects face-supporting surfaces (trimmed or not). 
+  * *iges-surfaces* -- selects surfaces not supporting faces (i.e. with natural  bounds). 
+  * *iges-basic-curves-3d* -- selects the same entities as iges-curves-3d.  Composite Curves are broken down into their components and the components are  selected. 
  
@subsubsection occt_iges_2_3_5 Performing the  IGES file translation
 Perform translation  according to what you want to translate:  
@@ -406,11 +401,11 @@ reader.PrintTransferInfo  (failsonly, mode);
 displays the messages  that appeared during the last invocation of *Transfer* or *TransferRoots*.  

 If *failsonly* is  *IFSelect_FailOnly*, only fail messages will be output, if it is  *IFSelect_FailAndWarn*, all messages will be output. Parameter “mode” can have  *IFSelect_xxx* values where *xxx* can be:  
-* *GeneralCount* - gives general statistics  on the transfer (number of translated IGES entities, number of fails and  warnings, etc)  
-* *CountByItem* - gives the number of IGES  entities with their types per message. 
-* *ListByItem* - gives the number of IGES  entities with their type and DE numbers per message.  
-* *ResultCount*  - gives the number of  resulting OCCT shapes per type.  
-* *Mapping* gives mapping between  roots of the IGES file and the resulting OCCT shape per IGES and OCCT type.
+* *GeneralCount* -- gives general statistics  on the transfer (number of translated IGES entities, number of fails and  warnings, etc)  
+* *CountByItem* -- gives the number of IGES  entities with their types per message. 
+* *ListByItem* -- gives the number of IGES  entities with their type and DE numbers per message.  
+* *ResultCount*  -- gives the number of  resulting OCCT shapes per type.  
+* *Mapping* -- gives mapping between  roots of the IGES file and the resulting OCCT shape per IGES and OCCT type.
 
@subsection occt_iges_2_4 Mapping of IGES  entities to Open CASCADE Technology shapes

@@ -560,10 +555,10 @@ Geometrical entities are translated by classes  *IGESToBRep_BasicCurve* and *IGE
 Since these objects are not BRep objects, they do not have  tolerances. Hence, tolerance parameters are used in these classes only as  precisions: to detect specific cases (e.g., to distinguish a circle, an  ellipse, a parabola and a hyperbola) and to detect bad cases (such as  coincident points). 

 Use of precision parameters is reflected in the following  classes: 
-* *IGESToBRep_BasicCurve* - all parameters and points are compared with precision *EpsGeom*. All transformations (except *IGESToBRep_BasicCurve::TransferTransformation*)  are fulfilled with precision *Epsilon* which is set to 10<sup>-3</sup> (in the *IGESToBRep_BasicCurve::TransferTransformation* the value 10<sup>-5</sup> is  used). 
-* *IGESToBRep_BasicCurve::TransferBSplineCurve* - all weights of *BSplineCurve* are assumed to be more than *Precision::PConfusion* (else the curve is not translated). 
-* *IGESToBRep_BasicSurface* all parameters and points are compared with precision *EpsGeom*. All transformations are fulfilled with precision *Epsilon*,  which is set to 10<sup>-3</sup>. 
-* *IGESToBRep_BasicSurface::TransferBSplineSurface* - all weights of *BSplineSurface* are assumed to be more than  *Precision::PConfusion* (else the surface is not translated). 
+* *IGESToBRep_BasicCurve* -- all parameters and points are compared with precision *EpsGeom*. All transformations (except *IGESToBRep_BasicCurve::TransferTransformation*)  are fulfilled with precision *Epsilon* which is set to 10<sup>-3</sup> (in the *IGESToBRep_BasicCurve::TransferTransformation* the value 10<sup>-5</sup> is  used). 
+* *IGESToBRep_BasicCurve::TransferBSplineCurve* -- all weights of *BSplineCurve* are assumed to be more than *Precision::PConfusion* (else the curve is not translated). 
+* *IGESToBRep_BasicSurface* -- all parameters and points are compared with precision *EpsGeom*. All transformations are fulfilled with precision *Epsilon*,  which is set to 10<sup>-3</sup>. 
+* *IGESToBRep_BasicSurface::TransferBSplineSurface* -- all weights of *BSplineSurface* are assumed to be more than  *Precision::PConfusion* (else the surface is not translated). 


 <h4>Translating into Topology</h4>
@@ -579,11 +574,11 @@ The following classes show what default tolerances are used  when creating shape
 <h5>Class  IGESToBRep_TopoCurve</h5>

 All  methods are in charge of transferring curves  from IGES curve entities <i>(TransferCompositeCurve, Transfer2dCompositeCurve,  TransferCurveOnFace, TransferBoundaryOnFace, TransferOffsetCurve,  TransferTopoBasicCurve)</i> if an entity has transformation call to *IGESData_ToolLocation::ConvertLocation* with *Epsilon* value set to 10<sup>-4</sup>. 
-  * *IGESToBRep_TopoCurve::TransferPoint* - vertex is constructed from a Point entity with tolerance *EpsGeom*UnitFactor*. 
-  * *IGESToBRep_TopoCurve::Transfer2dPoint* - vertex is constructed from a Point entity with tolerance *EpsCoeff*. 
-  * *IGESToBRep_TopoCurve::TransferCompositeCurveGeneral* - obtains shapes (edges or wires) from other methods and adds  them into the resulting wire. Two adjacent edges of the wire can be connected  with tolerance up to *MaxTol*. 
-  * *IGESToBRep_TopoCurve::TransferCurveOnFace* and  *IGESToBRep_TopoCurve::TransferBoundaryOnFace* build a wire from 3D and 2D representations of  a curve on surface. Edges and vertices of the wire cannot have tolerance larger than *MaxTol*. The value *EpsGeom*UnitFactor* is passed into *ShapeFix_Wire::SetPrecision* and *MaxTol* - into *ShapeFix_Wire::MaxTolerance*. To find out how these parameters affect the resulting tolerance changes, please,  refer to class *ShapeFix_Wire*. 
-  * *IGESToBRep_TopoCurve::TransferTopoBasicCurve* and  *IGESToBRep_TopoCurve::Transfer2dTopoBasicCurve* - the boundary vertices of an edge (or a wire if a curve was  of C0 continuity) translated from a basis IGES curve (*BSplineCurve,  CopiousData, Line,* etc.) are built with tolerance *EpsGeom*UnitFactor*, the edge tolerance is *Precision::Confusion*. If a curve was divided into several edges, the common  vertices of such adjacent edges have tolerance *Precision::Confusion*.
+  * *IGESToBRep_TopoCurve::TransferPoint* -- vertex is constructed from a Point entity with tolerance *EpsGeom*UnitFactor*. 
+  * *IGESToBRep_TopoCurve::Transfer2dPoint* -- vertex is constructed from a Point entity with tolerance *EpsCoeff*. 
+  * *IGESToBRep_TopoCurve::TransferCompositeCurveGeneral* -- obtains shapes (edges or wires) from other methods and adds  them into the resulting wire. Two adjacent edges of the wire can be connected  with tolerance up to *MaxTol*. 
+  * *IGESToBRep_TopoCurve::TransferCurveOnFace* and  *IGESToBRep_TopoCurve::TransferBoundaryOnFace* build a wire from 3D and 2D representations of  a curve on surface. Edges and vertices of the wire cannot have tolerance larger than *MaxTol*. The value *EpsGeom*UnitFactor* is passed into *ShapeFix_Wire::SetPrecision* and *MaxTol* is passed into *ShapeFix_Wire::MaxTolerance*. To find out how these parameters affect the resulting tolerance changes, please,  refer to class *ShapeFix_Wire*. 
+  * *IGESToBRep_TopoCurve::TransferTopoBasicCurve* and  *IGESToBRep_TopoCurve::Transfer2dTopoBasicCurve* -- the boundary vertices of an edge (or a wire if a curve was  of C0 continuity) translated from a basis IGES curve (*BSplineCurve,  CopiousData, Line,* etc.) are built with tolerance *EpsGeom*UnitFactor*, the edge tolerance is *Precision::Confusion*. If a curve was divided into several edges, the common  vertices of such adjacent edges have tolerance *Precision::Confusion*.
  
  
 <h5>Class  IGESToBRep_TopoSurface</h5>
@@ -592,10 +587,10 @@ All faces created by this class have tolerance  *Precision::Confusion*.

 <h5>Class  IGESToBRep_BRepEntity</h5>

-  * *IGESToBRep_BRepEntity::TransferVertex* - the vertices from the *VertexList* entity are constructed with  tolerance *EpsGeom*UnitFactor*. 
-  * *IGESToBRep_BRepEntity::TransferEdge* - the edges from the *EdgeList* entity are constructed with  tolerance *Precision::Confusion*.
-  * *IGESToBRep_BRepEntity::TransferLoop* - this function works like  *IGESToBRep_TopoCurve::TransferCurveOnFace* and *IGESToBRep_TopoCurve::TransferBoundaryOnFace*. 
-  * *IGESToBRep_BRepEntity::TransferFace* the face from the Face IGES entity is constructed with  tolerance *Precision::Confusion*.
+  * *IGESToBRep_BRepEntity::TransferVertex* -- the vertices from the *VertexList* entity are constructed with  tolerance *EpsGeom*UnitFactor*. 
+  * *IGESToBRep_BRepEntity::TransferEdge* -- the edges from the *EdgeList* entity are constructed with  tolerance *Precision::Confusion*.
+  * *IGESToBRep_BRepEntity::TransferLoop* -- this function works like  *IGESToBRep_TopoCurve::TransferCurveOnFace* and *IGESToBRep_TopoCurve::TransferBoundaryOnFace*. 
+  * *IGESToBRep_BRepEntity::TransferFace* -- the face from the *Face* IGES entity is constructed with  tolerance *Precision::Confusion*.
  
 <h5>Shape Healing classes</h5>
 After performing a simple mapping, shape-healing algorithms  are called (class *ShapeFix_Shape*) by *IGESToBRep_Actor::Transfer()*. Shape-healing algorithm performs the correction of the resulting OCCT shape.  
@@ -668,8 +663,8 @@ The result is an *IGESControl_Writer* object.
 The following parameters are used for the OCCT-to-IGES  translation. 

 * *write.iges.brep.mode:* allows choosing the  write mode:  
- * "Faces" (0): OCCT *TopoDS_Faces* will be translated into IGES 144 (Trimmed Surface) entities, no B-Rep entities  will be written to the IGES file,  
- * "BRep" (1): OCCT *TopoDS_Faces*  will be translated into IGES 510 (Face) entities, the IGES file will contain  B-Rep entities.  
+ * "Faces" (0): OCCT *TopoDS_Faces* will be translated into IGES 144 (Trimmed Surface) entities, no BRep entities  will be written to the IGES file,  
+ * "BRep" (1): OCCT *TopoDS_Faces*  will be translated into IGES 510 (Face) entities, the IGES file will contain  BRep entities.  
 Read this parameter  with:  
 ~~~~~
 Standard_Integer byvalue =  Interface_Static::IVal("write.iges.brep.mode"); 
@@ -692,7 +687,7 @@ Default value is "Faces" (0).
 * *write.iges.header.product:* gives the name of the  sending product. The default value is  "CAS.CADE IGES processor Vx.x", where *x.x* means the current version of  Open CASCADE Technology.  
 * Read this parameter  with *Standard_String byvalue =  Interface_Static::CVal("write.iges.header.product")*; 
 * Modify this value with *Interface_Static::SetCVal  ("write.iges.header.product", "product name")*; 
-* *write.iges.header.receiver:* - gives the name of the  receiving company.  The default value is  "" (empty).
+* *write.iges.header.receiver:* -- gives the name of the  receiving company.  The default value is  "" (empty).
 * Read this parameter  with *Standard_String byvalue =  Interface_Static::CVal("write.iges.header.receiver");* 
 * Modify this value with *Interface_Static::SetCVal  ("write.iges.header.receiver", "reciever name");* 
 * *write.precision.mode:* specifies the mode of  writing the resolution value into the IGES file.  
@@ -720,8 +715,8 @@ Default value is 0.0001.

 Default values : 
 ~~~~~
-write.iges.resource.name – IGES,
-write.iges.sequence – ToIGES. 
+write.iges.resource.name - IGES,
+write.iges.sequence - ToIGES. 
 ~~~~~

@subsubsection occt_iges_3_3_3 Performing the Open  CASCADE Technology shape translation
@@ -783,7 +778,7 @@ Translated objects depend on the write mode that you chose.  If you chose the Fa
 | Geom_SurfaceOfRevolution | 120: Surface Of Revolution | |
 | Geom_OffsetSurface | 140: Offset Surface | |

-@subsubsection occt_iges_3_4_3 Topological entities - Translation in Face mode
+@subsubsection occt_iges_3_4_3 Topological entities -- Translation in Face mode

 | CASCADE shapes | IGES entity type | Comments |
 | :------------- | :--------------- | :------- |
@@ -798,7 +793,7 @@ Translated objects depend on the write mode that you chose.  If you chose the Fa
 | TopoDS_CompSolid | 402: Form 1 Group or no equivalent | Group is created only if *TopoDS_CompSolid* contains more than one *TopoDS_Solid*. One IGES entity is created per *TopoDS_Solid*. |
 | TopoDS_Compound | 402: Form 1 Group or no equivalent | Group is created only if *TopoDS_Compound* contains more than one item. One IGES entity is created per *TopoDS_Shape* in the *TopoDS_Compound*. If *TopoDS_Compound* is nested into another *TopoDS_Compound*, it is not mapped. |

-@subsubsection occt_iges_3_4_4 Topological entities - Translation in BRep mode
+@subsubsection occt_iges_3_4_4 Topological entities -- Translation in BRep mode

 | CASCADE shapes | IGES entity type | Comments |
 | :------------- | :--------------- | :------- |
@@ -816,7 +811,7 @@ Translated objects depend on the write mode that you chose.  If you chose the Fa
@subsection occt_iges_3_5 Tolerance  management
@subsubsection occt_iges_3_5_1 Setting  resolution in an IGES file

-There are several  possibilities to set resolution in an IGES file. They are controlled by  write.precision.mode parameter; the dependence between the value of this  parameter and the set resolution is described in paragraph <a href="#occt_iges_3_3_2">Setting the translation parameters</a>. 
+There are several  possibilities to set resolution in an IGES file. They are controlled by  write.precision.mode parameter; the dependence between the value of this  parameter and the set resolution is described in paragraph @ref occt_iges_3_3_2 "Setting the translation parameters". 

 If the value of  parameter *write.precision.mode* is -1, 0 or 1, resolution is computed from  tolerances of sub-shapes inside the shape to be translated. In this  computation, only tolerances of *TopoDS_Edges* and *TopoDS_Vertices* participate  since they reflect the accuracy of the shape. *TopoDS_Faces* are ignored in  computations since their tolerances may have influence on resulting computed  resolution while IGES resolution mainly concerns points and curves but not  surfaces.  

@@ -849,7 +844,7 @@ Standard_Integer main()
 ~~~~~


-@section occt_iges_4_ Using XSTEPDRAW
+@section occt_iges_4 Using XSTEPDRAW

 XSTEPDRAW UL is intended  for creating executables for testing XSTEP interfaces interactively in the DRAW  environment. It provides an additional set of DRAW commands specific for the  data exchange tasks, which allow loading and writing data files and analysis of  resulting data structures and shapes.  

@@ -870,13 +865,13 @@ The third argument is  used to set a new value of the given parameter. The resul
 During all interface  operations, the protocol of the process (fail and warning messages, mapping of  the loaded entities into OCCT shapes etc.) can be output to the trace file. Two  parameters are defined in the DRAW session: trace level (integer value from 0  to 9, default is 0), and trace file (default is a standard output).  

 Command *xtrace* is  intended to view and change these parameters:  
-* *Draw> xtrace* -  prints current settings (e.g.: "Level=0 -  Standard Output");  
-* *Draw> xtrace #* -  sets the trace level to the value #;  
-* *Draw> xtrace  tracefile.log* - sets the trace file as *tracefile.log*;  
-* *Draw xtrace* - directs all messages to the standard output.  
+* *Draw> xtrace* --  prints current settings (e.g.: "Level=0 -  Standard Output");  
+* *Draw> xtrace #* --  sets the trace level to the value #;  
+* *Draw> xtrace  tracefile.log* -- sets the trace file as *tracefile.log*;  
+* *Draw xtrace* -- directs all messages to the standard output.  

@subsection occt_iges_4_3 Reading IGES files
-For a description of  parameters used in reading an IGES file refer to <a href="#occt_iges_2_3_3">Setting the translation parameters</a>.  
+For a description of  parameters used in reading an IGES file refer to @ref occt_iges_2_3_3 "Setting the translation parameters".  

 These parameters are set  by command *param* :  

@@ -893,7 +888,7 @@ Loading is done by the command
 ~~~~~
 Draw> xload <file_name>
 ~~~~~
-Once the file is loaded, it is possible to investigate the  structure of the loaded data. To learn how to do it see <a href="#occt_iges_4_4">Analyzing the  transferred</a>
+Once the file is loaded, it is possible to investigate the  structure of the loaded data. To learn how to do it see @ref occt_iges_4_4 "Analyzing the  transferred".
 
 Reading of an IGES file is done by the command  
 ~~~~~
@@ -915,7 +910,7 @@ After the selected set of entities is loaded the user will  be asked how loaded

 The second parameter of the *igesbrep* command defines  the name of the loaded shape. If several shapes are created, they will get  indexed names. For instance, if the last parameter is ‘s’, they will be <i>s_1,  ... s_N.</i> 

-<i>\<selection\></i> specifies the scope of selected entities  in the model, it is *xst-transferrable-roots* by default. An asterisk “*” can be  specified instead of *iges-visible-transf-roots*. For possible values of  *selection* refer to <a href="#occt_iges_2_3_4">Selecting entities</a> section. 
+<i>\<selection\></i> specifies the scope of selected entities  in the model, it is *xst-transferrable-roots* by default. An asterisk “*” can be  specified instead of *iges-visible-transf-roots*. For possible values of  *selection* refer to @ref occt_iges_2_3_4 "Selecting entities" section. 


 Instead of *igesbrep* it is possible to use commands:
@@ -933,10 +928,10 @@ An asterisk “*” can be specified instead of  *selection*, it means *xst-tran
 During the IGES translation, a map of correspondence between  IGES entities and OCCT shapes is created. 
 The following commands are available:  

-* *Draw> tpent \#* - provides information on the result of translation of the given  IGES entity;
-* *Draw> tpdraw \#* - creates an OCCT shape corresponding to an IGES entity;
-* *Draw> fromshape \<shape_name\>* provides the number of an IGES entity corresponding to an OCCT  shape;
-* *Draw> tpclear* clears the map of correspondences between IGES entities  and OCCT shapes. 
+* *Draw> tpent \#* -- provides information on the result of translation of the given  IGES entity;
+* *Draw> tpdraw \#* --creates an OCCT shape corresponding to an IGES entity;
+* *Draw> fromshape \<shape_name\>* -- provides the number of an IGES entity corresponding to an OCCT  shape;
+* *Draw> tpclear* -- clears the map of correspondences between IGES entities  and OCCT shapes. 

@subsection occt_iges_4_4  Analyzing the transferred data

@@ -985,9 +980,9 @@ Draw> givecount <selection_name> [<selection_name>]
 prints a number of loaded entities defined by <i>selection</i> argument. 

 Three commands are used to calculate statistics on the entities in the model:
-* *Draw> count \<counter\> [\<selection\> ...]* - prints only a number of entities per each type matching the criteria defined by arguments.
-* *Draw> sumcount \<counter\> [\<selection\> ...]* - prints the total number of entities of all types matching the criteria defined by arguments and the largest number corresponding to one type.
-* *Draw> listcount \<counter\> [\<selection\> ...]* prints a list of entities per each type matching the criteria defined by arguments.
+* *Draw> count \<counter\> [\<selection\> ...]* -- prints only a number of entities per each type matching the criteria defined by arguments.
+* *Draw> sumcount \<counter\> [\<selection\> ...]* -- prints the total number of entities of all types matching the criteria defined by arguments and the largest number corresponding to one type.
+* *Draw> listcount \<counter\> [\<selection\> ...]* -- prints a list of entities per each type matching the criteria defined by arguments.

 Optional <i>\<selection\></i> argument, if specified, defines a subset of entities, which are to be taken into account. Argument <i>\<counter\></i> should be one of the currently defined counters:

@@ -1005,10 +1000,10 @@ gives a list of entity types which were encountered in the  last loaded file (wi

 Entities in the IGES file are numbered in the succeeding  order. An entity can be identified either by its number (#) or by its label.  Label is the letter ‘D’ followed by the index of the first line with the data  for this entity in the Directory Entry section of the IGES file. The label can  be calculated on the basis of the number as ‘D(2*# -1)’. For example, entity #  6 has label D11. 

-* *Draw> elab \#*  - provides  a label for an entity with a known number;
-* *Draw> enum \#* - prints a number for an entity with the given label; 
-* *Draw> entity \# \<level_of_information\>*  - gives the content of an IGES entity;
-* *Draw> estat \#* - provides the list of entities referenced by a given entity and the list of entities referencing to it.
+* *Draw> elab \#*  -- provides  a label for an entity with a known number;
+* *Draw> enum \#* -- prints a number for an entity with the given label; 
+* *Draw> entity \# \<level_of_information\>*  -- gives the content of an IGES entity;
+* *Draw> estat \#* -- provides the list of entities referenced by a given entity and the list of entities referencing to it.

@subsubsection occt_iges_4_4_2 Estimating the results of reading IGES
 All of the following commands are available only after the  data are converted into OCCT shapes (i.e. after command **igesbrep**). 
@@ -1017,17 +1012,17 @@ All of the following commands are available only after the  data are converted i
 Draw> tpstat [*|?]<symbol> [<selection>]
 ~~~~~
 provides all statistics on the last transfer,  including the list of transferred entities with mapping from IGES to OCCT  types, as well as fail and warning messages. The parameter <i>\<symbol\></i> defines  what information will be printed: 
-* G - General statistics (list of results and messages)
-* C - Count of all warning and fail messages
-* C - List of all warning and fail messages
-* F - Count of all fail messages
-* F - List of all fail messages
-* N - List of all transferred roots
-* S - The same, with types of source entity and result type
-* B - The same, with messages
-* T - Count of roots for geometrical types
-* R - Count of roots for topological types
-* l - The same, with a type of the source entity
+* G -- General statistics (list of results and messages)
+* C -- Count of all warning and fail messages
+* C -- List of all warning and fail messages
+* F -- Count of all fail messages
+* F -- List of all fail messages
+* N -- List of all transferred roots
+* S -- The same, with types of source entity and result type
+* B -- The same, with messages
+* T -- Count of roots for geometrical types
+* R -- Count of roots for topological types
+* l -- The same, with a type of the source entity

 The sign ‘*’ before the parameters **n**, **s**, **b**,  **t**, **r** makes it work on all entities (not only on roots). The sign  ‘?’ before **n**, **s**, **b**, **t** limits the scope of  information to invalid entities. 

@@ -1043,11 +1038,11 @@ The second version of the same command is TPSTAT (not  capital spelling).
 Draw:> TPSTAT <symbol> 
 ~~~~~
 Symbol can be of the following values: 
-* g -  General statistics (list of results and messages)
-* c - Count of all warning and fail messages
-* C - List of all warning and fail messages
-* r - Count of resulting OCCT shapes per each type
-* s - Mapping of IGES roots and resulting OCCT shapes
+* g --  General statistics (list of results and messages)
+* c -- Count of all warning and fail messages
+* C -- List of all warning and fail messages
+* r -- Count of resulting OCCT shapes per each type
+* s -- Mapping of IGES roots and resulting OCCT shapes

 Sometimes the trimming contours of IGES faces (i.e., entity  141 for 143, 142 for 144) can be lost during translation due to fails. 

@@ -1088,14 +1083,14 @@ It outputs maximum, average and minimum values of  tolerances for each kind of s
 When specifying *min* and *max* arguments this  command outputs shapes with names <i>\<shape_name\>...</i> and their total number  with tolerances in the range <i>[min, max]</i>. 

 <i>\<Symbol\></i> is used for specifying the kind of sub-shapes to analyze: 
-* v - for vertices,
-* e - for edges,
-* f - for faces,
-* c - for shells and faces. 
+* v -- for vertices,
+* e -- for edges,
+* f -- for faces,
+* c -- for shells and faces. 

@subsection occt_iges_4_5 Writing an IGES file

-Refer to <a href="#occt_iges_3_3_2">Setting the translation parameters</a> for a description of parameters used in reading an IGES file. The parameters are set by command *param*: 
+Refer to @ref occt_iges_3_3_2 "Setting the translation parameters" for a description of parameters used in reading an IGES file. The parameters are set by command *param*: 

 | Description | Name | Values |
 | :-----------  | :---- | :----- |
@@ -1134,10 +1129,10 @@ Loading the file only memorizes, but does not translate the  data.

@subsection occt_iges_5_2 Checking the loaded IGES file

-This step is not obligatory. See the description of this  step <a href="#occt_iges_2_3_2"> above</a>. 
+This step is not obligatory. See the description of @ref occt_iges_2_3_2 "Checking the IGES file" above. 

@subsection occt_iges_5_3 Setting parameters for translation to XDE
-See the description of this step <a href="#occt_iges_2_3_3"> above</a>. 
+See the description of @ref occt_iges_2_3_3 "Setting translation parameters" above. 

 In  addition, the following parameters can be set for XDE translation of  attributes: 
 * For transferring colors: 
--- a/dox/user_guides/modeling_algos/modeling_algos.md
+++ b/dox/user_guides/modeling_algos/modeling_algos.md
@@ -230,10 +230,10 @@ as the left-hand side of the curve in relation to its orientation.
 This technique of qualification of a solution, in relation to the curves to which
 it is tangential, can be used in all algorithms for constructing a circle or a straight
 line by geometric constraints. Four qualifiers are used:
-  * **Enclosing** - the solution(s) must enclose the argument;
-  * **Enclosed** - the solution(s) must be enclosed by the argument;
-  * **Outside** - the solution(s) and the argument must be external to one another;
-  * **Unqualified** - the relative position is not qualified, i.e. all solutions apply.
+  * **Enclosing** -- the solution(s) must enclose the argument;
+  * **Enclosed** -- the solution(s) must be enclosed by the argument;
+  * **Outside** -- the solution(s) and the argument must be external to one another;
+  * **Unqualified** -- the relative position is not qualified, i.e. all solutions apply.
    
 It is possible to create expressions using the qualifiers,  for example:
 ~~~~~
@@ -588,9 +588,9 @@ The class *GeomFill_BoundWithSurf* allows defining a boundary for the surface to

 The enumerations *FillingStyle* specify the styles used to build the surface. These include: 

-  * *Stretch* - the style with the flattest patches
-  * *Coons* - a rounded style with less depth than *Curved*
-  * *Curved* - the style with the most rounded patches.
+  * *Stretch* -- the style with the flattest patches
+  * *Coons* -- a rounded style with less depth than *Curved*
+  * *Curved* -- the style with the most rounded patches.

@image html /user_guides/modeling_algos/images/modeling_algos_image018.png "Intersecting filleted edges with different radii leave a gap, is filled by a surface"
@image latex /user_guides/modeling_algos/images/modeling_algos_image018.png "Intersecting filleted edges with different radii leave a gap, is filled by a surface"
@@ -1318,13 +1318,13 @@ If *BRepBuilderAPI_MakeEdge* is used as a class, it can provide two vertices. Th

 The *Error* method  returns a term of the *BRepBuilderAPI_EdgeError* enumeration. It can be used to analyze the error when *IsDone* method returns False. The terms are: 

-  * **EdgeDone** - No error occurred, *IsDone* returns True. 
-  * **PointProjectionFailed** - No parameters were given, but the projection of  the 3D points on the curve failed. This happens if the point distance to the  curve is greater than the precision. 
-  * **ParameterOutOfRange** - The given parameters are not in the range  *C->FirstParameter()*, *C->LastParameter()* 
-  * **DifferentPointsOnClosedCurve** -  The  two vertices or points have different locations but they are the extremities of  a closed curve. 
-  * **PointWithInfiniteParameter** - A finite coordinate point was associated with an  infinite parameter (see the Precision package for a definition of infinite  values). 
-  * **DifferentsPointAndParameter**  - The distance of the 3D point and the point  evaluated on the curve with the parameter is greater than the precision. 
-  * **LineThroughIdenticPoints** - Two identical points were given to define a line  (construction of an edge without curve), *gp::Resolution* is used to test confusion . 
+  * **EdgeDone** -- No error occurred, *IsDone* returns True. 
+  * **PointProjectionFailed** -- No parameters were given, but the projection of  the 3D points on the curve failed. This happens if the point distance to the  curve is greater than the precision. 
+  * **ParameterOutOfRange** -- The given parameters are not in the range  *C->FirstParameter()*, *C->LastParameter()* 
+  * **DifferentPointsOnClosedCurve** --  The  two vertices or points have different locations but they are the extremities of  a closed curve. 
+  * **PointWithInfiniteParameter** -- A finite coordinate point was associated with an  infinite parameter (see the Precision package for a definition of infinite  values). 
+  * **DifferentsPointAndParameter**  -- The distance of the 3D point and the point  evaluated on the curve with the parameter is greater than the precision. 
+  * **LineThroughIdenticPoints** -- Two identical points were given to define a line  (construction of an edge without curve), *gp::Resolution* is used to test confusion . 

 The following example  creates a rectangle centered on the origin of dimensions H, L with fillets of radius R. The edges and the vertices are stored in the arrays *theEdges* and *theVertices*. We use class *Array1OfShape* (i.e. not arrays of edges or vertices).  See the image below. 

@@ -1541,11 +1541,11 @@ To add more than one  wire an instance of the *BRepBuilderAPI_MakeFace* class ca

 The *Error* method returns  an error status, which is a term from the *BRepBuilderAPI_FaceError* enumeration. 

-* *FaceDone* - no  error occurred. 
-* *NoFace* - no initialization of the algorithm; an empty constructor was used. 
-* *NotPlanar* - no  surface was given and the wire was not planar. 
-* *CurveProjectionFailed* - no curve was found  in the parametric space of the surface for an edge. 
-* *ParametersOutOfRange* - the parameters  *umin, umax, vmin, vmax* are out of the surface. 
+* *FaceDone* -- no  error occurred. 
+* *NoFace* -- no initialization of the algorithm; an empty constructor was used. 
+* *NotPlanar* -- no  surface was given and the wire was not planar. 
+* *CurveProjectionFailed* -- no curve was found  in the parametric space of the surface for an edge. 
+* *ParametersOutOfRange* -- the parameters  *umin, umax, vmin, vmax* are out of the surface. 

@subsection occt_modalg_3_6 Wire
 The wire is a composite shape built not from a geometry, but by the assembly of edges. *BRepBuilderAPI_MakeWire* class can build a wire from one or more edges or connect new edges to an  existing wire. 
@@ -1587,10 +1587,10 @@ return MW;
 BRepBuilderAPI_MakeWire class can return the last edge added to the wire (Edge  method). This edge can be different from the original edge if it was copied. 

 The Error method returns  a term of the *BRepBuilderAPI_WireError* enumeration: 
-*WireDone* - no  error occurred. 
-*EmptyWire* - no  initialization of the algorithm, an empty constructor was used. 
-*DisconnectedWire* - the last added edge was not connected to the wire. 
-*NonManifoldWire* - the  wire with some singularity. 
+*WireDone* -- no  error occurred. 
+*EmptyWire* -- no  initialization of the algorithm, an empty constructor was used. 
+*DisconnectedWire* -- the last added edge was not connected to the wire. 
+*NonManifoldWire* -- the  wire with some singularity. 

@subsection occt_modalg_3_7 Shell
 The shell is a composite shape built not from a geometry, but by the assembly of faces.
@@ -1744,10 +1744,10 @@ TopoDS_Solid S = BRepPrimAPI_MakeCone(R1,R2,H);
@subsubsection occt_modalg_4_1_6 Sphere
 *BRepPrimAPI_MakeSphere* class allows creating spherical primitives. Like a cylinder, a  sphere is created either in the default coordinate system or in a given  coordinate system *gp_Ax2*. There are four constructions: 

-  * From a radius - builds a full  sphere. 
-  * From a radius and an angle - builds  a lune (digon).
-  * From a radius and two angles - builds a wraparound spherical segment between two latitudes. The angles *a1* and *a2* must follow the relation: <i>PI/2 <= a1 < a2 <= PI/2 </i>. 
-  * From a radius and three angles - a combination of two previous methods builds a portion of spherical segment. 
+  * From a radius -- builds a full  sphere. 
+  * From a radius and an angle -- builds  a lune (digon).
+  * From a radius and two angles -- builds a wraparound spherical segment between two latitudes. The angles *a1* and *a2* must follow the relation: <i>PI/2 <= a1 < a2 <= PI/2 </i>. 
+  * From a radius and three angles -- a combination of two previous methods builds a portion of spherical segment. 

 The following code  builds four spheres from a radius and three angles. 

@@ -1769,10 +1769,10 @@ Note that we could  equally well choose to create Shells instead of Solids.
@subsubsection occt_modalg_4_1_7 Torus
 *BRepPrimAPI_MakeTorus* class allows creating toroidal primitives. Like the other  primitives, a torus is created either in the default coordinate system or in a  given coordinate system *gp_Ax2*. There are four constructions similar to the  sphere constructions: 

-  * Two radii - builds a full  torus.
-  * Two radii and an angle - builds  an angular torus segment.
-  * Two radii and two angles -  builds a wraparound torus segment between two radial planes. The angles a1, a2 must follow  the relation 0 < a2 - a1 < 2*PI. 
-  * Two radii and three angles - a combination of two previous methods builds a portion of torus segment.
+  * Two radii -- builds a full  torus.
+  * Two radii and an angle -- builds  an angular torus segment.
+  * Two radii and two angles --  builds a wraparound torus segment between two radial planes. The angles a1, a2 must follow  the relation 0 < a2 - a1 < 2*PI. 
+  * Two radii and three angles -- a combination of two previous methods builds a portion of torus segment.

@image html /user_guides/modeling_algos/images/modeling_algos_image032.png "Examples of Tori"
@image latex /user_guides/modeling_algos/images/modeling_algos_image032.png "Examples of Tori"
@@ -1819,9 +1819,9 @@ It is forbidden to sweep  Solids and Composite Solids. A Compound generates a Co
@image latex /user_guides/modeling_algos/images/modeling_algos_image033.png "Generating a  sweep"

 *BRepPrimAPI_MakeSweep class* is a deferred class used as a root of the the following sweep classes:
-* *BRepPrimAPI_MakePrism* - produces a linear sweep
-* *BRepPrimAPI_MakeRevol* - produces a rotational sweep
-* *BRepPrimAPI_MakePipe* - produces a general sweep. 
+* *BRepPrimAPI_MakePrism* -- produces a linear sweep
+* *BRepPrimAPI_MakeRevol* -- produces a rotational sweep
+* *BRepPrimAPI_MakePipe* -- produces a general sweep. 


@subsubsection occt_modalg_4_2_2 Prism
@@ -2588,7 +2588,7 @@ TopoDS_Shape res1 = MKPipe.Shape();

 Mechanical features include ribs, protrusions and grooves (or slots), depressions along planar (linear) surfaces or revolution surfaces. 

-The semantics of  mechanical features is built around giving thickness to a contour. This  thickness can either be symmetrical - on one side of the contour - or  dissymmetrical - on both sides. As in the semantics of form features, the  thickness is defined by construction of shapes in specific contexts. 
+The semantics of  mechanical features is built around giving thickness to a contour. This  thickness can either be symmetrical -- on one side of the contour -- or  dissymmetrical -- on both sides. As in the semantics of form features, the  thickness is defined by construction of shapes in specific contexts. 

 The development contexts  differ, however, in the case of mechanical features. 
 Here they include  extrusion: 
@@ -2690,9 +2690,9 @@ The class *BRepFeat_SplitShape* is used to split faces of a shape into wires or

 The class is created or  initialized from a shape (the basic shape). 
 Three Add methods are  available: 
-* *Add(Wire, Face)* - adds  a new wire on a face of the basic shape. 
-* *Add(Edge, Face)* - adds  a new edge on a face of the basic shape. 
-* *Add(EdgeNew, EdgeOld)* - adds  a new edge on an existing one (the old edge must contain the new edge). 
+* *Add(Wire, Face)* -- adds  a new wire on a face of the basic shape. 
+* *Add(Edge, Face)* -- adds  a new edge on a face of the basic shape. 
+* *Add(EdgeNew, EdgeOld)* -- adds  a new edge on an existing one (the old edge must contain the new edge). 

 **Note** The added wires and edges must  define closed wires on faces or wires located between two  existing edges. Existing edges must not be intersected. 

@@ -2903,7 +2903,7 @@ const Standard_Real anAngularDeflection = 0.5;
 BRepMesh_IncrementalMesh aMesh(aShape, aLinearDeflection, Standard_False, anAngularDeflection);
 ~~~~~

-The default meshing algorithm *BRepMesh_IncrementalMesh* has two major options to define triangulation – linear and angular deflections. 
+The default meshing algorithm *BRepMesh_IncrementalMesh* has two major options to define triangulation -- linear and angular deflections. 

 At the first step all edges from a face are discretized according to the specified parameters. 

--- a/dox/user_guides/modeling_data/modeling_data.md
+++ b/dox/user_guides/modeling_data/modeling_data.md
@@ -452,8 +452,8 @@ and, in particular, to compute the point of parameter u on a curve and the deriv

 As a consequence of the parameterization, a <i> Geom2d </i> curve is naturally oriented.

-Parameterization and orientation differentiate elementary <i>Geom2d </i>curves from their
-equivalent as provided by <i> gp</i> package. <i>  Geom2d</i> package provides conversion
+Parameterization and orientation differentiate elementary <i>Geom2d</i>curves from their
+equivalent as provided by <i> gp</i> package. <i>Geom2d</i> package provides conversion
 functions to transform a <i> Geom2d</i> object into a <i> gp</i> object, and vice-versa, when this is possible.

 Moreover, <i> Geom2d</i> package provides more complex curves, including Bezier curves,
@@ -641,10 +641,10 @@ A surface (for two parameters U and V) has the following local properties:
 - Gaussian curvature

 The following methods are available:
-* *CLProps* - calculates the local properties of a curve (tangency, curvature,normal); 
-* *CurAndInf2d* - calculates the maximum and minimum curvatures and the inflection points of 2d curves; 
-* *SLProps* - calculates the local properties of a surface (tangency, the normal and curvature). 
-* *Continuity* - calculates regularity at the junction of two curves. 
+* *CLProps* -- calculates the local properties of a curve (tangency, curvature,normal); 
+* *CurAndInf2d* -- calculates the maximum and minimum curvatures and the inflection points of 2d curves; 
+* *SLProps* -- calculates the local properties of a surface (tangency, the normal and curvature). 
+* *Continuity* -- calculates regularity at the junction of two curves. 

 Note that the B-spline curve and surface are accepted but they are not cut into pieces of the desired continuity. It is the global continuity, which is seen. 

@@ -686,14 +686,14 @@ Topological library allows you to build pure topological data structures. Topolo

 You can, for example, represent a single object made of several distinct bodies containing embedded curves and surfaces connected or non-connected to an outer boundary.

-Abstract topological data structure describes a basic entity - a shape, which can be divided into the following component topologies:
-  * Vertex - a zero-dimensional shape corresponding to a point in geometry; 
-  * Edge - a shape corresponding to a curve, and bound by a vertex at each extremity;
-  * Wire - a sequence of edges connected by their vertices; 
-  * Face - part of a plane (in 2D geometry) or a surface (in 3D geometry) bounded by a closed wire;
-  * Shell - a collection of faces connected by some edges of their wire boundaries; 
-  * Solid - a part of 3D space bound by a shell; 
-  * Compound solid - a collection of solids. 
+Abstract topological data structure describes a basic entity -- a shape, which can be divided into the following component topologies:
+  * Vertex -- a zero-dimensional shape corresponding to a point in geometry; 
+  * Edge -- a shape corresponding to a curve, and bound by a vertex at each extremity;
+  * Wire -- a sequence of edges connected by their vertices; 
+  * Face -- part of a plane (in 2D geometry) or a surface (in 3D geometry) bounded by a closed wire;
+  * Shell -- a collection of faces connected by some edges of their wire boundaries; 
+  * Solid -- a part of 3D space bound by a shell; 
+  * Compound solid -- a collection of solids. 

 The wire and the solid can be either infinite or closed.

@@ -756,15 +756,15 @@ The **TopAbs** package provides general enumerations describing the basic concep
@subsubsection occt_modat_5_2_1 Topological types

 TopAbs contains the *TopAbs_ShapeEnum* enumeration,which lists the different topological types: 
- COMPOUND - a group of any type of topological objects.
- COMPSOLID - a composite solid is a set of solids connected by their faces. It expands the notions of WIRE and SHELL to solids.
- SOLID - a part of space limited by shells. It is three dimensional.
- SHELL - a set of faces connected by their edges. A shell can be open or closed.
- FACE - in 2D it is a part of a plane; in 3D it is a part of a surface. Its geometry is constrained (trimmed) by contours. It is two dimensional.
- WIRE - a set of edges connected by their vertices. It can be an open or closed contour depending on whether the edges are linked or not.
- EDGE - a topological element corresponding to a restrained curve. An edge is generally limited by vertices. It has one dimension.
- VERTEX - a topological element corresponding to a point. It has zero dimension.
- SHAPE - a generic term covering all of the above.
+- COMPOUND -- a group of any type of topological objects.
+- COMPSOLID -- a composite solid is a set of solids connected by their faces. It expands the notions of WIRE and SHELL to solids.
+- SOLID -- a part of space limited by shells. It is three dimensional.
+- SHELL -- a set of faces connected by their edges. A shell can be open or closed.
+- FACE -- in 2D it is a part of a plane; in 3D it is a part of a surface. Its geometry is constrained (trimmed) by contours. It is two dimensional.
+- WIRE -- a set of edges connected by their vertices. It can be an open or closed contour depending on whether the edges are linked or not.
+- EDGE -- a topological element corresponding to a restrained curve. An edge is generally limited by vertices. It has one dimension.
+- VERTEX -- a topological element corresponding to a point. It has zero dimension.
+- SHAPE -- a generic term covering all of the above.

 A topological model can be considered as a graph of objects with adjacency relationships. When modeling a part in 2D or 3D space it must belong to one of the categories listed in the ShapeEnum enumeration. The TopAbspackage lists all the objects, which can be found in any model. It cannot be extended but a subset can be used. For example, the notion of solid is useless in 2D. 

@@ -799,7 +799,7 @@ Based on this default region the orientation allows definition of the region to
@image html /user_guides/modeling_data/images/modeling_data_image007.png "Four Orientations"
@image latex /user_guides/modeling_data/images/modeling_data_image007.png "Four Orientations"

-The notion of orientation is a very general one, and it can be used in any context where regions or boundaries appear. Thus, for example, when describing the intersection of an edge and a contour it is possible to describe not only the vertex of intersection but also how the edge crosses the contour considering it as a boundary. The edge would therefore be divided into two regions - exterior and interior - with the intersection vertex as the boundary. Thus an orientation can be associated with an intersection vertex as in the following figure: 
+The notion of orientation is a very general one, and it can be used in any context where regions or boundaries appear. Thus, for example, when describing the intersection of an edge and a contour it is possible to describe not only the vertex of intersection but also how the edge crosses the contour considering it as a boundary. The edge would therefore be divided into two regions: exterior and interior and the intersection vertex would be the boundary. Thus an orientation can be associated with an intersection vertex as in the following figure: 

 | Orientation | Association |
 | :-------- | :-------- |
@@ -847,7 +847,7 @@ OCCT topological descriptions also allow the simple shapes defined in these term

 Listing shapes in order of complexity from vertex to composite solid leads us to the notion of the data structure as knowledge of how to break a shape down into a set of simpler shapes. This is in fact, the purpose of the *TopoDS* package. 

-The model of a shape is a shareable data structure because it can be used by other shapes. (An edge can be used by more than one face of a solid). A shareable data structure is handled by reference. When a simple reference is insufficient, two pieces of information are added - an orientation and a local coordinate reference. 
+The model of a shape is a shareable data structure because it can be used by other shapes. (An edge can be used by more than one face of a solid). A shareable data structure is handled by reference. When a simple reference is insufficient, two pieces of information are added: an orientation and a local coordinate reference. 
 - An orientation tells how the referenced shape is used in a boundary (*Orientation* from *TopAbs*). 
 - A local reference coordinate (*Location* from *TopLoc*) allows referencing a shape at a position different from that of its definition. 

@@ -1070,10 +1070,10 @@ The following steps are performed:
 **TopTools** package contains tools for exploiting the *TopoDS* data structure. It is an instantiation of the tools from *TCollection* package with the Shape classes of *TopoDS*. 


-* *TopTools_Array1OfShape, HArray1OfShape* -  Instantiation of the *TCollection_Array1* and *TCollection_HArray1* with *TopoDS_Shape*. 
-* *TopTools_SequenceOfShape* - Instantiation of the *TCollection_Sequence* with *TopoDS_Shape*. 
-* *TopTools_MapOfShape* - Instantiation of the *TCollection_Map*. Allows the construction of sets of shapes. 
-* *TopTools_IndexedMapOfShape* -	Instantiation of the *TCollection_IndexedMap*. Allows the construction of tables of shapes and other data structures. 
+* *TopTools_Array1OfShape, HArray1OfShape* -- instantiation of the *TCollection_Array1* and *TCollection_HArray1* with *TopoDS_Shape*. 
+* *TopTools_SequenceOfShape* -- instantiation of the *TCollection_Sequence* with *TopoDS_Shape*. 
+* *TopTools_MapOfShape* - instantiation of the *TCollection_Map*. Allows the construction of sets of shapes. 
+* *TopTools_IndexedMapOfShape* - instantiation of the *TCollection_IndexedMap*. Allows the construction of tables of shapes and other data structures. 

 With a *TopTools_Map*, a set of references to Shapes can be kept without duplication. 
 The following example counts the size of a data structure as a number of *TShapes*. 
--- a/dox/user_guides/ocaf_functionmechanism_wp/images/ocaf_functionmechanism_wp_image003.png
+++ b/dox/user_guides/ocaf_functionmechanism_wp/images/ocaf_functionmechanism_wp_image003.png
--- a/dox/user_guides/ocaf_functionmechanism_wp/images/ocaf_functionmechanism_wp_image005.png
+++ b/dox/user_guides/ocaf_functionmechanism_wp/images/ocaf_functionmechanism_wp_image005.png
--- a/dox/user_guides/ocaf/images/ocaf_image004.png
+++ b/dox/user_guides/ocaf/images/ocaf_image004.png
--- a/dox/user_guides/ocaf/images/ocaf_image009.png
+++ b/dox/user_guides/ocaf/images/ocaf_image009.png
--- a/dox/user_guides/ocaf/images/ocaf_image013.png
+++ b/dox/user_guides/ocaf/images/ocaf_image013.png
--- a/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image003.png
+++ b/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image003.png
--- a/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image004.png
+++ b/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image004.png
--- a/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image005.png
+++ b/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image005.png
--- a/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image006.png
+++ b/dox/user_guides/ocaf_tree_wp/images/ocaf_tree_wp_image006.png
--- a/dox/user_guides/ocaf/images/ocaf_wp_image003.png
+++ b/dox/user_guides/ocaf/images/ocaf_wp_image003.png
--- a/dox/user_guides/ocaf/images/ocaf_wp_image005.png
+++ b/dox/user_guides/ocaf/images/ocaf_wp_image005.png
--- a/Show More
+++ b/Show More