Additional fix for 29713

0029713: Test Harness command "fixshape" can not fix attached face
Fix to reverse invalid oriented pcurves was made
2025-08-09 13:22:24 +03:00 · 2018-04-25 19:42:27 +03:00 · 2018-04-23 16:41:44 +03:00
5857 changed files with 97422 additions and 184595 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,14 @@

 # standard directories for derived files in CASROOT
 /.adm
+/sun
 /lin
 /mac
+/ao1
+/sil
 /wnt
 /doc
+/drv
 /inc
 /work

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set (BUILD_RESOURCES OFF CACHE BOOL "${BUILD_RESOURCES_DESCR}")

 # single-configuration generator
 set (SINGLE_GENERATOR OFF)
-if (DEFINED CMAKE_BUILD_TYPE)
+if (CMAKE_BUILD_TYPE)
  set (SINGLE_GENERATOR ON)
 endif()

@@ -86,11 +86,6 @@ if (BUILD_WITH_DEBUG)
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
 endif()

-# option disabling OCCT exceptions in Release builds (No_Exception)
-if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
-endif()
-
 # option to enable or disable use of precompiled headers
 if (NOT DEFINED BUILD_USE_PCH)
  set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
@@ -486,6 +481,7 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_FreeImagePlus CAN_USE_FREEIMAGE)
 OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
 OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
 OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_GLES2)
+OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS)
 OCCT_IS_PRODUCT_REQUIRED (CSF_TBB CAN_USE_TBB)
 OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)

@@ -613,6 +609,24 @@ else()
  OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
 endif()

+# GL2PS
+if (NOT DEFINED ANDROID AND CAN_USE_GL2PS)
+  set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}")
+
+  if (USE_GL2PS)
+    add_definitions (-DHAVE_GL2PS)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
+  else()
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
+    OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_GL2PS")
+
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
+  OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
+endif()
+
 # TBB
 if (NOT DEFINED ANDROID AND CAN_USE_TBB)
  set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")
@@ -633,26 +647,6 @@ else()
  OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()

-# RapidJSON
-# search for CSF_RapidJSON variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
-if (CAN_USE_RAPIDJSON)
-  set (USE_RAPIDJSON OFF CACHE BOOL "${USE_RAPIDJSON_DESCR}")
-
-  if (USE_RAPIDJSON)
-    add_definitions (-DHAVE_RAPIDJSON)
-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
-  else()
-    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
-    OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
-  endif()
-else()
-  OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
-
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
-  OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
-endif()
-
 # EIGEN
 if (CAN_USE_EIGEN)
  set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")
@@ -708,18 +702,6 @@ else()
  OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
 endif()

-# qt for inspector and samples
-if (BUILD_Inspector OR BUILD_SAMPLES_QT)
-  # check qt 3rdparty path
-  add_definitions (-DHAVE_QT)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
-  message (STATUS "Info: Qt is used by OCCT")
-else()
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
-  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
-endif()
-
 # check all 3rdparty include paths
 string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
 if (3RDPARTY_NOT_INCLUDED)
@@ -807,6 +789,17 @@ else()
  set (SCRIPT_EXT sh)
 endif()

+if (BUILD_Inspector OR BUILD_SAMPLES_QT)
+  # check qt 3rdparty path
+  add_definitions (-DHAVE_QT)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
+  message (STATUS "Info: Qt is used by OCCT")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
+  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
+endif()
+
 # OCCT tools
 # include the patched or original list of tools
 # list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
@@ -925,19 +918,11 @@ if (BUILD_SAMPLES_MFC OR BUILD_SAMPLES_QT)
  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
 endif()

-if (WIN32)
-  # env script for draw in building environment
-  OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
-  # install env script
-  install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
-else()
-  set (SUB_ENV_NAME "env.${SCRIPT_EXT}")
-  set (SUB_ENV_BUILD_NAME "env.install.${SCRIPT_EXT}")
-  # install env script
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/env.install.${SCRIPT_EXT}.in" "${SUB_ENV_BUILD_NAME}" "${SUB_ENV_NAME}" "${INSTALL_DIR_SCRIPT}")
-  # env script for draw in building environment
-  OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
-endif()
+# env script for draw in building environment
+OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
+
+# install env script
+install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")

 # copy DrawAppliInit from OCCT source to build directory
 if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
--- a/adm/.gitignore
+++ b/adm/.gitignore
@@ -1 +0,0 @@
-/build-*
--- a/adm/CMPLRS
+++ b/adm/CMPLRS
@@ -1,17 +1,17 @@
 wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
 lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)

-wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
 wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
 wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL

-wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
 wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50

-lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL

 lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
 lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
--- a/adm/MODULES
+++ b/adm/MODULES
@@ -3,5 +3,5 @@ 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 TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
+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
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -105,7 +105,6 @@ n BRepIntCurveSurface
 n BRepLib
 n BRepMAT2d
 n BRepMesh
-n BRepMeshData
 n BRepOffset
 n BRepOffsetAPI
 n BRepPrim
@@ -142,8 +141,6 @@ n HLRTopoBRep
 n HLRAppli
 n Hatch
 n HatchGen
-n IMeshData
-n IMeshTools
 n IntCurve
 n IntCurveSurface
 n IntCurvesFace
@@ -203,7 +200,6 @@ n Aspect
 n DsgPrs
 n Graphic3d
 n Image
-n Media
 n MeshVS
 n OpenGl
 n D3DHost
@@ -437,9 +433,4 @@ n IVtkDraw
 t TKIVtkDraw
 n Geom2dEvaluator
 t TKVCAF
-n XCAFView
-n XCAFNoteObjects
-t TKRWMesh
-n RWGltf
-n RWMesh
-n RWObj
+n XCAFView
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -133,7 +133,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)

-        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
+        if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
@@ -181,9 +181,9 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)

-          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
+          if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                               PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
                                                                               NO_DEFAULT_PATH)
            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
@@ -277,6 +277,26 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
            endif()
          endif()

+          if("${PRODUCT_NAME}" STREQUAL "GL2PS")
+            get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
+
+            if (SINGLE_GENERATOR)
+              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
+            else()
+              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS Release
+                       DESTINATION "${INSTALL_DIR_LIB}"
+                       RENAME ${GL2PSLIB}.1)
+              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS RelWithDebInfo
+                       DESTINATION "${INSTALL_DIR_LIB}i"
+                       RENAME ${GL2PSLIB}.1)
+              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS Debug
+                       DESTINATION "${INSTALL_DIR_LIB}d"
+                       RENAME ${GL2PSLIB}.1)
+            endif()
+          endif()
        endif()
      else()
        # the library directory for using by the executable
--- a/adm/cmake/ffmpeg.cmake
+++ b/adm/cmake/ffmpeg.cmake
@@ -37,10 +37,6 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
    set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
  endif()

-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR                           "" CACHE PATH "The directory containing FFmpeg libraries")
-  endif()
-
  if (WIN32)
    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
@@ -51,9 +47,6 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
      set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}               "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
    endif()
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
-      set (3RDPARTY_FFMPEG_DLL_DIR                               "" CACHE PATH "The directory containing FFmpeg shared libraries")
-    endif()
  endif()

  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
@@ -63,7 +56,6 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})

    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
    else()
      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
@@ -74,7 +66,6 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})

      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
-        set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
      else()
        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -61,8 +61,8 @@ endif()

 # check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
 if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
  if (BUILD_SHARED_LIBS)
    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")

@@ -119,8 +119,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)

  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
    if (BUILD_SHARED_LIBS)
      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
    endif()
@@ -129,13 +129,13 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "the path to ft2build.h" FORCE)
    endif()
  endif()

  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "the path to ftheader.h" FORCE)
    endif()
  endif()

@@ -162,7 +162,7 @@ if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYP
  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)

  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "the path to ft2build.h" FORCE)

  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
  # do search taking into account freetype structure of 2.5.1 version
@@ -185,7 +185,7 @@ if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLU
 else()
  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)

-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "the path to ft2build.h" FORCE)
 endif()

 # ftheader.h
@@ -193,7 +193,7 @@ if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETY
  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)

  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "the path to ftheader.h" FORCE)

  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
@@ -214,7 +214,7 @@ if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCL
 else()
  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)

-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path to ftheader.h" FORCE)
 endif()

 # freetype library
--- a/adm/cmake/gl2ps.cmake
+++ b/adm/cmake/gl2ps.cmake
@@ -0,0 +1,3 @@
+#GL2PS
+
+THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "CSF_GL2PS" "d")
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -58,14 +58,21 @@ if (USE_TCL)
  endif()
 endif()

+# GL2PS
+if (NOT DEFINED ANDROID)
+  if (USE_GL2PS)
+    set (CSF_GL2PS "gl2ps")
+  else()
+    set (CSF_GL2PS)
+  endif()
+endif()
+
 if (WIN32)
  set (CSF_advapi32      "advapi32.lib")
  set (CSF_gdi32         "gdi32.lib")
  set (CSF_user32        "user32.lib")
-  set (CSF_shell32       "shell32.lib")
  set (CSF_wsock32       "wsock32.lib")
-  set (CSF_psapi         "psapi.lib")
-  set (CSF_winmm         "winmm.lib")
+  set (CSF_psapi         "Psapi.lib")
  set (CSF_d3d9          "D3D9.lib")
  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
    set (CSF_OpenGlLibs  "libEGL libGLESv2")
@@ -73,42 +80,34 @@ if (WIN32)
    set (CSF_OpenGlLibs  "opengl32.lib")
  endif()

-else()
+  else()

  if (APPLE)
    set (CSF_objc        "objc")

    # frameworks
-    if (IOS)
-      find_library (Appkit_LIB NAMES UIKit)
-      set (CSF_Appkit ${Appkit_LIB})
-    else()
-      find_library (Appkit_LIB NAMES AppKit)
-      set (CSF_Appkit ${Appkit_LIB})
-    endif()
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
+    find_library (Appkit_LIB NAMES AppKit)
+    set (CSF_Appkit ${Appkit_LIB})

    find_library (IOKit_LIB NAMES IOKit)
    set (CSF_IOKit ${IOKit_LIB})
+
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
    OCCT_CHECK_AND_UNSET (IOKit_LIB)

-    if (IOS)
-      find_library (OpenGlLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    elseif (USE_GLX)
+    if (USE_GLX)
      set (CSF_OpenGlLibs GL)
      set (CSF_XwLibs     "X11 Xext Xmu Xi")
    else()
      find_library (OpenGlLibs_LIB NAMES OpenGL)
      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+
      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
    endif()
    
  elseif (ANDROID)
    set (CSF_ThreadLibs  "c")
    set (CSF_OpenGlLibs  "EGL GLESv2")
-    set (CSF_androidlog  "log")
  elseif (UNIX)
    set (CSF_ThreadLibs  "pthread rt stdc++")
    if (USE_GLES2)
@@ -118,6 +117,5 @@ else()
    endif()
    set (CSF_XwLibs      "X11 Xext Xmu Xi")
    set (CSF_dl          "dl")
-    set (CSF_fontconfig  "fontconfig")
  endif()
 endif()
--- a/adm/cmake/occt_defs_flags.cmake
+++ b/adm/cmake/occt_defs_flags.cmake
@@ -86,13 +86,8 @@ if (MSVC AND (MSVC_VERSION GREATER 1400))
 endif()

 # generate a single response file which enlist all of the object files
-if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
-  SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-endif()
-if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
-  SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-endif()
-
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
 # increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
 if (MSVC)
  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -143,7 +138,5 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 endif()

-if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-endif()
+set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -12,12 +12,18 @@ macro (OCCT_CHECK_AND_UNSET VARNAME)
  endif()
 endmacro()

-macro (OCCT_CHECK_AND_UNSET_GROUP GROUPNAME)
-  get_cmake_property(VARS VARIABLES)
-  string (REGEX MATCHALL "(^|;)${GROUPNAME}[A-Za-z0-9_]*" GROUPNAME_VARS "${VARS}")
-  foreach(GROUPNAME_VAR ${GROUPNAME_VARS})
-    OCCT_CHECK_AND_UNSET(${GROUPNAME_VAR})
-  endforeach()
+macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
+
+  if (WIN32)
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+  endif()
 endmacro()

 macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
@@ -157,18 +163,13 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
  OCCT_MAKE_COMPILER_BITNESS()

  string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-  if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
-    string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
-    list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
-  else()
-    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]*[0-9]*-${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]*")
-  endif()
+
+  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]*")

  SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)

@@ -268,7 +269,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
    list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
    math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )

-    # emit warnings if there are unprocessed headers
+    # emit warnings if there is unprocessed headers
    file (GLOB OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/*.*")
    file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")

@@ -301,8 +302,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
            list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})

            # collect header files with name that does not contain its package one
-            string (REGEX MATCH "^${OCCT_PACKAGE}[_.]" IS_HEADER_MATHCING_PACKAGE "${OCCT_FILE_NAME}")
-            if (NOT IS_HEADER_MATHCING_PACKAGE)
+            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()
@@ -349,12 +350,12 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
    list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
    if (NOT ${IS_HEADER_FOUND} EQUAL -1)
      if (NOT EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
-        message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not present in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
+        message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not presented in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
        file (REMOVE "${OCCT_HEADER_FILE_OLD}")
      else()
        list (FIND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${PACKAGE_NAME} IS_HEADER_FOUND)
        if (NOT ${IS_HEADER_FOUND} EQUAL -1)
-          message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is present in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
+          message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is presented in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
          file (REMOVE "${OCCT_HEADER_FILE_OLD}")
        endif()
      endif()
@@ -584,7 +585,7 @@ endmacro()
 # prior to version 3.3 not supporting per-configuration install paths
 # for install target files (see https://cmake.org/Bug/view.php?id=14317)
 macro (OCCT_UPDATE_TARGET_FILE)
-  if (MSVC)
+  if (WIN32)
    OCCT_INSERT_CODE_FOR_TARGET ()
  endif()

--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -191,7 +191,7 @@ foreach (OCCT_MODULE ${OCC_MODULES_LIST})
  endif()
 endforeach()

-if (MSVC)
+if (WIN32)
  OCCT_INSERT_CODE_FOR_TARGET ()
 endif()

--- a/adm/cmake/qt.cmake
+++ b/adm/cmake/qt.cmake
@@ -1,21 +1,23 @@
 #qt

-# Qt is searched manually first (just determine root)
-message (STATUS "Processing Qt 3-rd party")
+#looking for 3RDPARTY_QT_DIR variable used later in qt_macro.cmake
+SET(CSF_QtCore "QtCore")
+THIRDPARTY_PRODUCT("QT" "" "CSF_QtCore" "d")

-if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
+list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")

-  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-    message (FATAL_ERROR "... Qt root directory was not found")
-  endif()
+list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_INCLUDE_DIR")
+list (REMOVE_ITEM 3RDPARTY_NO_LIBS "3RDPARTY_QT_LIBRARY_DIR")
+list (REMOVE_ITEM 3RDPARTY_NO_DLLS "3RDPARTY_QT_DLL_DIR")

-  # Combine directory name with absolute path and show in GUI
-  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-endif()
+UNSET (${3RDPARTY_QT_DLL} CACHE)
+UNSET (${3RDPARTY_QT_DLL_DIR} CACHE)
+UNSET (${3RDPARTY_QT_INCLUDE_DIR} CACHE)
+UNSET (${3RDPARTY_QT_LIBRARY} CACHE)
+UNSET (${3RDPARTY_QT_LIBRARY_DIR} CACHE)

 set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")

 # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
 # Without this setting find_package() will not work
@@ -31,4 +33,4 @@ if (NOT ${Qt5_FOUND})
  #message (STATUS "Qt4 cmake configuration")
 else()
  #message (STATUS "Qt5 cmake configuration")
-endif()
+endif()
--- a/adm/cmake/rapidjson.cmake
+++ b/adm/cmake/rapidjson.cmake
@@ -1,86 +0,0 @@
-# RapidJSON
-
-if (NOT DEFINED INSTALL_RAPIDJSON)
-  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
-endif()
-
-# RapidJSON directory
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
-  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
-endif()
-
-# search for RapidJSON in user defined directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
-    if (RAPIDJSON_DIR_NAME)
-      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
-  endif()
-endif()
-
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
-endif()
-
-if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
-  set (HEADER_NAMES rapidjson/rapidjson.h)
-
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
-
-  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
-                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-
-  # use default (CMake) RapidJSON search
-  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
-      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
-    endif()
-
-    find_package(RapidJSON QUIET)
-
-    # restore ENV{RapidJSON_DIR}
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
-    endif()
-
-    if (${RAPIDJSON_FOUND})
-      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
-      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
-  endif()
-endif()
-
-if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
-  # Install header files
-  if (INSTALL_RAPIDJSON)
-    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
-    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
-      if(IS_DIRECTORY "${SUBDIR}")
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      else()
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      endif()
-    endforeach()
-  endif()
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
-endif()
-
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -28,11 +28,6 @@ Applies only for Debug configuration.")
 set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
 "Append the postfix to names of output libraries")

-set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
-"Disables exceptions like Standard_OutOfRange in Release builds.
-Defines No_Exception macros for Release builds when enabled (default).
-These exceptions are always enabled in Debug builds, but disable in Release for better performance")
-
 set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
 "Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
 Corresponding environment variable (CSF_FPE) can be changed manually
@@ -45,7 +40,7 @@ Precompiled headers are generated automatically by Cotire tool.")
 # install variables
 set (INSTALL_DIR_DESCR 
 "The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
-samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
+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)")

 set (INSTALL_DIR_WITH_VERSION_DESCR
@@ -93,8 +88,8 @@ INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
 INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
 INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
+INSTALL_MESSAGE (INSTALL_GL2PS            "GL2PS binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
-INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
 INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
@@ -162,10 +157,6 @@ set (USE_FREEIMAGE_DESCR
 "Indicates whether Freeimage product should be used in OCCT visualization
 module for support of popular graphics image formats (PNG, BMP etc)")

-set (USE_RAPIDJSON_DESCR
-"Indicates whether RapidJSON product should be used in OCCT DataExchange
-module for support of JSON-based formats like glTF")
-
 set (USE_EGL_DESCR
 "Indicates whether EGL should be used in OCCT visualization
 module instead of conventional OpenGL context creation APIs")
@@ -174,6 +165,10 @@ set (USE_GLES2_DESCR
 "Indicates whether OpenGL ES 2.0 should be used in OCCT visualization
 module instead of desktop OpenGL")

+set (USE_GL2PS_DESCR
+"Indicates whether GL2PS product should be used in OCCT visualization
+module for support of vector image formats (PS, EPS etc)")
+
 set (USE_TBB_DESCR
 "Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
 the technology of Intel Corp, which comes with different mechanisms and patterns for
--- a/adm/genconf.tcl
+++ b/adm/genconf.tcl
@@ -24,44 +24,21 @@
 # load tools
 source [file join [file dirname [info script]] genconfdeps.tcl]

-# proxy variable for implicit file path normalization
-set PRODUCTS_PATH_INPUT "$::PRODUCTS_PATH"
-
 package require Tk

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

-# project file format
-set SYS_PRJFMT_LIST {}
-set SYS_PRJNAME_LIST {}
-if { "$::tcl_platform(platform)" == "windows" } {
-  lappend ::SYS_PRJFMT_LIST "vcxproj"
-  lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
-}
-if { "$tcl_platform(os)" == "Darwin" } {
-  lappend ::SYS_PRJFMT_LIST "xcd"
-  lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
-}
-lappend ::SYS_PRJFMT_LIST "cbp"
-lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
-lappend ::SYS_PRJFMT_LIST "pro"
-lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
-
-set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
-set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
-
 set SYS_VS_LIST {}
 set SYS_VC_LIST {}
 set SYS_VCVARS_LIST {}

-# detect installed Visual Studio 2017+ instances by running vswhere.exe
+# detect installed Visual Studio 2017 instances by running vswhere.exe
 if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
  lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
  lappend ::SYS_VC_LIST "vc141"
@@ -72,16 +49,6 @@ if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Micr
  lappend ::SYS_VC_LIST "vc141-uwp"
  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
-if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
-  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142)"
-  lappend ::SYS_VC_LIST "vc142"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
-}
-if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] } {
-  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142) UWP"
-  lappend ::SYS_VC_LIST "vc142-uwp"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
-}

 # detect installed Visual Studio instances from global environment
 if { [info exists ::env(VS140COMNTOOLS)] } {
@@ -134,7 +101,6 @@ proc wokdep:gui:Close {} {
 }

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

@@ -173,6 +139,9 @@ proc wokdep:gui:UpdateList {} {
  wokdep:SearchFreeType  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
  wokdep:SearchX11       anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
  if { "$::HAVE_GLES2" == "true" } {
+    if { "$::HAVE_GL2PS" == "true" } {
+      lappend anIncErrs "Error: gl2ps can not be used with OpenGL ES"
+    }
    wokdep:SearchEGL     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
    wokdep:SearchGLES    anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
  }
@@ -182,6 +151,9 @@ proc wokdep:gui:UpdateList {} {
  if { "$::HAVE_FFMPEG" == "true" } {
    wokdep:SearchFFmpeg  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
  }
+  if { "$::HAVE_GL2PS" == "true" } {
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "gl2ps" "gl2ps.h" "gl2ps" {"gl2ps"}
+  }
  if { "$::HAVE_TBB" == "true" } {
    wokdep:SearchTBB     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
  }
@@ -202,17 +174,6 @@ proc wokdep:gui:UpdateList {} {
    }
    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
  }
-  if { "$::HAVE_E57" == "true" } {
-    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "e57" "e57/E57Foundation.h" "E57RefImpl" {"e57"}
-    set aCheckLib "xerces-c"
-    if { "$::tcl_platform(platform)" == "windows" } {
-      set aCheckLib "xerces-c_3"
-    }
-    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "xerces-c" "xercesc/sax2/XMLReaderFactory.hpp" "$aCheckLib" {"xerces"}
-  }
-  if { "$::HAVE_RAPIDJSON" == "true" } {
-    wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
-  }

  if { "$::CHECK_QT4" == "true" } {
    wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
@@ -236,9 +197,9 @@ proc wokdep:gui:BrowseVcVars {} {
 }

 proc wokdep:gui:BrowsePartiesRoot {} {
-  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH_INPUT -title "Choose a directory"]
+  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH -title "Choose a directory"]
  if { "$aResult" != "" } {
-    set ::PRODUCTS_PATH_INPUT $aResult
+    set ::PRODUCTS_PATH $aResult
    wokdep:gui:UpdateList
  }
 }
@@ -435,8 +396,6 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
 }

 # Header
-ttk::label    .myFrame.myPrjFrame.myPrjLbl     -text "Project format:" -padding {5 5 20 5}
-ttk::combobox .myFrame.myPrjFrame.myPrjCombo   -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
 ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration:" -padding {5 5 20 5}
 ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
 ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
@@ -452,10 +411,12 @@ ttk::label    .myFrame.myHxxChecks.myScutsLbl     -text "Strategy for filling he

 #
 ttk::label    .myFrame.mySrchLbl       -text "3rd-parties search path:" -padding {5 5 80 5}
-entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH_INPUT -width 80
+entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH -width 80
 ttk::button   .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
 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"
 if { "$::tcl_platform(os)" != "Darwin" } {
@@ -470,9 +431,6 @@ checkbutton   .myFrame.myChecks.myFFmpegCheck   -offvalue "false" -onvalue "true
 ttk::label    .myFrame.myChecks.myFFmpegLbl     -text "Use FFmpeg"
 #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.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myChecks.myRapidJsonLbl   -text "Use RapidJSON"
-
 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"
@@ -482,8 +440,6 @@ checkbutton   .myFrame.myChecks.myZLibCheck     -offvalue "false" -onvalue "true
 ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
 checkbutton   .myFrame.myChecks.myLzmaCheck     -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA   -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"
-checkbutton   .myFrame.myChecks.myE57Check      -offvalue "false" -onvalue "true" -variable HAVE_E57       -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myChecks.myE57Lbl        -text "Use E57"

 checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
@@ -546,10 +502,6 @@ ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close

 # Create grid
 # Header
-grid .myFrame.myPrjFrame            -row $aRowIter -column 0 -columnspan 10 -sticky w
-grid .myFrame.myPrjFrame.myPrjLbl   -row 0 -column 0
-grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
-incr aRowIter
 if { "$tcl_platform(platform)" == "windows" } {
  grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
  grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
@@ -593,8 +545,11 @@ if { "$::tcl_platform(os)" != "Darwin" } {
 grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w

-grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 12 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myGl2psCheck    -row $aCheckRowIter -column 8 -sticky e
+grid .myFrame.myChecks.myGl2psLbl      -row $aCheckRowIter -column 9 -sticky w
+
+grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 11 -sticky w

 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -604,22 +559,18 @@ grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3 -sticky w
 if { "$::tcl_platform(platform)" == "windows" } {
  grid .myFrame.myChecks.myD3dCheck    -row $aCheckRowIter -column 4 -sticky e
  grid .myFrame.myChecks.myD3dLbl      -row $aCheckRowIter -column 5 -sticky w
-} elseif { "$::tcl_platform(os)" == "Darwin" } {
-  grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 4 -sticky e
-  grid .myFrame.myChecks.myMacGLXLbl   -row $aCheckRowIter -column 5 -sticky w
 }
 grid .myFrame.myChecks.myLzmaCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myLzmaLbl       -row $aCheckRowIter -column 7 -sticky w
-grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 12 -sticky e
-grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
-
-incr aCheckRowIter
-grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 0 -sticky e
-grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 1 -sticky w
-grid .myFrame.myChecks.myE57Check      -row $aCheckRowIter -column 6 -sticky e
-grid .myFrame.myChecks.myE57Lbl        -row $aCheckRowIter -column 7 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 11 -sticky w

 incr aCheckRowIter
+if { "$::tcl_platform(os)" == "Darwin" } {
+  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
 grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
@@ -652,9 +603,6 @@ grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
 grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2

 # Bind events
-bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
-  wokdep:gui:SwitchConfig
-}
 bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
  wokdep:gui:SwitchConfig
 }
@@ -663,7 +611,6 @@ bind .myFrame.myVsFrame.myArchCombo <<ComboboxSelected>> {
 }

 .myFrame.mySrchEntry configure -validate all -validatecommand {
-  set ::PRODUCTS_PATH [file normalize "$::PRODUCTS_PATH_INPUT"]
  #return [file exists "$::PRODUCTS_PATH"]
  wokdep:gui:UpdateList
  return 1
--- a/adm/genconfdeps.tcl
+++ b/adm/genconfdeps.tcl
@@ -27,10 +27,8 @@ if { "$tcl_platform(platform)" == "unix" } {
  set SYS_EXE_SUFFIX    ""
  if { "$tcl_platform(os)" == "Darwin" } {
    set SYS_LIB_SUFFIX "dylib"
-    set PRJFMT "xcd"
  } else {
    set SYS_LIB_SUFFIX "so"
-    set PRJFMT "cbp"
  }
  set VCVER "gcc"
  set VCVARS ""
@@ -41,7 +39,6 @@ if { "$tcl_platform(platform)" == "unix" } {
  set SYS_EXE_SUFFIX    ".exe"
  set VCVER  "vc10"
  set VCVARS ""
-  set PRJFMT "vcxproj"
 }

 set SHORTCUT_HEADERS "ShortCut"
@@ -68,7 +65,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
 }

 # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
-set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
+set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_GL2PS HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
 foreach anEnvIter $THE_ENV_VARIABLES {
  set ${anEnvIter} "false"
  if { [info exists ::env(${anEnvIter})] } {
@@ -85,14 +82,11 @@ if { "$tcl_platform(platform)" != "windows" } {
  set HAVE_D3D ""
  set HAVE_RelWithDebInfo ""
 }
-foreach anEnvIter {ARCH VCVER VCVARS PRJFMT } {
+foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
  if { [info exists ::env(${anEnvIter})] } {
    set ${anEnvIter} "$::env(${anEnvIter})"
  }
 }
-if { [info exists ::env(PRODUCTS_PATH)] } {
-  set PRODUCTS_PATH [file normalize "$::env(PRODUCTS_PATH)"]
-}

 if { [info exists ::env(CSF_OPT_INC)] } {
  set CSF_OPT_INC [split "$::env(CSF_OPT_INC)" $::SYS_PATH_SPLITTER]
@@ -146,12 +140,9 @@ proc wokdep:SearchHeader {theHeader} {
 # Search library file in $::CSF_OPT_LIB* and standard paths
 proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
  if { "$theSearchPath" != "" } {
-    set aPath  "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
-    set aPath2 "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.a"
+    set aPath "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
    if { [file exists "$aPath"] } {
      return "$aPath"
-    } elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
-      return "$aPath2"
    } else {
      return ""
    }
@@ -159,42 +150,31 @@ proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {

  # search in custom paths
  foreach aLibPath [set ::CSF_OPT_LIB$theBitness] {
-    set aPath  "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
-    set aPath2 "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.a"
+    set aPath "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
    if { [file exists "$aPath"] } {
      return "$aPath"
-    } elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
-      return "$aPath2"
    }
  }

  # search in system
  if { "$::ARCH" == "$theBitness"} {
-    set aPath  "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
-    set aPath2 "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.a"
+    set aPath "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
    if { [file exists "$aPath"] } {
      return "$aPath"
-    } elseif { [file exists "$aPath2"] } {
-      return "$aPath2"
    }
  }

+
  if { "$::tcl_platform(os)" == "Linux" } {
    if { "$theBitness" == "64" } {
-      set aPath  "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
-      set aPath2 "/usr/lib/x86_64-linux-gnu/lib${theLib}.a"
+      set aPath "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
      if { [file exists "$aPath"] } {
        return "$aPath"
-      } elseif { [file exists "$aPath2"] } {
-        return "$aPath2"
      }
    } else {
-      set aPath  "/usr/lib/i386-linux-gnu/lib${theLib}.so"
-      set aPath2 "/usr/lib/i386-linux-gnu/lib${theLib}.a"
+      set aPath "/usr/lib/i386-linux-gnu/lib${theLib}.so"
      if { [file exists "$aPath"] } {
        return "$aPath"
-      } elseif { [file exists "$aPath2"] } {
-        return "$aPath2"
      }
    }
  }
@@ -875,25 +855,6 @@ proc wokdep:SearchGLES {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin6
  return "$isFound"
 }

-# Search RapidJSON headers
-proc wokdep:SearchRapidJson {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
-  upvar $theErrInc anErrInc
-
-  set isFound "true"
-  set aRJHPath [wokdep:SearchHeader "rapidjson/rapidjson.h"]
-  if { "$aRJHPath"  == "" } {
-    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{rapidjson}*] "$::VCVER" "$::ARCH" ]
-    if { "$aPath" != "" && [file exists "$aPath/include/rapidjson/rapidjson.h"] } {
-      lappend ::CSF_OPT_INC "$aPath/include"
-    } else {
-      lappend anErrInc "Error: 'rapidjson/rapidjson.h' not found (RapidJSON)"
-      set isFound "false"
-    }
-  }
-
-  return "$isFound"
-}
-
 # Auxiliary function, gets VTK version to set default search directory
 proc wokdep:VtkVersion { thePath } {
  set aResult "6.1"
@@ -1157,33 +1118,15 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
  return "$isFound"
 }

-# Returns OCCT version string from file Standard_Version.hxx (if available)
-proc wokdep:DetectCasVersion {} {
-  set occt_ver 7.0.0
-  set aCasRoot [file normalize [file dirname [info script]]]
-  set filename "${aCasRoot}/src/Standard/Standard_Version.hxx"
-  if { [file exists $filename] } {
-    set fh [open $filename "r"]
-    set fh_loaded [read $fh]
-    close $fh
-    regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
-  } else {
-    puts "Error: file '$filename' not found"
-  }
-  return $occt_ver
-}
-
 # Generate (override) custom environment file
 proc wokdep:SaveCustom {} {
-  set aGenInfo "This environment file was generated by genconf.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
  if { "$::tcl_platform(platform)" == "windows" } {
    set aCustomFilePath "./custom.bat"
    set aFile [open $aCustomFilePath "w"]
    puts $aFile "@echo off"
-    puts $aFile "rem $aGenInfo"
+    puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"

    puts $aFile ""
-    puts $aFile "set PRJFMT=$::PRJFMT"
    puts $aFile "set VCVER=$::VCVER"
    puts $aFile "set ARCH=$::ARCH"
    puts $aFile "set VCVARS=$::VCVARS"
@@ -1203,41 +1146,26 @@ proc wokdep:SaveCustom {} {
    }

    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional headers search paths"
    puts $aFile "set \"CSF_OPT_INC=$aStringInc\""

    set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib32 [regsub -all "$::PRODUCTS_PATH" $aStringLib32 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional libraries (32-bit) search paths"
    puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""

    set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib64 [regsub -all "$::PRODUCTS_PATH" $aStringLib64 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional libraries (64-bit) search paths"
    puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""

    set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin32 [regsub -all "$::PRODUCTS_PATH" $aStringBin32 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional (32-bit) search paths"
    puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""

    set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin64 [regsub -all "$::PRODUCTS_PATH" $aStringBin64 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional (64-bit) search paths"
    puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
@@ -1247,10 +1175,9 @@ proc wokdep:SaveCustom {} {
    set aCustomFilePath "./custom.sh"
    set aFile [open $aCustomFilePath "w"]
    puts $aFile "#!/bin/bash"
-    puts $aFile "# $aGenInfo"
+    puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"

    puts $aFile ""
-    puts $aFile "export PRJFMT=$::PRJFMT"
    puts $aFile "export ARCH=$::ARCH"
    puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"

@@ -1268,88 +1195,22 @@ proc wokdep:SaveCustom {} {
    }

    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "\${PRODUCTS_PATH}"]
-    }
    puts $aFile ""
    puts $aFile "# Additional headers search paths"
    puts $aFile "export CSF_OPT_INC=\"$aStringInc\""

-    set aStringLib [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
-    }
+    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
    puts $aFile ""
    puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""

-    set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
-    }
+    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
    puts $aFile ""
    puts $aFile "# Additional ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""

    close $aFile
  }
+
  puts "Configuration saved to file '$aCustomFilePath'"
-
-  # generate custom.auto.pri
-  set toExportCustomPri 1
-  if { $toExportCustomPri == 1 } {
-    set aCasVer [wokdep:DetectCasVersion]
-    set aCustomFilePath "./adm/qmake/custom.auto.pri"
-    set aFile [open $aCustomFilePath "w"]
-    puts $aFile "# $aGenInfo"
-
-    puts $aFile ""
-    puts $aFile "VERSION=$aCasVer"
-    puts $aFile "PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
-
-    puts $aFile ""
-    puts $aFile "# Optional 3rd-parties switches"
-    foreach anEnvIter $::THE_ENV_VARIABLES {
-      set aName ${anEnvIter}
-      set aValue [set ::${anEnvIter}]
-      if { "$aValue" == "true" } {
-        puts $aFile "CONFIG += ${aName}"
-      } else {
-        #puts $aFile "CONFIG -= ${aName}"
-      }
-    }
-
-    puts $aFile ""
-    puts $aFile "# Additional headers search paths"
-    foreach anIncPath $::CSF_OPT_INC {
-      if { "$::PRODUCTS_PATH" != "" } {
-        set anIncPath [regsub -all "$::PRODUCTS_PATH" $anIncPath "\$\$\{PRODUCTS_PATH\}"]
-      }
-      puts $aFile "INCLUDEPATH += \"${anIncPath}\""
-    }
-
-    puts $aFile ""
-    puts $aFile "# Additional libraries search paths"
-    foreach aLibPath [set ::CSF_OPT_LIB$::ARCH] {
-      if { "$::PRODUCTS_PATH" != "" } {
-        set aLibPath [regsub -all "$::PRODUCTS_PATH" $aLibPath "\$\$\{PRODUCTS_PATH\}"]
-      }
-      puts $aFile "LIBS += -L\"${aLibPath}\""
-    }
-
-    if { "$::tcl_platform(platform)" == "windows" } {
-      puts $aFile ""
-      puts $aFile "# Additional DLLs search paths"
-      foreach aDllPath [set ::CSF_OPT_BIN$::ARCH] {
-        if { "$::PRODUCTS_PATH" != "" } {
-          set aDllPath [regsub -all "$::PRODUCTS_PATH" $aDllPath "\$\$\{PRODUCTS_PATH\}"]
-        }
-        puts $aFile "LIBS += -L\"${aDllPath}\""
-      }
-    }
-
-    puts $aFile ""
-    close $aFile
-    puts "Configuration saved to file '$aCustomFilePath'"
-  }
 }
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -256,7 +256,7 @@ proc genAllResources {} {

 # Wrapper-function to generate VS project files
 proc genproj {theFormat args} {
-  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "vc142" "cbp" "xcd" "pro"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd"}
  set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
  set isHelpRequire false

@@ -284,12 +284,8 @@ proc genproj {theFormat args} {

  # Check optional arguments
  set aLibType "dynamic"
-  set aSolution "OCCT"
-  for {set anArgIter 0} {$anArgIter < [llength args]} {incr anArgIter} {
-    set arg [lindex $args $anArgIter]
-    if { $arg == "" } {
-      continue
-    } elseif { $arg == "-h" || $arg == "-help" || $arg == "--help" } {
+  foreach arg $args {
+    if { $arg == "-h" || $arg == "-help" || $arg == "--help" } {
      set isHelpRequire true
    } elseif { [lsearch -exact $aSupportedPlatforms $arg] >= 0 } {
      set aPlatform $arg
@@ -299,9 +295,6 @@ proc genproj {theFormat args} {
    } elseif { $arg == "-dynamic" } {
      set aLibType "dynamic"
      puts "Dynamic build has been selected"
-    } elseif { $arg == "-solution" } {
-      incr anArgIter
-      set aSolution [lindex $args $anArgIter]
    } else {
      puts "Error: genproj: unrecognized option \"$arg\""
      set isHelpRequire true
@@ -319,10 +312,8 @@ proc genproj {theFormat args} {
      vc12     -  Visual Studio 2013
      vc14     -  Visual Studio 2015
      vc141    -  Visual Studio 2017
-      vc142    -  Visual Studio 2019
      cbp      -  CodeBlocks
      xcd      -  XCode
-      pro      -  Qt Creator

    Platform (optional):
      wnt   -  Windows Desktop
@@ -347,9 +338,9 @@ proc genproj {theFormat args} {
  # base path to where to generate projects, hardcoded from current dir
  set anAdmPath [file normalize "${::path}/adm"]

-  OS:MKPRC "$anAdmPath" "$theFormat" "$aLibType" "$aPlatform" "$aCmpl" "$aSolution"
+  OS:MKPRC "$anAdmPath" "$theFormat" "$aLibType" "$aPlatform" "$aCmpl"

-  genprojbat "$theFormat" "$aPlatform" "$aSolution"
+  genprojbat "$theFormat" "$aPlatform"
  genAllResources
 }

@@ -369,8 +360,7 @@ proc copy_with_warning {from to} {
  file copy -force -- "$from" "$to"
 }

-# Generate auxiliary scripts for launching IDE.
-proc genprojbat {theFormat thePlatform theSolution} {
+proc genprojbat {theFormat thePlatform} {
  set aTargetPlatformExt sh
  if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
    set aTargetPlatformExt bat
@@ -398,36 +388,20 @@ proc genprojbat {theFormat thePlatform theSolution} {
    copy_with_warning "$::THE_CASROOT/adm/templates/draw.${aTargetPlatformExt}" "$::path/draw.${aTargetPlatformExt}"
  }

-  set aSolShList ""
  if { [regexp {^vc} $theFormat] } {
-    set aSolShList "msvc.bat"
+    copy_with_warning "$::THE_CASROOT/adm/templates/msvc.bat" "$::path/msvc.bat"
  } else {
    switch -exact -- "$theFormat" {
-      "cbp" {
-        set aSolShList { "codeblocks.sh" "codeblocks.bat" }
+      "cbp"   {
+        file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.sh"  "$::path/codeblocks.sh"
+        file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.bat" "$::path/codeblocks.bat"
        # Code::Blocks 16.01 does not create directory for import libs, help him
-        set aPlatformAndCompiler "${thePlatform}/gcc"
-        if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
-          set aPlatformAndCompiler "${thePlatform}/clang"
-        }
-        file mkdir "$::path/${aPlatformAndCompiler}/lib"
-        file mkdir "$::path/${aPlatformAndCompiler}/libd"
+        file mkdir "$::path/$thePlatform/cbp/lib"
+        file mkdir "$::path/$thePlatform/cbp/libd"
      }
-      "xcd" { set aSolShList "xcode.sh" }
+      "xcd"   { file copy -force -- "$::THE_CASROOT/adm/templates/xcode.sh"      "$::path/xcode.sh" }
    }
  }
-
-  foreach aSolSh $aSolShList {
-    set anShFile [open "$::THE_CASROOT/adm/templates/${aSolSh}" "r"]
-    set anShTmpl [read $anShFile]
-    close $anShFile
-
-    regsub -all -- {__SOLUTION__} $anShTmpl "$theSolution" anShTmpl
-
-    set anShFile [open "$::path/${aSolSh}" "w"]
-    puts $anShFile $anShTmpl
-    close $anShFile
-  }
 }

 ###### MSVC #############################################################33
@@ -448,8 +422,7 @@ set THE_GUIDS_LIST($aTKNullKey) "{00000000-0000-0000-0000-000000000000}"
 # @param theLibType  Library type - dynamic or static
 # @param thePlatform Optional target platform for cross-compiling, e.g. ios for iOS
 # @param theCmpl     Compiler option (msvc or gcc)
-# @param theSolution Solution name
-proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution } {
+proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl } {
  global path
  set anOutRoot $theOutDir
  if { $anOutRoot == "" } {
@@ -499,6 +472,15 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
    }
  }

+  # generate one solution for all projects if complete OS or VAS is processed
+  set anAllSolution "OCCT"
+
+  wokUtils:FILES:mkdir $anOutDir
+  if { ![file exists $anOutDir] } {
+    puts stderr "Error: Could not create output directory \"$anOutDir\""
+    return
+  }
+
  # create the out dir if it does not exist
  if (![file isdirectory $path/inc]) {
    puts "$path/inc folder does not exists and will be created"
@@ -509,16 +491,6 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
  puts "Collecting required header files into $path/inc ..."
  osutils:collectinc $aModules $path/inc

-  if { "$theFormat" == "pro" } {
-    return
-  }
-
-  wokUtils:FILES:mkdir $anOutDir
-  if { ![file exists $anOutDir] } {
-    puts stderr "Error: Could not create output directory \"$anOutDir\""
-    return
-  }
-
  # Generating project files for the selected format
  switch -exact -- "$theFormat" {
    "vc7"   -
@@ -528,12 +500,11 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
    "vc11"  -
    "vc12"  -
    "vc14"  -
-    "vc141" -
-    "vc142"    { OS:MKVC  $anOutDir $aModules $theSolution $theFormat $isUWP}
-    "cbp"      { OS:MKCBP $anOutDir $aModules $theSolution $thePlatform $theCmpl }
+    "vc141"    { OS:MKVC  $anOutDir $aModules $anAllSolution $theFormat $isUWP}
+    "cbp"      { OS:MKCBP $anOutDir $aModules $anAllSolution $thePlatform $theCmpl }
    "xcd"      {
      set ::THE_GUIDS_LIST($::aTKNullKey) "000000000000000000000000"
-      OS:MKXCD $anOutDir $aModules $theSolution $theLibType $thePlatform
+      OS:MKXCD $anOutDir $aModules $anAllSolution $theLibType $thePlatform
    }
  }

@@ -953,7 +924,7 @@ proc osutils:collectinc {theModules theIncPath} {
  set anIncFiles [glob -tails -nocomplain -dir ${anIncPath} "*"]
  foreach anIncFile ${anIncFiles} {
    if { [lsearch -exact ${allHeaderFiles} ${anIncFile}] == -1 } {
-      puts "Warning: file ${anIncPath}/${anIncFile} is not present in the sources and will be removed from ${theIncPath}"
+      puts "Warning: file ${anIncPath}/${anIncFile} is not presented in the sources and will be removed from ${theIncPath}!"
      file delete -force "${theIncPath}/${anIncFile}"
    }
  }
@@ -984,7 +955,7 @@ proc osutils:vcsolution:header { vcversion } {
    append var \
      "Microsoft Visual Studio Solution File, Format Version 12.00\n" \
      "# Visual Studio 2013\n"
-  } elseif { "$vcversion" == "vc14" || "$vcversion" == "vc141" || "$vcversion" == "vc142" } {
+  } elseif { "$vcversion" == "vc14"  || "$vcversion" == "vc141"} {
    append var \
      "Microsoft Visual Studio Solution File, Format Version 12.00\n" \
      "# Visual Studio 14\n"
@@ -1222,9 +1193,6 @@ proc osutils:vcproj:readtemplate {theVcVer isUWP isExec} {
  if { $theVcVer == "vc141" } {
    set aVCRTVer "vc14"
    set aToolset "v141"
-  } elseif { $theVcVer == "vc142" } {
-    set aVCRTVer "vc14"
-    set aToolset "v142"
  }

  set what "$theVcVer"
@@ -1295,16 +1263,12 @@ proc wokUtils:FILES:FileToString { fin } {

 # List extensions of compilable files in OCCT
 proc osutils:compilable {thePlatform} {
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .c .cxx .cpp .mm] }
+  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
+    return [list .c .cxx .cpp .mm]
+  }
  return [list .c .cxx .cpp]
 }

-# List extensions of header file in OCCT
-proc osutils:fileExtensionsHeaders {thePlatform} {
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .h .hxx .hpp .lxx .pxx .gxx ] }
-  return [list .h .hxx .hpp .lxx .pxx .gxx .mm ]
-}
-
 proc osutils:commonUsedTK { theToolKit } {
  set anUsedToolKits [list]
  set aDepToolkits [LibToLink $theToolKit]
@@ -1354,6 +1318,9 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
  if { "$::HAVE_FFMPEG" == "true" } {
    set aLibsMap(CSF_FFmpeg) "avcodec avformat swscale avutil"
  }
+  if { "$::HAVE_GL2PS" == "true" } {
+    set aLibsMap(CSF_GL2PS) "gl2ps"
+  }
  if { "$::HAVE_TBB" == "true" } {
    set aLibsMap(CSF_TBB) "tbb tbbmalloc"
  }
@@ -1370,11 +1337,6 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
  if { "$::HAVE_LIBLZMA" == "true" } {
    set aLibsMap(CSF_LIBLZMA) "liblzma"
  }
-  if { "$::HAVE_E57" == "true" && "$theOS" != "wnt" } {
-    # exclude wnt, as there are different pragma lib depending on debug/release
-    set aLibsMap(CSF_E57)    "E57RefImpl"
-    set aLibsMap(CSF_xerces) "xerces-c"
-  }

  if { "$theOS" == "wnt" } {
    #  WinAPI libraries
@@ -1382,11 +1344,9 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
    set aLibsMap(CSF_advapi32)     "advapi32"
    set aLibsMap(CSF_gdi32)        "gdi32"
    set aLibsMap(CSF_user32)       "user32 comdlg32"
-    set aLibsMap(CSF_shell32)      "shell32"
    set aLibsMap(CSF_opengl32)     "opengl32"
    set aLibsMap(CSF_wsock32)      "wsock32"
    set aLibsMap(CSF_netapi32)     "netapi32"
-    set aLibsMap(CSF_winmm)        "winmm"
    set aLibsMap(CSF_OpenGlLibs)   "opengl32"
    if { "$::HAVE_GLES2" == "true" } {
      set aLibsMap(CSF_OpenGlLibs) "libEGL libGLESv2"
@@ -1404,26 +1364,17 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
    set aLibsMap(CSF_TBB) ""
  } else {
    set aLibsMap(CSF_dl)           "dl"
-    if { "$theOS" == "mac" || "$theOS" == "ios" } {
+    if { "$theOS" == "mac" } {
      set aLibsMap(CSF_objc)       "objc"
-      if { "$theOS" == "ios" } {
-        set aFrmsMap(CSF_Appkit)     "UIKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGLES"
-      } else {
-        set aFrmsMap(CSF_Appkit)     "AppKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
-      }
+      set aFrmsMap(CSF_Appkit)     "AppKit"
      set aFrmsMap(CSF_IOKit)      "IOKit"
+      set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
      set aFrmsMap(CSF_TclLibs)    "Tcl"
      set aLibsMap(CSF_TclLibs)    ""
      set aFrmsMap(CSF_TclTkLibs)  "Tk"
      set aLibsMap(CSF_TclTkLibs)  ""
      set aLibsMap(CSF_QT)         "QtCore QtGui"
-    } elseif { "$theOS" == "android" } {
-      set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
-      set aLibsMap(CSF_androidlog) "log"
    } else {
-      set aLibsMap(CSF_fontconfig) "fontconfig"
      if { "$theOS" == "qnx" } {
        # CSF_ThreadLibs - pthread API is part of libc on QNX
        set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
@@ -1517,7 +1468,8 @@ proc osutils:tk:units { tkloc } {
 }

 proc osutils:justwnt { listloc } {
-  set goaway [list Xw]
+  # ImageUtility is required for support for old (<6.5.4) versions of OCCT
+  set goaway [list Xdps Xw  ImageUtility WOKUnix]
  return [osutils:juststation $goaway $listloc]
 }

@@ -1607,28 +1559,31 @@ proc wokUtils:FILES:wtail { f n } {
 }

 # Generate entry for one source file in Visual Studio 10 project file
-proc osutils:vcxproj:cxxfile { theFile theParams } {
-  if { $theParams == "" } {
-    return "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n"
+proc osutils:vcxproj:file { file params } {
+  append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
  }

-  set aParams [string trim ${theParams}]
-  append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\">\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
  append text "    </ClCompile>\n"
  return $text
 }

-# Generate entry for one header file in Visual Studio 10 project file
-proc osutils:vcxproj:hxxfile { theFile } { return "    <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n" }
-
 # Generate Visual Studio 2010 project filters file
-proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
-  upvar $theCxxFilesMap aCxxFilesMap
-  upvar $theHxxFilesMap aHxxFilesMap
+proc osutils:vcxproj:filters { dir proj theFilesMap } {
+  upvar $theFilesMap aFilesMap

  # header
  append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -1639,25 +1594,17 @@ proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
  append text "    <Filter Include=\"Source files\">\n"
  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
  append text "    </Filter>\n"
-  append text "    <Filter Include=\"Header files\">\n"
-  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
-  append text "    </Filter>\n"
-  foreach unit $aCxxFilesMap(units) {
+  foreach unit $aFilesMap(units) {
    append text "    <Filter Include=\"Source files\\${unit}\">\n"
    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
    append text "    </Filter>\n"
  }
-  foreach unit $aHxxFilesMap(units) {
-    append text "    <Filter Include=\"Header files\\${unit}\">\n"
-    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
-    append text "    </Filter>\n"
-  }
  append text "  </ItemGroup>\n"

-  # list of cxx files
+  # list of files
  append text "  <ItemGroup>\n"
-  foreach unit $aCxxFilesMap(units) {
-    foreach file $aCxxFilesMap($unit) {
+  foreach unit $aFilesMap(units) {
+    foreach file $aFilesMap($unit) {
      append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
      append text "      <Filter>Source files\\${unit}</Filter>\n"
      append text "    </ClCompile>\n"
@@ -1665,19 +1612,51 @@ proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
  }
  append text "  </ItemGroup>\n"

-  # list of hxx files
+  # end
+  append text "</Project>"
+
+  # write file
+  set fp [open [set fvcproj [file join $dir ${proj}.vcxproj.filters]] w]
+  fconfigure $fp -translation crlf
+  puts $fp $text
+  close $fp
+
+  return ${proj}.vcxproj.filters
+}
+
+# Generate Visual Studio 2011 project filters file
+proc osutils:vcx1proj:filters { dir proj theFilesMap } {
+  upvar $theFilesMap aFilesMap
+
+  # header
+  append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+  append text "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
+
+  # list of "filters" (units)
  append text "  <ItemGroup>\n"
-  foreach unit $aHxxFilesMap(units) {
-    foreach file $aHxxFilesMap($unit) {
-      append text "    <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
-      append text "      <Filter>Header files\\${unit}</Filter>\n"
-      append text "    </ClInclude>\n"
+  append text "    <Filter Include=\"Source files\">\n"
+  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
+  append text "    </Filter>\n"
+  foreach unit $aFilesMap(units) {
+    append text "    <Filter Include=\"Source files\\${unit}\">\n"
+    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
+    append text "    </Filter>\n"
+  }
+  append text "  </ItemGroup>\n"
+
+  # list of files
+  append text "  <ItemGroup>\n"
+  foreach unit $aFilesMap(units) {
+    foreach file $aFilesMap($unit) {
+      append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
+      append text "      <Filter>Source files\\${unit}</Filter>\n"
+      append text "    </ClCompile>\n"
    }
  }
  append text "  </ItemGroup>\n"

  append text "  <ItemGroup>\n"
-  append text "    <ResourceCompile Include=\"${proj}.rc\" />\n"
+  append text "    <ResourceCompile Include=\"${proj}.rc\" />"
  append text "  </ItemGroup>\n"

  # end
@@ -1750,9 +1729,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set anIncPaths "..\\..\\..\\inc"
 #  set aTKDefines ""
  set aFilesSection ""
-  set aVcFilesCxx(units) ""
-  set aVcFilesHxx(units) ""
+  set aVcFilesX(units) ""
  set listloc [osutils:tk:units $theToolKit]
+  set resultloc [osutils:justwnt $listloc]
  if [array exists written] { unset written }
  #puts "\t1 [wokparam -v %CMPLRS_CXX_Options [w_info -f]] father"
  #puts "\t2 [wokparam -v %CMPLRS_CXX_Options] branch"
@@ -1761,10 +1740,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set fxloparamfcxx [lindex [osutils:intersect3 [_get_options wnt cmplrs_cxx f] [_get_options wnt cmplrs_cxx b]] 2]
  set fxloparamfc   [lindex [osutils:intersect3 [_get_options wnt cmplrs_c f] [_get_options wnt cmplrs_c b]] 2]
  set fxloparam ""
-  foreach fxlo $listloc {
+  foreach fxlo $resultloc {
    set xlo $fxlo
-    set aSrcFiles [osutils:tk:cxxfiles $xlo wnt]
-	set aHxxFiles [osutils:tk:hxxfiles $xlo wnt]
+    set aSrcFiles [osutils:tk:files $xlo wnt]
 	set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx $fxlo]
    if {$fxlo_cmplrs_options_cxx == ""} {
      set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx b]
@@ -1793,22 +1771,12 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      foreach aSrcFile [lsort $aSrcFiles] {
        if { ![info exists written([file tail $aSrcFile])] } {
          set written([file tail $aSrcFile]) 1
-          append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam]
+          append aFilesSection [osutils:vcxproj:file $aSrcFile $needparam]
        } else {
          puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]"
        }
-        if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo }
-        lappend aVcFilesCxx($xlo) $aSrcFile
-      }
-      foreach aHxxFile [lsort $aHxxFiles] {
-        if { ![info exists written([file tail $aHxxFile])] } {
-          set written([file tail $aHxxFile]) 1
-          append aFilesSection [osutils:vcxproj:hxxfile $aHxxFile]
-        } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aHxxFile]"
-        }
-        if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo }
-        lappend aVcFilesHxx($xlo) $aHxxFile
+        if { ! [info exists aVcFilesX($xlo)] } { lappend aVcFilesX(units) $xlo }
+        lappend aVcFilesX($xlo) $aSrcFile
      }
    } else {
      append aFilesSection "\t\t\t<Filter\n"
@@ -1824,9 +1792,15 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      }
      append aFilesSection "\t\t\t</Filter>\n"
    }
+
+    # macros
+#    append aTKDefines ";__${xlo}_DLL"
+    # common includes
+#    append anIncPaths ";..\\..\\..\\src\\${xlo}"
  }

  regsub -all -- {__TKINC__}  $theProjTmpl $anIncPaths theProjTmpl
+#  regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
  regsub -all -- {__FILES__}  $theProjTmpl $aFilesSection theProjTmpl

  # write file
@@ -1836,8 +1810,12 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  close $aFile

  # write filters file for vc10+
-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesCxx aVcFilesHxx]
+  if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" || "$theVcVer" == "vc9" } {
+    # nothing
+  } elseif { "$theVcVer" == "vc10" } {
+    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX]
+  } else {
+    lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX]
  }

  # write resource file
@@ -1869,14 +1847,16 @@ proc osutils:tk:loadunit { loc map } {
  return
 }

-# Returns the list of all files name in a toolkit within specified list of file extensions.
-proc osutils:tk:files { tkloc theExtensions } {
+# Returns the list of all compilable files name in a toolkit, or devunit of any type
+# Tfiles lists for each unit the type of file that can be compiled.
+proc osutils:tk:files { tkloc thePlatform } {
  set Tfiles(source,nocdlpack)     {source pubinclude}
  set Tfiles(source,toolkit)       {}
  set Tfiles(source,executable)    {source pubinclude}
  set listloc [concat [osutils:tk:units $tkloc] $tkloc]
  #puts " listloc = $listloc"

+  set l_comp [osutils:compilable $thePlatform]
  set resultloc $listloc
  set lret {}
  foreach loc $resultloc {
@@ -1886,7 +1866,6 @@ proc osutils:tk:files { tkloc theExtensions } {
         "t" { set utyp "toolkit" }
         "n" { set utyp "nocdlpack" }
         "x" { set utyp "executable" }
-         default { error "Error: Cannot determine type of unit $loc, check adm/UDLIST!" }
    }
    if [array exists map] { unset map }
    osutils:tk:loadunit $loc map
@@ -1901,7 +1880,7 @@ proc osutils:tk:files { tkloc theExtensions } {
      #puts $type
      foreach f $map($type) {
        #puts $f
-        if { [lsearch $theExtensions [file extension $f]] != -1 } {
+        if { [lsearch $l_comp [file extension $f]] != -1 } {
          lappend lret $f
        }
      }
@@ -1910,16 +1889,10 @@ proc osutils:tk:files { tkloc theExtensions } {
  return $lret
 }

-# Returns the list of all compilable files name in a toolkit.
-proc osutils:tk:cxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:compilable $thePlatform]] }
-
-# Returns the list of all header files name in a toolkit.
-proc osutils:tk:hxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:fileExtensionsHeaders $thePlatform]] }
-
 # Generate Visual Studio project file for executable
 proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set aVcFiles {}
-  foreach f [osutils:tk:cxxfiles $theToolKit wnt] {
+  foreach f [osutils:tk:files $theToolKit wnt] {
    set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]

    set aProjName [file rootname [file tail $f]]
@@ -1954,16 +1927,15 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
    regsub -all -- {__TKDEP__} $aProjTmpl $aUsedLibs aProjTmpl

    set aFilesSection ""
-    set aVcFilesCxx(units) ""
-	set aVcFilesHxx(units) ""
+    set aVcFilesX(units) ""

    if { ![info exists written([file tail $f])] } {
      set written([file tail $f]) 1

      if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-        append aFilesSection [osutils:vcxproj:cxxfile $f ""]
-        if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit }
-        lappend aVcFilesCxx($theToolKit) $f
+        append aFilesSection [osutils:vcxproj:file $f ""]
+        if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit }
+        lappend aVcFilesX($theToolKit) $f
      } else {
        append aFilesSection "\t\t\t<Filter\n"
        append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
@@ -1975,8 +1947,10 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      puts "Warning : in vcproj there are than one occurences for [file tail $f]"
    }
    #puts "$aProjTmpl $aFilesSection"
+#    set aTKDefines ";__${theToolKit}_DLL"
    set anIncPaths "..\\..\\..\\inc"
    regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
+#    regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines    aProjTmpl
    regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
    regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl

@@ -1992,12 +1966,9 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {

    # write filters file for vc10
    if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
+      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX]
    }

-    # write resource file
-    lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
-
    set aCommonSettingsFileTmpl ""
    if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
      # nothing
@@ -2180,7 +2151,7 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
  if [array exists written] { unset written }
  foreach fxlo $resultloc {
    set xlo       $fxlo
-    set aSrcFiles [osutils:tk:cxxfiles $xlo $thePlatform]
+    set aSrcFiles [osutils:tk:files $xlo $thePlatform]
    foreach aSrcFile [lsort $aSrcFiles] {
      if { ![info exists written([file tail $aSrcFile])] } {
        set written([file tail $aSrcFile]) 1
@@ -2274,7 +2245,7 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
  set aWokArch    "$::env(ARCH)"

  set aCbpFiles {}
-  foreach aSrcFile [osutils:tk:cxxfiles $theToolKit $thePlatform] {
+  foreach aSrcFile [osutils:tk:files $theToolKit $thePlatform] {
    # collect list of referred libraries to link with
    set aUsedLibs     [list]
    set aFrameworks   [list]
@@ -2342,10 +2313,6 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  set aCmplFlagsDebug   [list]
  set toPassArgsByFile 0
  set aLibPrefix "lib"
-  set aPlatformAndCompiler "${thePlatform}/gcc"
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
-    set aPlatformAndCompiler "${thePlatform}/clang"
-  }
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" || "$thePlatform" == "qnx" } {
    set toPassArgsByFile 1
  }
@@ -2402,17 +2369,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  # Release target configuration
  puts $aFile "\t\t\t<Target title=\"Release\">"
  if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
    puts $aFile "\t\t\t\t<Option type=\"1\" />"
  } else {
    if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
    } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
    }
    puts $aFile "\t\t\t\t<Option type=\"3\" />"
  }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/obj\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/obj\" />"
  puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
  puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2435,7 +2402,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  if { $toPassArgsByFile == 1 } {
    puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkFileName\" />"
  }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/lib\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/lib\" />"
  if { "$thePlatform" == "mac" } {
    if { [ lsearch $theLibsList X11 ] >= 0} {
      puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2443,7 +2410,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  }
  puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch})\" />"
  if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/lib\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/lib\" />"
  }
  puts $aFile "\t\t\t\t</Linker>"

@@ -2452,17 +2419,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  # Debug target configuration
  puts $aFile "\t\t\t<Target title=\"Debug\">"
  if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
    puts $aFile "\t\t\t\t<Option type=\"1\" />"
  } else {
    if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
    } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
    }
    puts $aFile "\t\t\t\t<Option type=\"3\" />"
  }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/objd\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/objd\" />"
  puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
  puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2485,7 +2452,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  if { $toPassArgsByFile == 1 } {
    puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkDebFileName\" />"
  }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/libd\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/libd\" />"
  if { "$thePlatform" == "mac" } {
    if { [ lsearch $theLibsList X11 ] >= 0} {
      puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2493,7 +2460,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  }
  puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch}D)\" />"
  if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/libd\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/libd\" />"
  }
  puts $aFile "\t\t\t\t</Linker>"

@@ -2560,8 +2527,8 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
      puts $aFile "\t\t\t<Option link=\"0\" />"
      puts $aFile "\t\t</Unit>"

-      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/obj/src/"]  $aSrcFile]]
-      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/objd/src/"] $aSrcFile]]
+      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/obj/src/"]  $aSrcFile]]
+      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/objd/src/"] $aSrcFile]]
      puts -nonewline $aFileLnkObj  "$aFileObj "
      puts -nonewline $aFileLnkObjd "$aFileObjd "
    } else {
@@ -2706,7 +2673,7 @@ 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 thePlatform theIsStatic} {
+proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids theIsStatic} {
  upvar $theGuidsMap         aGuidsMap
  upvar $theFileRefSection   aFileRefSection
  upvar $theDepsGuids        aDepsGuids
@@ -2717,7 +2684,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
  set aDepToolkits      [lappend [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] $theToolKit]

  if { "$theTargetType" == "executable" } {
-    set aFile [osutils:tk:cxxfiles $theToolKit mac]
+    set aFile [osutils:tk:files $theToolKit mac]
    set aProjName [file rootname [file tail $aFile]]
    set aDepToolkits [LibToLinkX $theToolKit $aProjName]
  }
@@ -2730,7 +2697,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
    }
  }

-  osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks
+  osutils:usedOsLibs $theToolKit "mac" aLibs aFrameworks
  set aUsedLibs [concat $aUsedLibs $aLibs]
  set aUsedLibs [concat $aUsedLibs $aFrameworks]
  foreach tkx $aUsedLibs {
@@ -2783,7 +2750,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro
      set aGuidsMap($aPackage) [OS:genGUID "xcd"]
    }

-    set aSrcFiles [osutils:tk:cxxfiles $xlo mac]
+    set aSrcFiles [osutils:tk:files $xlo mac]
    foreach aSrcFile [lsort $aSrcFiles] {
      set aFileExt "sourcecode.cpp.cpp"

@@ -2945,7 +2912,7 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap theIsStatic thePlatform {t
  }

  puts $aPbxprojFile [osutils:xcdtk:sources $theToolKit $theTargetType aSrcFileRefSection aGroupSection aPackagesGuids aSrcFileGuids aGuidsMap anIncPaths]
-  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $thePlatform $theIsStatic]
+  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $theIsStatic]
  # End PBXBuildFile section

  # Begin PBXFileReference section
--- a/adm/qmake/.gitignore
+++ b/adm/qmake/.gitignore
@@ -1,5 +0,0 @@
-/*/*.pro
-/*/*/*.pro
-*.pro.user
-custom.pri
-custom.auto.pri
--- a/adm/qmake/OccCppConfig.pri
+++ b/adm/qmake/OccCppConfig.pri
@@ -1,157 +0,0 @@
-# This is project defines C++ compilation rules for building an OCCT Toolkit.
-
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Disable some dummy Qt defaults
-QT -= core gui
-CONFIG -= qt app_bundle
-CONFIG -= qml_debug
-CONFIG -= debug_and_release
-
-OccGitRoot = $$_PRO_FILE_PWD_/../../../..
-
-# Define compilation flags
-CONFIG += warn_on
-QMAKE_CFLAGS_WARN_ON   = -Wall
-QMAKE_CXXFLAGS_WARN_ON = -Wall
-win32 {
-  QMAKE_CFLAGS_WARN_ON   = -W4
-  QMAKE_CXXFLAGS_WARN_ON = -W4
-  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
-  QMAKE_CXXFLAGS_STL_ON = /EHa
-
-  QMAKE_CXXFLAGS += -fp:precise
-  #QMAKE_CXXFLAGS -= -Zc:throwingNew
-  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
-
-  QMAKE_LFLAGS += -INCREMENTAL:NO
-
-  CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS += -Od
-    QMAKE_CXXFLAGS += -Ob1
-  }
-
-  DEFINES -= WIN32
-  DEFINES -= WIN64
-  DEFINES += _CRT_SECURE_NO_WARNINGS
-  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
-  DEFINES += _SCL_SECURE_NO_WARNINGS
-} else {
-  CONFIG += c++11
-  QMAKE_CFLAGS   += -fexceptions
-  QMAKE_CXXFLAGS += -fexceptions
-  QMAKE_CXXFLAGS += -fvisibility=default
-  DEFINES += OCC_CONVERT_SIGNALS
-  mac {
-    iphoneos {
-      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-    } else {
-      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-    }
-  }
-}
-!CONFIG(debug, debug|release) {
-  # disable exceptions in Release builds
-  DEFINES += No_Exception
-  HAVE_RelWithDebInfo {
-    win32 {
-      CONFIG += force_debug_info
-    }
-  }
-}
-
-# Define output folder depending on compiler name
-MY_BITNESS = 32
-
-equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
-equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
-has64Target = $$find(QMAKE_TARGET.arch, "x64")
-count(has64Target, 1) { MY_BITNESS = 64 }
-
-MY_PLATFORM = platform
-CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
-} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
-} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
-} else:win32   { MY_PLATFORM = win$$MY_BITNESS
-} else:mac     { MY_PLATFORM = mac
-} else:linux   { MY_PLATFORM = lin
-} else:unix    { MY_PLATFORM = unix
-} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
-
-MY_COMPILER = compiler
-MY_VC_VER = 0
-android-g++ {
-  MY_COMPILER = gcc
-} else:clang {
-  MY_COMPILER = clang
-} else:gcc {
-  MY_COMPILER = gcc
-} else:win32-msvc2010 {
-  MY_COMPILER = vc10
-  MY_VC_VER = 10
-} else:win32-msvc2012 {
-  MY_COMPILER = vc11
-  MY_VC_VER = 11
-} else:win32-msvc2013 {
-  MY_COMPILER = vc12
-  MY_VC_VER = 12
-} else:win32-msvc2015 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc2017 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-  aMsvcVer = $$(VisualStudioVersion)
-  equals(aMsvcVer, 14.0){
-    # VS2015, vc140
-  } else:equals(aMsvcVer, 15.0){
-    # VS2015, vc141
-  } else:equals(aMsvcVer, 16.0){
-    # VS2019, vc142
-  } else {
-    warning (Unknown msvc version. "$$MY_COMPILER" is used)
-  }
-} else {
-  warning (Unknown compiler. "$$MY_COMPILER" is used)
-}
-MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
-#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
-
-CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
-
-DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
-win32 {
-  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
-  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
-  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
-
-  # dummy target creating lib/libd folder
-  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
-  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
-  occtkgen_libfolder.config = verbatim
-  QMAKE_SUBSTITUTES += occtkgen_libfolder
-
-  LIBS += -L$$aLibDest
-  equals(TEMPLATE, lib) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
-  } else {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
-  }
-  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
-  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
-  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
-} else {
-  LIBS += -L$$DESTDIR
-  equals(TEMPLATE, app) {
-    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
-  }
-}
-
-#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
-OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}
--- a/adm/qmake/OccModule.pri
+++ b/adm/qmake/OccModule.pri
@@ -1,36 +0,0 @@
-# This is a project template file defining an OCCT Module.
-# This project should be included with predefined OCC_MODULE_NAME variable.
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Iterate over Toolkits within current Module and generate sub-project per Toolkit
-aModuleList = $$cat(../MODULES, lines)
-for (aModuleIter, aModuleList) {
-  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
-  aModule = $$first($$list($$aModuleIter))
-  equals (aModule, $$OCC_MODULE_NAME) {
-    for (aToolKit, $$list($$aModuleIter)) {
-      toSkipToolkit = 0
-      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
-      equals (toSkipToolkit, 0) {
-        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
-        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
-        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
-        eval(occtkgen_$${aToolKit}.config = verbatim)
-        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
-        SUBDIRS += $${aToolKit}
-
-        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
-        aTkDepends = $${aToolKit}.depends
-        for (aModExtIter, aModExtList) {
-          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
-        }
-        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
-      }
-    }
-  }
-}
--- a/adm/qmake/OccModule.pro.in
+++ b/adm/qmake/OccModule.pro.in
@@ -1,2 +0,0 @@
-OCC_MODULE_NAME = \$\$TARGET
-include(../OccModule.pri)
--- a/adm/qmake/OccToolkit.pri
+++ b/adm/qmake/OccToolkit.pri
@@ -1,144 +0,0 @@
-# This is a project template file defining an OCCT Toolkit.
-# This project should be included with predefined OCC_TOOLKIT_NAME variable.
-
-TEMPLATE = lib
-!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
-  TEMPLATE = app
-  CONFIG += console
-}
-win32 {
-  # do not append version to DLL name
-  CONFIG += skip_target_version_ext
-}
-
-include(OccCppConfig.pri)
-
-aSrcRoot = $$OccGitRoot/src
-aHxxRoot = $$OccGitRoot/inc
-INCLUDEPATH += $$aHxxRoot
-
-# CSF variables
-CSF_FREETYPE  = -lfreetype
-CSF_TclLibs   = -ltcl8.6
-CSF_TclTkLibs = -ltk8.6
-HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
-HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
-HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
-HAVE_ZLIB      { CSF_ZLIB = -lzlib }
-HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
-win32 {
-  CSF_kernel32   = -lkernel32
-  CSF_advapi32   = -ladvapi32
-  CSF_gdi32      = -lgdi32
-  CSF_user32     = -luser32 -lcomdlg32
-  CSF_shell32    = -lShell32
-  CSF_opengl32   = -lopengl32
-  CSF_wsock32    = -lwsock32
-  CSF_netapi32   = -lnetapi32
-  CSF_OpenGlLibs = -lopengl32
-  HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
-  CSF_psapi      = -lPsapi
-  CSF_winmm      = -lwinmm
-  CSF_d3d9       = -ld3d9
-  CSF_TclLibs    = -ltcl86
-  CSF_TclTkLibs  = -ltk86
-  CSF_TBB =
-} else:mac {
-  CSF_dl         = -ldl
-  CSF_objc       = -lobjc
-  iphoneos {
-    CSF_Appkit     = -framework UIKit
-    CSF_OpenGlLibs = -framework OpenGLES
-  } else {
-    CSF_Appkit     = -framework AppKit
-    CSF_OpenGlLibs = -framework OpenGL
-  }
-  CSF_IOKit      = -framework IOKit
-  CSF_TclLibs    = -framework Tcl
-  CSF_TclTkLibs  = -framework Tk
-} else {
-  CSF_dl = -ldl
-  CSF_ThreadLibs = -lpthread -lrt
-  CSF_OpenGlLibs = -lGL
-  CSF_TclTkLibs  = -lX11 -ltk8.6
-  CSF_XwLibs     = -lX11 -lXext -lXmu -lXi
-  CSF_MotifLibs  = -lX11
-  CSF_fontconfig = -lfontconfig
-  HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
-}
-
-for (aCfgIter, CONFIG) {
-  aRes = $$find(aCfgIter, "^HAVE_")
-  count(aRes, 1) {
-    DEFINES += $$aCfgIter
-  }
-}
-
-# Define the list of standard OCCT file extensions
-aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
-aPxxRegex = ^.*\.(pxx)$
-aCxxRegex = ^.*\.(cxx|c)$
-mac { aCxxRegex = ^.*\.(cxx|c|m|mm)$ }
-
-# Auxiliary function for probing file extension
-defineTest (occCheckExtension) {
-  aProbe = $$find(1, "$$2")
-  count(aProbe, 1) { return(true) } else { return(false) }
-}
-
-# Auxiliary function for probing compilable files
-defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
-
-# Auxiliary function for probing header files
-defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
-
-aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
-aTkFiles += CMakeLists.txt
-aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
-anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
-
-for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
-for (anExternLib, anExternLibs) {
-  hasCsf = $$find(anExternLib, CSF_)
-  count(hasCsf, 1) {
-    aList = $$split($$anExternLib, "\n")
-    LIBS += $$aList
-  } else {
-    LIBS += -l$$anExternLib
-  }
-}
-
-# Iterate over Packages and add compilable files into this project
-isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
-for (aPackage, aPackages) {
-  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
-  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
-  for (aFileIter, aPackageFiles) {
-    occIsCxxFile($$aFileIter) {
-      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
-    }
-  }
-}
-
-# extend clean with versioned .so files
-!win32 {
-  aVerList = $$split(VERSION, ".")
-  aVerMaj = $$member(aVerList, 0)
-  aVerMin = $$member(aVerList, 1)
-  aVerMic = $$member(aVerList, 2)
-  equals(TEMPLATE, app) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
-  } else {
-    mac {
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
-    } else {
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
-    }
-  }
-}
--- a/adm/qmake/OccToolkit.pro.in
+++ b/adm/qmake/OccToolkit.pro.in
@@ -1,2 +0,0 @@
-OCC_TOOLKIT_NAME = \$\$TARGET
-include(../../OccToolkit.pri)
--- a/adm/qmake/Occt.pro
+++ b/adm/qmake/Occt.pro
@@ -1,41 +0,0 @@
-# This is an experimental Solution project for building entire OCCT framework using qmake.
-# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
-# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
-# Building OCCT using CMake is a preferred solution.
-#
-# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
-# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
-# - Launch genproj to fill in "inc" folder with links to header files.
-# - Open project in Qt Creator, and call "Run qmake".
-# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
-# - "Run qmake" and perform Build.
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-OTHER_FILES += OccModule.pro.in \
-               OcctHeaderLink.hxx.in \
-               OccToolkit.pro.in \
-               OccCppConfig.pri \
-               OccModule.pri \
-               OccToolkit.pri \
-               custom.pri.template
-
-# Iterate over Modules and generate sub-projects
-aSolModuleList = $$cat(../MODULES, lines)
-for (aSolModuleIter, aSolModuleList) {
-  aSolModule = $$first($$list($$aSolModuleIter))
-  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
-  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
-  eval(occtkgen_$${aSolModule}.config = verbatim)
-  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
-  SUBDIRS += $${aSolModule}
-}
-
-# These dependencies are manually defined
-ModelingData.depends = FoundationClasses
-ModelingAlgorithms.depends = FoundationClasses ModelingData
-Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
-ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
-DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
-Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization
--- a/adm/qmake/OcctDummy.in
+++ b/adm/qmake/OcctDummy.in
--- a/adm/qmake/OcctHeaderLink.hxx.in
+++ b/adm/qmake/OcctHeaderLink.hxx.in
@@ -1 +0,0 @@
-#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"
--- a/adm/qmake/custom.pri.template
+++ b/adm/qmake/custom.pri.template
@@ -1,17 +0,0 @@
-PRODUCTS_PATH = c:/3rdparty/vc14
-
-#CONFIG += HAVE_FREEIMAGE
-#CONFIG += HAVE_FFMPEG
-#CONFIG += HAVE_TBB
-#CONFIG += HAVE_GLES2
-#CONFIG += HAVE_D3D
-#CONFIG += HAVE_VTK
-
-aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
-aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
-
-INCLUDEPATH += $$aFreeType/include
-LIBS        += -L$$aFreeType/lib
-
-INCLUDEPATH += $$aTclTk/include
-LIBS        += -L$$aTclTk/lib
--- a/adm/templates/OpenCASCADEConfig.cmake.in
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
@@ -58,6 +58,7 @@ set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
 set (OpenCASCADE_WITH_TCL       @USE_TCL@)
 set (OpenCASCADE_WITH_FREETYPE  @USE_FREETYPE@)
 set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
+set (OpenCASCADE_WITH_GL2PS     @USE_GL2PS@)
 set (OpenCASCADE_WITH_TBB       @USE_TBB@)
 set (OpenCASCADE_WITH_VTK       @USE_VTK@)
 set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
--- a/adm/templates/codeblocks.sh
+++ b/adm/templates/codeblocks.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
-# This file has been generated by genproj.tcl script from CASROOT/adm/templates/codeblocks.sh

 export TARGET="cbp"

 source ./env.sh "$1" "$TARGET"

 if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
-  /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
+  /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace
 else
-  codeblocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
+  codeblocks ./adm/$WOKSTATION/cbp/OCCT.workspace
 fi
--- a/adm/templates/custom.build.bat.in
+++ b/adm/templates/custom.build.bat.in
@@ -11,6 +11,7 @@ if /I "%VCVER%" == "@COMPILER@" (
    set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
    set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
    set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
+    set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIRS@"
    set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
    set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
    set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
--- a/adm/templates/custom.build.sh.in
+++ b/adm/templates/custom.build.sh.in
@@ -9,6 +9,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
    export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
    export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
    export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
+    export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIRS@"
    export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
    export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
    export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
--- a/adm/templates/custom.install.bat.in
+++ b/adm/templates/custom.install.bat.in
@@ -13,6 +13,7 @@ if /I "%VCVER%" == "@COMPILER@" (
    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
    set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
    set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
+    set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIRS@"
    set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
    set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
    set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
--- a/adm/templates/custom.install.sh.in
+++ b/adm/templates/custom.install.sh.in
@@ -9,6 +9,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
    export TK_DIR="@USED_3RDPARTY_TK_DIR@"
    export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
    export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
+    export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIRS@"
    export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
    export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
    export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -19,19 +19,17 @@ set "HAVE_TBB=false"
 set "HAVE_OPENCL=false"
 set "HAVE_FREEIMAGE=false"
 set "HAVE_FFMPEG=false"
+set "HAVE_GL2PS=false"
 set "HAVE_VTK=false"
 set "HAVE_GLES2=false"
 set "HAVE_D3D=false"
 set "HAVE_ZLIB=false"
 set "HAVE_LIBLZMA=false"
-set "HAVE_RAPIDJSON=false"
-set "HAVE_E57=false"
 set "CSF_OPT_INC="
 set "CSF_OPT_LIB32="
 set "CSF_OPT_LIB64="
 set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
-set "CSF_DEFINES=%CSF_DEFINES_EXTRA%"

 if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
 if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
@@ -102,10 +100,6 @@ if not "%DevEnvDir%" == "" (
  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
    set "DevEnvDir=%%i\Common7\IDE\"
  )
-) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
-  )
 ) else if /I "%VCFMT%" == "gcc" (
  rem MinGW
 ) else (
@@ -117,7 +111,6 @@ if not "%DevEnvDir%" == "" (
  echo vc12  = VS 2013 ^(SP3^)
  echo vc14  = VS 2015
  echo vc141 = VS 2017
-  echo vc142 = VS 2019
  exit /B
 )

@@ -142,11 +135,6 @@ if /I "%VCFMT%" == "vc9" (
    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
  )
  set "VCPlatformToolSet=v141"
-) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  ) 
-  set "VCPlatformToolSet=v142"
 ) else if /I "%VCFMT%" == "gcc" (
  rem MinGW
 ) else (
@@ -168,6 +156,7 @@ set "CSF_OPT_CMPL="
 set "PRODUCTS_DEFINES="
 if ["%HAVE_TBB%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB"       & set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%"
 if ["%HAVE_OPENCL%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL"    & set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%"
+if ["%HAVE_GL2PS%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GL2PS"     & set "CSF_DEFINES=HAVE_GL2PS;%CSF_DEFINES%"
 if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
 if ["%HAVE_FFMPEG%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG"    & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%"
 if ["%HAVE_VTK%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK"       & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
@@ -175,8 +164,6 @@ if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_D3D%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D"       & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
 if ["%HAVE_ZLIB%"]      == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB"      & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
 if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA"   & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
-if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"
-if ["%HAVE_E57%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_E57"       & set "CSF_DEFINES=HAVE_E57;%CSF_DEFINES%"

 rem Eliminate VS warning
 if ["%CSF_DEFINES%"]  == [""] set "CSF_DEFINES=;"
--- a/adm/templates/env.bat.in
+++ b/adm/templates/env.bat.in
@@ -70,10 +70,6 @@ if not "%DevEnvDir%" == "" (
  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
    set "DevEnvDir=%%i\Common7\IDE\"
  )
-) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
-  )  
 ) else if /I "%VCFMT%" == "gcc" (
  rem MinGW
 ) else (
@@ -102,11 +98,6 @@ if /I "%VCFMT%" == "vc9" (
    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
  )
  set "VCPlatformToolSet=v141"
-) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  ) 
-  set "VCPlatformToolSet=v142"
 ) else if /I "%VCFMT%" == "gcc" (
  rem MinGW
 ) else (
@@ -135,6 +126,7 @@ if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
 if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
 if not ["%EGL_DIR%"] == [""]           set "PATH=%EGL_DIR%;%PATH%"
 if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
+if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
 if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
--- a/adm/templates/env.build.sh.in
+++ b/adm/templates/env.build.sh.in
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
-# ----- For compatability with external application using CASROOT -----
-if [ "${CASROOT}" == "" ]; then
-  export CASROOT="${aScriptPath}"
-fi
-
-# ----- Define path to 3rdparty products -----
-export THIRDPARTY_DIR="@3RDPARTY_DIR@"
-
-# ----- Read script arguments -----
-shopt -s nocasematch
-export CASDEB="";
-if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
-if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
-shopt -u nocasematch
-
-# ----- Set path to 3rd party and OCCT libraries -----
-anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
-  export ARCH="32";
-else
-  export ARCH="64";
-fi
-
-aSystem=`uname -s`
-if [ "$aSystem" == "Darwin" ]; then
-  export WOKSTATION="mac";
-  export ARCH="64";
-else
-  export WOKSTATION="lin";
-fi
-
-# ----- Set local settings -----
-if [ -e "${CASROOT}/custom.sh" ]; then
-  source "${CASROOT}/custom.sh" "${CASDEB}" "${ARCH}"
-fi
-
-THRDPARTY_PATH=""
-if [ "$TCL_DIR" != "" ]; then
-  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$TK_DIR" != "" ]; then
-  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$FREETYPE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$FREEIMAGE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$TBB_DIR" != "" ]; then
-  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$VTK_DIR" != "" ]; then
-  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$FFMPEG_DIR" != "" ]; then
-  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$QTDIR" != "" ]; then
-  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
-fi
-
-if [ "$TK_DIR" != "$TCL_DIR" ]; then
-  if [ "$TK_DIR" != "" ]; then
-    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
-  fi
-  if [ "$TCL_DIR" != "" ]; then
-    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
-  fi
-fi
-
-if [ "$LD_LIBRARY_PATH" != "" ]; then
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
-else
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
-fi
-
-if [ "$CSF_OCCTBinPath" != "" ]; then
-  export PATH="${CSF_OCCTBinPath}:${PATH}"
-fi
-
-if [ "$CSF_OCCTLibPath" != "" ]; then
-  if [ "$LD_LIBRARY_PATH" != "" ]; then
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
-  else
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
-  fi
-fi
-
-if [ "$WOKSTATION" == "mac" ]; then
-  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
-  else
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-  fi
-fi
-
-# ----- Set envoronment variables used by OCCT -----
-export CSF_LANGUAGE=us
-export MMGT_CLEAR=1
-export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
-export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
-export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
-export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
-export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
-export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
-
-# ----- Draw Harness special stuff -----
-if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
-  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
-  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
-
-  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
-  fi
-fi
--- a/adm/templates/env.sh
+++ b/adm/templates/env.sh
@@ -6,17 +6,16 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath
 # Reset values
 export CASROOT="__CASROOT__"
 export CASDEB=""
-export PRJFMT="";
+export TARGET="";
 export HAVE_TBB="false";
 export HAVE_OPENCL="false";
 export HAVE_FREEIMAGE="false";
 export HAVE_FFMPEG="false";
+export HAVE_GL2PS="false";
 export HAVE_VTK="false";
 export HAVE_GLES2="false";
 export HAVE_ZLIB="false";
 export HAVE_LIBLZMA="false";
-export HAVE_RAPIDJSON="false";
-export HAVE_E57="false";
 export MACOSX_USE_GLX="false";
 export CSF_OPT_INC=""
 export CSF_OPT_LIB32=""
@@ -42,9 +41,9 @@ do
  elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
    export CASDEB="i"
  elif [ "$i" == "cbp" ]; then
-    export PRJFMT="cbp";
+    export TARGET="cbp";
  elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
-    export PRJFMT="xcd";
+    export TARGET="xcd";
  fi
 done
 shopt -u nocasematch
@@ -66,32 +65,28 @@ else
 fi

 export CASBIN=""
-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "cbp" ]; then
+  export CASBIN="${WOKSTATION}/cbp"
+elif [ "${TARGET}" == "xcd" ]; then
  export CASBIN="adm/mac/xcd/build"
-else
-  if [ "$aSystem" == "Darwin" ]; then
-    export CASBIN="${WOKSTATION}/clang"
-  else
-    export CASBIN="${WOKSTATION}/gcc"
-  fi
 fi

 export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"

-if [ "${PRJFMT}" == "xcd" ]; then
-  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
-  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
-  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
-  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
-else
+if [ "${TARGET}" == "cbp" ]; then
  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
+elif [ "${TARGET}" == "xcd" ]; then
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
+  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
 fi

 export CSF_OPT_CMPL=""
@@ -101,12 +96,11 @@ if [ "$HAVE_TBB"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
 if [ "$HAVE_OPENCL"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
 if [ "$HAVE_FREEIMAGE" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"; fi
 if [ "$HAVE_FFMPEG"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FFMPEG"; fi
+if [ "$HAVE_GL2PS"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GL2PS"; fi
 if [ "$HAVE_GLES2"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2"; fi
 if [ "$HAVE_VTK"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
 if [ "$HAVE_ZLIB"      == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
 if [ "$HAVE_LIBLZMA"   == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_LIBLZMA"; fi
-if [ "$HAVE_RAPIDJSON" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_RAPIDJSON"; fi
-if [ "$HAVE_E57"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_E57"; fi
 # Option to compile OCCT with X11 libs on Mac OS X
 if [ "$MACOSX_USE_GLX" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DMACOSX_USE_GLX"; fi

@@ -182,7 +176,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
 export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
 export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"

-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "xcd" ]; then
  if [ "${CASDEB}" == "d" ]; then
    export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
  else
--- a/adm/templates/env.install.sh.in
+++ b/adm/templates/env.install.sh.in
@@ -57,6 +57,10 @@ if [ "$FREEIMAGE_DIR" != "" ]; then
  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
 fi

+if [ "$GL2PS_DIR" != "" ]; then
+  THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
+fi
+
 if [ "$TBB_DIR" != "" ]; then
  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
 fi
--- a/adm/templates/msvc.bat
+++ b/adm/templates/msvc.bat
@@ -1,11 +1,10 @@
@echo off
-rem This file has been generated by genproj.tcl script from CASROOT/adm/templates/msvc.bat

 rem Setup environment
 call "%~dp0env.bat" %1 %2 %3

 rem Define path to project file
-set "PRJFILE=%~dp0\adm\msvc\%VCVER%\__SOLUTION__.sln"
+set "PRJFILE=%~dp0\adm\msvc\%VCVER%\OCCT.sln"
 if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\msvc\%VCVER%\Products.sln"
 if not "%4" == "" (
  set "PRJFILE=%4"
--- a/adm/templates/template.vc10
+++ b/adm/templates/template.vc10
@@ -110,7 +110,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -159,7 +159,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -206,7 +206,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -255,7 +255,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/adm/templates/template.vc10x
+++ b/adm/templates/template.vc10x
@@ -103,7 +103,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -149,7 +149,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -193,7 +193,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -238,7 +238,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -248,11 +248,7 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-__FILES__
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="__XQTNAM__.rc" />
-  </ItemGroup>
+__FILES__  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/adm/templates/xcode.sh
+++ b/adm/templates/xcode.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
-# This file has been generated by genproj.tcl script from CASROOT/adm/templates/xcode.sh

 export TARGET="xcd"

 source ./env.sh "$1" "$TARGET"

-open -a Xcode ./adm/mac/xcd/__SOLUTION__.xcworkspace
+open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace
--- a/adm/upgrade.dat
+++ b/adm/upgrade.dat
@@ -70,7 +70,6 @@ BOPTools::MapShapes TopExp::MapShapes
 BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
 BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
 BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
-CDM_MessageDriver Message_Messenger

 [tcollection]
 AdvApp2Var_SequenceOfNode
--- a/dox/CMakeLists.txt
+++ b/dox/CMakeLists.txt
@@ -89,14 +89,6 @@ file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH        = NO")
 # Formula options
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH        = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")

-# If MSVC is used as build system, change warning format to the one recognized by MSVC
-if (MSVC)
-  file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nWARN_FORMAT            = \"$file($line): $text\"")
-endif()
-
-# Avoid Doxygen parsing messages in the build log
-file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nQUIET                  = YES")
-
 # Copy index file to provide fast access to HTML documentation
 file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")

--- a/dox/FILES_HTML.txt
+++ b/dox/FILES_HTML.txt
@@ -14,7 +14,6 @@ overview/overview.md
 ../samples/qt/AndroidQt/ReadMe.md
 ../samples/java/jniviewer/ReadMe.md
 ../samples/ios/UIKitSample/ReadMe.md
-../samples/webgl/ReadMe.md

 tutorial/tutorial.md

--- a/dox/dev_guides/building/3rdparty/3rdparty_linux.md
+++ b/dox/dev_guides/building/3rdparty/3rdparty_linux.md
@@ -10,7 +10,7 @@ products used by Open CASCADE Technology and samples on Linux platform.

 The links for downloading the third-party products are available on the web site 
 of OPEN CASCADE SAS at 
-https://www.opencascade.com/content/3rd-party-components.
+http://www.opencascade.com/content/3rd-party-components. 

 There are two types of third-party products, which are  necessary to build OCCT: 
  
@@ -19,6 +19,7 @@ There are two types of third-party products, which are  necessary to build OCCT:
 	* 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;
 	* VTK 6.1.0.

@@ -30,7 +31,7 @@ Tcl/Tk is required for DRAW test harness.

@subsubsection dev_guides__building_3rdparty_linux_2_1_2 Installation from sources: Tcl
  
-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
  
 1. Enter the unix sub-directory of the directory where the Tcl source  files are located <i>(TCL_SRC_DIR)</i>. 

@@ -53,7 +54,7 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h

@subsubsection dev_guides__building_3rdparty_linux_2_1_3 Installation from sources: Tk
  
-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
  
 1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i> 

@@ -78,7 +79,7 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
@subsection dev_guides__building_3rdparty_linux_2_2 FreeType

 FreeType is required for text display in the 3D viewer. 
-Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+Download the necessary archive from http://sourceforge.net/projects/freetype/files/ and unpack it. 
  
 1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 

@@ -103,13 +104,39 @@ Download the necessary archive from https://sourceforge.net/projects/freetype/fi
    
@subsection dev_guides__building_3rdparty_linux_3_1 TBB

-This third-party product is  installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+This third-party product is  installed with binaries from the archive that can be downloaded from http://threadingbuildingblocks.org. 
 Go to the **Download** page, find the  release version you need and pick the archive for Linux platform.
 To install, unpack the downloaded archive of TBB product.

+@subsection dev_guides__building_3rdparty_linux_3_2 gl2ps
+
+Download the necessary archive from http://geuz.org/gl2ps/ and unpack it.
+  
+1. Install or build *cmake* product from the source file. 
+2. Start *cmake* in GUI mode with the directory where the source files of gl2ps are located:
+
+       ccmake GL2PS_SRC_DIR   
+
+   * Press <i>[c]</i> to make the  initial configuration; 
+   * Define the necessary options in *CMAKE_INSTALL_PREFIX* 
+   * Press <i>[c]</i> to make the final  configuration 
+   * Press <i>[g]</i> to generate  Makefile and exit 
+
+   or just run the following command: 
+
+       cmake  –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release   
+
+3. Start the building of gl2ps: 
+
+       make   
+
+4. Start the installation of gl2ps. Binaries will be  installed according to the *CMAKE_INSTALL_PREFIX* option. 
+
+       make install   
+
@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage

-Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+Download the necessary archive from http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
 and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*. 
  
 1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*: 
@@ -174,11 +201,11 @@ and unpack it. The directory with unpacked sources is  further referred to as *F

@subsection dev_guides__building_3rdparty_linux_3_4 VTK

-You can download VTK sources from https://www.vtk.org/VTK/resources/software.html
+You can download VTK sources from http://www.vtk.org/VTK/resources/software.html

 ### The building procedure:

-Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it.
+Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it.

 1. Install or build *cmake* product from the source file.
 2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
@@ -194,7 +221,7 @@ Download the necessary archive from https://www.vtk.org/VTK/resources/software.h

       make

-4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
+4. Start the installation of gl2ps. Binaries will be  installed according to the *VTK_INSTALL_PREFIX* option.

       make install

@@ -205,7 +232,7 @@ Download the necessary archive from https://www.vtk.org/VTK/resources/software.h
 All 3rd-party products required for building of  OCCT could be installed
 from official repositories. You may install them from  console using apt-get utility:

-    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev
+    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev libgl2ps-dev

 To launch binaries built with WOK you need to install C shell and 32-bit libraries on x86_64 distributives:

--- a/dox/dev_guides/building/3rdparty/3rdparty_osx.md
+++ b/dox/dev_guides/building/3rdparty/3rdparty_osx.md
@@ -8,7 +8,7 @@ This document presents additional guidelines for building third-party products
 used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4  and later). 

 The links for downloading the third-party products are available 
-on the web site of OPEN CASCADE SAS at https://www.opencascade.com/content/3rd-party-components.
+on the web site of OPEN CASCADE SAS at http://www.opencascade.com/content/3rd-party-components. 

 There are two types of third-party products, which are  necessary to build OCCT: 
  
@@ -17,6 +17,7 @@ There are two types of third-party products, which are  necessary to build OCCT:
 	* 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
  
@section dev_guides__building_3rdparty_osx_2 Building Mandatory Third-party Products
@@ -27,7 +28,7 @@ Tcl/Tk is required for DRAW test harness. Version 8.5 or  8.6 can be used with O

@subsubsection dev_guides__building_3rdparty_osx_2_1_2 Installation from sources: Tcl 8.5

-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 

 1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>. 

@@ -50,7 +51,7 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h

@subsubsection dev_guides__building_3rdparty_osx_2_1_3 Installation from sources: Tk 8.5

-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 

 1. Enter the *macosx* sub-directory of the directory where the  source files of Tk are located <i>(TK_SRC_DIR)</i>. 

@@ -74,7 +75,7 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
  
 FreeType is required for text display in the 3D viewer. 

-Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+Download the necessary archive from http://sourceforge.net/projects/freetype/files/ and unpack it. 

 1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 

@@ -100,20 +101,47 @@ Download the necessary archive from https://sourceforge.net/projects/freetype/fi
@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x

 This third-party product is installed with binaries from the archive 
-that can be downloaded from https://github.com/intel/tbb.
+that can be downloaded from http://threadingbuildingblocks.org/. 
 Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) 
 and  pick the archive for Mac OS X platform. 
 To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).

+@subsection dev_guides__building_3rdparty_osx_3_2 gl2ps 1.3.5
+
+Download the necessary archive from http://geuz.org/gl2ps/ and unpack it. 
+
+1. Install or build cmake product from the source file. 
+
+2. Start cmake in GUI mode with the directory, where the source  files of *fl2ps* are located: 
+
+       ccmake GL2PS_SRC_DIR   
+
+   * Press <i>[c]</i> to make the  initial configuration; 
+   * Define the necessary options in *CMAKE_INSTALL_PREFIX*; 
+   * Press <i>[c]</i> to make the final  configuration; 
+   * Press <i>[g]</i> to generate  Makefile and exit. 
+
+   or just run the following command: 
+
+       cmake  –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release   
+
+3. Start the building of gl2ps 
+
+       make   
+
+4. Start the installation of gl2ps. Binaries will be  installed according to the *CMAKE_INSTALL_PREFIX* option 
+
+       make install   
+
@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x

 Download the necessary archive from 
-https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+http://sourceforge.net/projects/freeimage/files/Source%20Distribution/   
 and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*.  

 Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx* 
 in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker 
-(https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
+(http://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug). 

 1. If you build FreeImage 3.15.x you can skip this  step. 
   Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i> 
--- a/dox/dev_guides/building/3rdparty/3rdparty_windows.md
+++ b/dox/dev_guides/building/3rdparty/3rdparty_windows.md
@@ -8,7 +8,7 @@ This document presents guidelines for building third-party products used by Open

 You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries. 

-The links for downloading the third-party products are available on the web site of OPEN CASCADE SAS at https://www.opencascade.com/content/3rd-party-components.
+The links for downloading the third-party products are available on the web site of OPEN CASCADE SAS at http://www.opencascade.com/content/3rd-party-components.

 There are two types of third-party products used  by OCCT: 

@@ -17,6 +17,7 @@ There are two types of third-party products used  by OCCT:
 	* 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;
 	* VTK 6.1.0.

@@ -32,7 +33,7 @@ Tcl/Tk is required for DRAW test harness.

@subsubsection dev_guides__building_3rdparty_win_2_1_1 Installation from sources: Tcl
  
-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
  
 1. In the *win* sub-directory, edit file *buildall.vc.bat*:

@@ -85,7 +86,7 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h

@subsubsection dev_guides__building_3rdparty_win_2_1_2 Installation from sources: Tk
  
-Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 

 Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
 Note that Tk produces its own executable, called *wish*. 
@@ -94,7 +95,7 @@ You might need to edit default value of *TCLDIR* variable defined in *buildall.v

@subsection dev_guides__building_3rdparty_win_2_2 FreeType

-FreeType is required for text display in a 3D viewer. You can download its sources from https://sourceforge.net/projects/freetype/files/
+FreeType is required for text display in a 3D viewer. You can download its sources from http://sourceforge.net/projects/freetype/files/   

 ### The building procedure

@@ -148,18 +149,97 @@ FreeType is required for text display in a 3D viewer. You can download its sourc
@subsection dev_guides__building_3rdparty_win_3_1 TBB

 This third-party product is installed with binaries 
-from the archive that can be downloaded from https://github.com/intel/tbb.
+from the archive that can be downloaded from http://threadingbuildingblocks.org/. 
 Go to the **Download** page, find the  release version you need  (e.g. *tbb30_018oss*) and pick the archive for Windows  platform. 

 Unpack the downloaded  archive of TBB product into the *3rdparty* folder. 

 Further in this document,  this folder is referred to as *tbb*. 

+@subsection dev_guides__building_3rdparty_win_3_2  gl2ps
+
+This third-party product should be built as a dynamically loadable library (dll file). 
+You can download its sources from  http://geuz.org/gl2ps/src/. 
+
+### The building procedure
+
+1. Unpack the downloaded  archive of gl2ps product (e.g. *gl2ps-1.3.5.tgz*) into the *3rdparty*  folder. 
+
+   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** -- *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>
+
+   Further in this document,  this folder is referred to as *gl2ps*. 
+
+2. Download (from http://www.cmake.org/cmake/resources/software.html) 
+   and install the *CMake* build system.  
+
+3. Edit the file *gl2ps\\CMakeLists.txt*. 
+
+   After line 113 in *CMakeLists.txt*: 
+
+       set_target_properties(shared PROPERTIES  COMPILE_FLAGS \"-DGL2PSDLL -DGL2PSDLL_EXPORTS\")
+    
+   add the following line:   
+    
+       add_definitions(-D_USE_MATH_DEFINES)  
+
+   Attention: If Cygwin was installed on  your computer, make sure that there is no path to it in the *PATH* variable to avoid possible conflicts during the configuration. 
+
+4. Launch CMake <i>(cmake-gui.exe)</i> using  the Program menu. 
+
+   In CMake: 
+  
+   * Define where the source code is. 
+     This path must point to *gl2ps*  folder. 
+
+   * Define where to build the  binaries. 
+     This path must point to the folder where generated gl2ps project binaries will be placed 
+     (for example, *gl2ps\\bin*). 
+     Further in this document, this folder is referred to as *gl2ps_bin*.
+
+   * Press  **Configure** button. 
+   
+     @figure{/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. 
+   
+     @figure{/dev_guides/building/3rdparty/images/3rdparty_image005.png}
+
+   * Press **Finish** button to  return to the main CMake window. 
+     Expand the ENABLE group and uncheck  ENABLE_PNG and ENABLE_ZLIB check boxes. 
+	 
+     @figure{/dev_guides/building/3rdparty/images/3rdparty_image006.png}
+
+   * Expand the CMAKE group and define *CMAKE_INSTALL_PREFIX* which is the path where you want to install the build results, for example, *c:\\occ3rdparty\\gl2ps-1.3.5*. 
+   
+     @figure{/dev_guides/building/3rdparty/images/3rdparty_image007.png}
+
+   * Press **Configure** button again, then press **Generate** button to generate Visual Studio projects. After completion, close CMake application. 
+
+5. Open the solution file *gl2ps_bin\\gl2ps.sln* in Visual Studio. 
+
+   * Select a configuration to build 
+     * Choose **Release** to build Release binaries. 
+     * Choose **Debug** to build Debug binaries. 
+   * Select a platform to build. 
+     * Choose **Win32** to build for a 32 bit platform. 
+     * Choose **x64** to build for a 64 bit platform. 
+   * Build the solution. 
+   * Build the *INSTALL* project. 
+    
+As a  result, you should have the installed gl2ps product in the *CMAKE_INSTALL_PREFIX* path. 
+
@subsection dev_guides__building_3rdparty_win_3_3 FreeImage

 This third-party product should be built as a dynamically loadable library (.dll file). 
 You can download its sources from 
-https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+http://sourceforge.net/projects/freeimage/files/Source%20Distribution/

 ### The building procedure: 

@@ -232,7 +312,7 @@ VTK is an open-source, freely available software system for 3D computer graphics

 ### The building procedure:

-1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
+1. Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.

   As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>

--- a/dox/dev_guides/building/3rdparty/images/genconf_linux.png
+++ b/dox/dev_guides/building/3rdparty/images/genconf_linux.png
--- a/dox/dev_guides/building/3rdparty/images/genconf_windows.png
+++ b/dox/dev_guides/building/3rdparty/images/genconf_windows.png
--- a/dox/dev_guides/building/android/android.md
+++ b/dox/dev_guides/building/android/android.md
@@ -10,9 +10,9 @@ The steps on Windows and Ubuntu are similar. There is the only one difference: m
 on Windows and native GNU make on Ubuntu.

 Required tools (download and install if it is required):
-  - CMake v3.7+ https://www.cmake.org/cmake/resources/software.html
+  - CMake v3.7+ http://www.cmake.org/cmake/resources/software.html
  - Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
-  - GNU Make: MinGW v4.82+ for Windows (https://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu.
+  - GNU Make: MinGW v4.82+ for Windows (http://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu. 

 ## Prerequisites

--- a/dox/dev_guides/building/building.md
+++ b/dox/dev_guides/building/building.md
@@ -6,7 +6,7 @@ The list of required libraries depends on what OCCT modules will be used, and yo
 The typical minimum is **Freetype** (necessary for Visualization) and **Tcl/Tk** (for DRAW Test Harness).
 See "Third-party libraries" section in \ref OCCT_OVW_SECTION_5 "Overview" for a full list.

-On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://www.opencascade.com/content/3rd-party-components.
+On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from http://www.opencascade.com/content/3rd-party-components.
 On Linux and OS X, it is recommended to use the version installed in the system natively.

 You can also build third-party libraries from their sources:
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@@ -82,13 +82,14 @@ The following table gives the full list of environment variables used at the con
 |----------|------|---------|
 | CMAKE_BUILD_TYPE | String | Specifies the build type on single-configuration generators (such 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_RAPIDJSON | Boolean flag | Indicates whether RapidJSON product should be used in OCCT Data Exchange module for support of glTF mesh file format |
+| 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 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. See 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 user_guides |
@@ -116,6 +117,7 @@ The following table gives the full list of environment variables used at the con
 | INSTALL_DIR_DOC | Path | Relative path to the documentation installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DOC}) |
 | INSTALL_FREETYPE | Boolean flag | Indicates whether Freetype binaries should be installed into the installation directory |
 | INSTALL_FREEIMAGE* | Boolean flag | Indicates whether Freeimage binaries should be installed into the installation directory |
+| INSTALL_GL2PS | Boolean flag | Indicates whether GL2PS binaries should be installed into the installation directory |
 | 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 |
--- a/dox/dev_guides/building/code_blocks.md
+++ b/dox/dev_guides/building/code_blocks.md
@@ -26,7 +26,7 @@ The environment is defined in the file *custom.sh* (on Linux and OS X) or *custo
  * "HardLink* - hard links to headers located in *src* will be created.
 * For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
 ~~~~~
-       export HAVE_FREEIMAGE=false
+       export HAVE_GL2PS=false
 ~~~~~

 Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure environment interactively:
--- a/dox/dev_guides/building/msvc.md
+++ b/dox/dev_guides/building/msvc.md
@@ -18,7 +18,7 @@ If you have official distribution with project files included, you can use them

 Before building OCCT, make sure to have all the required third-party libraries installed.

-The easiest way to install third-party libraries is to download archive with pre-built binaries, corresponding to version of Visual Studio you are using, from https://www.opencascade.com/content/3rd-party-components.
+The easiest way to install third-party libraries is to download archive with pre-built binaries, corresponding to version of Visual Studio you are using, from http://www.opencascade.com/content/3rd-party-components.

 You can also build third-party libraries from their sources, see @ref occt_dev_guides__building_3rdparty_windows for instructions.

@@ -37,8 +37,6 @@ If you have Visual Studio projects already available (pre-installed or generated
 | vc14-uwp  | 2015 (14)             | UWP (Universal Windows Platform) | vc14-uwp |
 | vc141     | 2017 (15)             | Desktop (Windows API)            | vc14 |
 | vc141-uwp | 2017 (15)             | UWP (Universal Windows Platform) | vc14-uwp |
-| vc142     | 2019 (16)             | Desktop (Windows API)            | vc14 |
-| vc142-uwp | 2019 (16)             | UWP (Universal Windows Platform) | vc14-uwp |

 * *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
--- a/dox/dev_guides/building/xcode.md
+++ b/dox/dev_guides/building/xcode.md
@@ -27,7 +27,7 @@ The environment is defined in the file *custom.sh* which can be edited directly:
  * "HardLink* - hard links to headers located in *src* will be created.
 * For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
 ~~~~~
-       export HAVE_FREEIMAGE=false
+       export HAVE_GL2PS=false
 ~~~~~

 Alternatively, or when *custom.sh* does not exist, you can launch *genconf.sh* to configure environment interactively:
@@ -49,13 +49,6 @@ For instance, in Terminal application:
  $ ./genproj
 ~~~~~

-Option **-static** can be used with XCode to build static libraries.
-
-~~~~~
-  $ cd /dev/OCCT/opencascade-7.0.0
-  $ ./genproj xcd -static
-~~~~~
-
@section build_xcode_build Building

 To start **Xcode**, launch script *xcode.sh*.
@@ -82,7 +75,7 @@ To start *DRAWEXE*, which has been built with Xcode on Mac OS X, perform the fol

 3.Run the script
 ~~~~~
-   ./draw.sh xcd [d]
+   ./draw_cbp.sh xcd [d]
 ~~~~~

 Option *d* is used if OCCT has been built in **Debug** mode.
--- a/dox/dev_guides/contribution_workflow/contribution_workflow.md
+++ b/dox/dev_guides/contribution_workflow/contribution_workflow.md
@@ -10,7 +10,7 @@ The purpose of this document is to describe standard workflow for processing con

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

@subsection occt_contribution_intro_access Access levels
--- a/dox/dev_guides/debug/debug.md
+++ b/dox/dev_guides/debug/debug.md
@@ -136,69 +136,11 @@ 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.

-
-@section occt_debug_dump_json Dump OCCT objects into Json
-
-Many OCCT classes may dump the current state into the stream. This stream contains the information about the class field into the field value/s.
-It is possible to prepare recursive dump using corresponded macro for class fields. The depth of this recursion is defined by parameter of the dump.
-The object defines What parameters should be presented in the Dump. The usual way is to dump all object fields.
-
-@subsection occt_debug_dump_json_object Implementation in object
-
-Steps to prepare dump of the object into json:
-
-1. Create method <b>DumpJson</b>. The method should accept the output stream and the depth for the fields dump.
-Depth, equal to zero means that only fields of this class should be dumped. Default value -1 means that whole tree of dump will be built recursively calling dump of all fields.
-
-2. Put into the first row of the method <b>OCCT_DUMP_CLASS_BEGIN</b>. This macro creates a local variable, that will open Json structure on start, and close on exit from this method.
-
-3. Add several macro to store field values.
-
-The following macro are defined to cover the object parameters into json format:
-
-| Name                        | Result in json |
-| :-------------------------- | :--------|
-| OCCT_DUMP_FIELD_VALUE_NUMERICAL  | "field": value |
-| OCCT_DUMP_FIELD_VALUE_STRING     | "field": "value" |
-| OCCT_DUMP_FIELD_VALUE_POINTER    | "field": "pointer address" |
-| OCCT_DUMP_FIELD_VALUES_DUMPED    | "field": { result of field->DumpJson(...) } |
-| OCCT_DUMP_FIELD_VALUES_NUMERICAL | "field": [value_1, ..., value_n]
-| OCCT_DUMP_FIELD_VALUES_STRING    | "field": ["value_1", ..., "value_n"]
-| OCCT_DUMP_BASE_CLASS   | "kind": { result of kind::DumpJson(...) } |
-
-@subsection occt_debug_dump_json_draw Using in DRAW
-
-In DRAW, key '-dumpJson' is used to dump an object.
-It is implemented in 'vaspect' and 'boundingbox' commands.
-
-Json output for Bnd_OBB (using command 'bounding v -obb -dumpJson'):
-
-~~~~~
-"Bnd_OBB": {
-   "Center": {
-      "gp_XYZ": [1, 2, 3]
-   },
-   "Axes[0]": {
-       "gp_XYZ:" [1, 0, 0]
-   },
-   "Axes[1]": {
-       "gp_XYZ:" [0, 1, 0]
-   },
-   "Axes[2]": {
-       "gp_XYZ:" [0, 0, 1]
-   },
-   "HDims[0]": 0,
-   "HDims[1]": 0,
-   "HDims[2]": 0,
-   "IsAABox": 1,
-}
-~~~~~
-
@section occt_debug_vstudio Using Visual Studio debugger 

@subsection occt_debug_vstudio_command Command window 

-Visual Studio debugger provides the Command Window (can be activated from menu <b>View / Other Windows / Command Window</b>), which can be used to evaluate variables and expressions interactively in a debug session (see https://msdn.microsoft.com/en-us/library/c785s0kz.aspx). Note that the Immediate Window can also be used but it has some limitations, e.g. does not support aliases.
+Visual Studio debugger provides the Command Window (can be activated from menu <b>View / Other Windows / Command Window</b>), which can be used to evaluate variables and expressions interactively in a debug session (see http://msdn.microsoft.com/en-us/library/c785s0kz.aspx). Note that the Immediate Window can also be used but it has some limitations, e.g. does not support aliases.

 When the execution is interrupted by a breakpoint, you can use this window to call the above described functions in context of the currently debugged function. Note that in most cases you will need to specify explicitly context of the function by indicating the name of the DLL where it is defined.

--- a/dox/dev_guides/documentation/documentation.md
+++ b/dox/dev_guides/documentation/documentation.md
@@ -12,15 +12,15 @@ This document provides practical guidelines for generation and editing of OCCT u
 You need to have the following software installed to generate the documentation.

 **Tcl/Tk**
-Version 8.5 or 8.6: https://www.tcl.tk/software/tcltk/download.html
+Version 8.5 or 8.6: http://www.tcl.tk/software/tcltk/download.html

 **Doxygen**
-Version 1.8.4 or above: http://www.doxygen.nl/download.html
+Version 1.8.4 or above: http://www.stack.nl/~dimitri/doxygen/download.html

 **Dot**
-Part of Graphviz software, used by Doxygen for generation of class diagrams in Reference Manual: https://www.graphviz.org/download/
+Part of Graphviz software, used by Doxygen for generation of class diagrams in Reference Manual: http://www.graphviz.org/Download..php

-**MiKTeX** or other package providing **pdflatex** command (only needed for generation of PDF documents): https://miktex.org/download
+**MiKTeX** or other package providing **pdflatex** command (only needed for generation of PDF documents): http://miktex.org/download

 **Inkscape** (only needed for generation of PDF documents containing SVG images): http://www.inkscape.org/download

@@ -134,7 +134,7 @@ Add a relative path to *svn.md* in file <i>dox/FILES.txt</i>. For instance
 dev_guides/svn/svn.md
@endverbatim

-**Note** that the order of paths to documents in *FILES.txt* is reproduced in the Table of Contents in the HTML output, thus they need to be placed logically.
+**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 @ref OCCT_DM_SECTION_A_1 "Header and hierarchic document structure" section for details.

@@ -180,7 +180,7 @@ For example:
  @subsubsection occt_ocaf_1_1_1 The document and the data framework
@endverbatim

-**Note** that section names can be used for references within the document and in other documents, so it is necessary to use the common prefix indicative of the document name for all section names in the given document. 
+Please, note that section names can be used for references within the document and in other documents, so it is necessary to use the common prefix indicative of the document name for all section names in the given document. 
 For example,  *occt_ocaf* for sections in Open CASCADE Application Framework manual.

 The remaining part of section names in most documents consists only of numbers, for example *1_1*. Actually, the hierarchical structure of the output table of contents is not based on these numbers and is generated automatically. 
--- a/dox/dev_guides/git_guide/git_guide.md
+++ b/dox/dev_guides/git_guide/git_guide.md
@@ -11,17 +11,18 @@ Guide to installing and using Git for OCCT development {#occt_dev_guides__git_gu
  to OCCT developers who are not familiar with this tool 
  and to facilitate the use of the official OCCT Git repository for code contribution to OCCT.

-  It can be useful to learn more about Git concepts and tools from a book a or manual. 
-  Many good books on Git can be found at https://git-scm.com/documentation
+  Reading this document does not exempt from the need to learn Git concepts and tools. 
+  Please consult a book or manual describing Git to get acquainted with this tool. 
+  Many good books on Git can be found at http://git-scm.com/documentation 
  
  For the experienced Git users it can be enough to read sections 1 and 3
   of this document to start working with the repository.
   
-  Familiarize yourselves with the @ref occt_dev_guides__contribution_workflow "Contribution Workflow document"  
+  Please make sure to get familiar with the Contribution Workflow document 
  that describes how Git is used for processing contributions to OCCT.
  
  This and related documents are available at the Resources page 
-  of the OCCT development portal at https://dev.opencascade.org/index.php?q=home/resources.
+  of the OCCT development portal at http://dev.opencascade.org/index.php?q=home/resources. 

@subsection occt_gitguide_1_2 Git URL

@@ -82,7 +83,7 @@ The official repository contains:
@subsection occt_gitguide_1_5 Version of Git

  The repository is tested to work with Git 1.7.6 and above. 
-  Avoid using versions below 1.7.1 as they are known to cause troubles.
+  Please do not use versions below 1.7.1 as they are known to cause troubles.

@section occt_gitguide_2 Installing Tools for Work with Git

@@ -113,7 +114,7 @@ The official repository contains:

@subsubsection occt_gitguide_2_1_2 Installation and configuration of TortoiseGit

-  Download TortoiseGit distributive from https://tortoisegit.org/download/.
+  Download TortoiseGit distributive from http://code.google.com/p/tortoisegit/downloads/list. 
  Launch the installation.

 * Select your SSH client. Choose option 
@@ -139,7 +140,7 @@ The official repository contains:
  @figure{OCCT_GitGuide_V2_image006.png,"",320}

  Optionally, you can set up TortoiseGit to use visual diff utility for SVG images used in OCCT documentation.
-  For that, click on item "Diff Viewer" in the Settings dialog, then click button "Advanced..." in the right tab to add a new record with the following parameters:
+  For that, click on item "Diff Viewer" in the Settings dialog, then click button "Advanced..." on the right tab add new record with the following parameters:
  - Extension: <code>.svg</code>
  - External program: <code>&lt;path_to_OCCT&gt;\\adm\\svgdiff.bat %%base %%mine %%bname %%yname</code>

@@ -238,7 +239,7 @@ The official repository contains:

@subsection occt_gitguide_3_3 Adding public key in your account

-Log in on the portal https://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.
+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. 

@@ -249,7 +250,7 @@ Click **Save** to input the key to the system.
  It is typical to use your e-mail address or workstation name for this field; no restrictions are set by the portal.


-  **Note** that some time (5-10 min) is needed for the system 
+  Please note that some time (5-10 min) is needed for the system 
  to update the configuration after the new key is added. 
  After that time, you can try accessing Git.

@@ -496,7 +497,7 @@ To rebase your branch into a single commit, you need to do the following:

  The changes made in the branch can be reviewed without direct access to Git, using GitWeb interface:

-  * Open GitWeb in your web browser: https://git.dev.opencascade.org/gitweb/?p=occt.git
+  * Open GitWeb in your web browser: http://git.dev.opencascade.org/gitweb/?p=occt.git 
  * Locate the branch you want to review among **heads** (click ‘…’ at the bottom of the page to see the full list).
  * Click **log** (or **shortlog**) to see the history of the branch. 
    
--- a/dox/dev_guides/tests/tests.md
+++ b/dox/dev_guides/tests/tests.md
@@ -193,9 +193,9 @@ Use prefix <i>bug</i> followed by Mantis issue ID and, if necessary, additional
 	*	To check expected output which should be obtained as the test result, add @ref testmanual_3_7 "REQUIRED" statement for each line of output to mark it as required.
 	*	If the test case produces error messages (contained in parse.rules), which are expected in that test and should not be considered as its failure (e.g. test for *checkshape* command), add REQUIRED statement for each error to mark it as required output.
 4.	To check whether the data files needed for the test are already present in the database, use DRAW command *testfile* (see below).
-    If the data file is already present, use it for a new test instead of adding a duplicate.
-    If the data file(s) are not yet present in the test database, put them to a folder and add it to the environment variable *CSF_TestDataPath* to be found by the test system.
-    The location of the data files, which need to be accessed by OCC team and put to the official database, should be provided in the comment to Mantis issue, clearly indicating how the names of the files used by the test script match the actual names of the files.
+    If the data file is already present, use it for new test instead of adding a duplicate.
+    If the data file(s) are not yet present in the test database, put them to some folder and add it to the environment variable *CSF_TestDataPath* to be found by the test system.
+    Information on where the data files can be accessed by OCC team for putting to official database should be provided in comment to Mantis issue, clearly indicating how names of the files used by the test script match the actual names of the files.
    The simplest way is to attach the data files to the Mantis issue, with the same names as used by the test script.
 5.	Check that the test case runs as expected (test for fix: OK with the fix, FAILED without the fix; test for existing problem: BAD), and integrate it to the Git branch created for the issue.

@@ -222,8 +222,8 @@ fixshape result a 0.01 0.01
 checkshape result
 ~~~~~

-DRAW command *testfile* should be used to check the data files used by the test for possible duplication of content or names.
-The command accepts the list of paths to files to be checked (as a single argument) and gives a conclusion on each of the files, for instance:
+DRAW command testfile should be used to check the data files being used by the test for possible duplication of content or names.
+The command accepts list of paths to files being checked as single argument, and will give conclusion on each of the files, for instance:

 ~~~~~
 Draw[1]> testfile [glob /my/data/path/bug12345*]
@@ -347,7 +347,7 @@ The test group may contain *parse.rules* file. This file defines patterns used f

 Each line in the file should specify a status (single word), followed by a regular expression delimited by slashes (*/*) that will be matched against lines in the test output log to check if it corresponds to this status.

-The regular expressions should follow <a href="https://www.tcl.tk/man/tcl/TclCmd/re_syntax.htm">Tcl syntax</a>, with a special exception that "\b" is considered as word limit (Perl-style), in addition to "\y" used in Tcl.
+The regular expressions should follow <a href="http://www.tcl.tk/man/tcl/TclCmd/re_syntax.htm">Tcl syntax</a>, with a special exception that "\b" is considered as word limit (Perl-style), in addition to "\y" used in Tcl.

 The rest of the line can contain a comment message, which will be added to the test report when this status is detected.

@@ -622,7 +622,7 @@ The new test created for an unsolved problem should return BAD. The new test cre

@subsection testmanual_3_6 Marking BAD cases

-If the test produces an invalid result at a certain moment then the corresponding bug should be created in the OCCT issue tracker located at https://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.
+If the test produces an invalid result at a certain moment then the corresponding bug should be created in the OCCT issue tracker located at http://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.

 The following statement should be added to such a test script:
 ~~~~~
@@ -878,18 +878,7 @@ The test grid name is constructed depending on the type of the tested chamfers.
 | dist_angle_complex	| |	Distance from edge and given angle |
 | dist_angle_sequence	| |	Distance from edge and given angle |

-@subsubsection testmanual_5_1_7 de
-
-This group tests reading and writing of CAD data files (iges, step) to and from OCCT.
-
-Test cases check transfer status, shape and attributes against expected reference values.
-
-| Grid	| Commands | Functionality |
-| :---- | :----- | :------- | 
-| iges_1, iges_2, iges_3 | igesbrep, brepiges, ReadIges, WriteIges | IGES tests | 
-| step_1, step_2, step_3, step_4, step_5 | stepread, stepwrite, ReadStep, WriteStep | STEP tests |
-
-@subsubsection testmanual_5_1_8 demo
+@subsubsection testmanual_5_1_7 demo

 This group allows demonstrating how testing cases are created, and testing DRAW commands and the test system as a whole.

@@ -900,7 +889,7 @@ This group allows demonstrating how testing cases are created, and testing DRAW
 | samples	| |	OCCT samples | 


-@subsubsection testmanual_5_1_9 draft
+@subsubsection testmanual_5_1_8 draft

 This group allows testing draft operations.

@@ -911,7 +900,7 @@ DRAW module: MODELING.
 | Angle	| depouille	| Drafts with angle (inclined walls) |


-@subsubsection testmanual_5_1_10 feat
+@subsubsection testmanual_5_1_9 feat

 This group allows testing creation of features on a shape.

@@ -925,7 +914,7 @@ DRAW module: MODELING (package *BRepTest*).
 | featrevol		| | | 
 | featrf		| | |

-@subsubsection testmanual_5_1_11 heal
+@subsubsection testmanual_5_1_10 heal

 This group allows testing the functionality provided by *ShapeHealing* toolkit.

@@ -954,7 +943,7 @@ DRAW module: XSDRAW
 | surface_to_revolution_standard |	DT_ShapeConvertRev	| Convert elementary surfaces to revolutions, simple cases |
 | update_tolerance_locked	| updatetolerance	| Update the tolerance of shape so that it satisfy the rule: toler(face)<=toler(edge)<=toler(vertex) |

-@subsubsection testmanual_5_1_12 mesh
+@subsubsection testmanual_5_1_11 mesh

 This group allows testing shape tessellation (*BRepMesh*) and shading.

@@ -971,7 +960,7 @@ DRAW modules: MODELING (package *MeshTest*), VISUALIZATION (package *ViewerTest*
 | advanced_incmesh_parallel | incmesh | Meshing of complex shapes, parallel mode |
 | standard_incmesh_parallel | incmesh | Meshing of simple shapes, parallel mode |

-@subsubsection testmanual_5_1_13 mkface
+@subsubsection testmanual_5_1_12 mkface

 This group allows testing creation of simple surfaces.

@@ -986,7 +975,7 @@ DRAW module: MODELING (package *BRepTest*)
 | after_revsurf_and_offset | mkface	| | 
 | mkplane | mkplane	| |

-@subsubsection testmanual_5_1_14 nproject
+@subsubsection testmanual_5_1_13 nproject

 This group allows testing normal projection of edges and wires onto a face.

@@ -996,7 +985,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Base	| nproject	|  |

-@subsubsection testmanual_5_1_15 offset
+@subsubsection testmanual_5_1_14 offset

 This group allows testing offset functionality for curves and surfaces.

@@ -1012,7 +1001,7 @@ DRAW module: MODELING (package *BRepTest*)
 | shape	 | offsetshape	| |
 | wire_closed_outside_0_005, wire_closed_outside_0_025, wire_closed_outside_0_075, wire_closed_inside_0_005, wire_closed_inside_0_025, wire_closed_inside_0_075, wire_unclosed_outside_0_005, wire_unclosed_outside_0_025, wire_unclosed_outside_0_075	|	mkoffset | 2d offset of closed and unclosed planar wires with different offset step and directions of offset ( inside / outside ) |
 	
-@subsubsection testmanual_5_1_16 pipe
+@subsubsection testmanual_5_1_15 pipe

 This group allows testing construction of pipes (sweeping of a contour along profile).

@@ -1022,7 +1011,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Standard	| pipe	| |

-@subsubsection testmanual_5_1_17 prism
+@subsubsection testmanual_5_1_16 prism

 This group allows testing construction of prisms.

@@ -1032,7 +1021,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | seminf | prism	| |

-@subsubsection testmanual_5_1_18 sewing
+@subsubsection testmanual_5_1_17 sewing

 This group allows testing sewing of faces by connecting edges.

@@ -1044,7 +1033,7 @@ DRAW module: MODELING (package *BRepTest*)
 | tol_1	| sewing | Sewing faces with tolerance 1 |
 | tol_100 | sewing | Sewing faces with tolerance 100 | 

-@subsubsection testmanual_5_1_19 thrusection
+@subsubsection testmanual_5_1_18 thrusection

 This group allows testing construction of shell or a solid passing through a set of sections in a given sequence (loft).

@@ -1053,7 +1042,7 @@ This group allows testing construction of shell or a solid passing through a set
 | solids	| thrusection | Lofting with resulting solid | 
 | not_solids | thrusection	| Lofting with resulting shell or face | 

-@subsubsection testmanual_5_1_20 xcaf
+@subsubsection testmanual_5_1_19 xcaf

 This group allows  testing extended data exchange packages.

--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -51,7 +51,7 @@ for (Standard_Integer aGr = 1; aGr <= aLen; ++aGr)

 * All occurrences of *Select3D_Projector* in the application code (if any) should be replaced with *Handle(Select3D_Projector)*.
 * The code of inheritors of *Select3D_SensitiveEntity* should be updated if they override <i>Matches()</i> (this is probable, if clipping planes are used).
-* Constructor for *V3d_Plane* has been changed, so the extra argument should be removed if used in the application. It is necessary to add a new plane using method *V3d_Viewer::AddPlane()* if *V3d_Viewer* has been used to manage clipping planes list (this does not affect clipping planes representation). Have a look at the source code for new DRAWEXE *vclipplane* command in *ViewerTest_ObjectsCommands.cxx, VClipPlane* to see how clipping planes can be managed in the application.
+* Constructor for *V3d_Plane* has been changed, so the extra argument should be removed if used in the application. It is necessary to add a new plane using method *V3d_Viewer::AddPlane()* if *V3d_Viewer* has been used to manage clipping planes list (this does not affect clipping planes representation). Please, have a look at the source code for new DRAWEXE *vclipplane* command in *ViewerTest_ObjectsCommands.cxx, VClipPlane* to see how clipping planes can be managed in the application.

@section upgrade_652 Upgrade to OCCT 6.5.2

@@ -112,14 +112,14 @@ Porting of user applications from an earlier OCCT version to version 6.6.0 requi
 It is necessary to introduce the corresponding changes in the applications for which the order of sub-shapes resulting from a Boolean operation is important. It is strongly recommended to use identification methods not relying on the order of sub-shapes (e.g. OCAF naming).
 * If you need to use OCCT on Mac OS X with X11 (without Cocoa), build OCCT with defined pre-processor macro *CSF_MAC_USE_GLX11*. XLib front-end (previously the only way for unofficial OCCT builds on Mac OS X) is now disabled by default on this platform. If your application has no support for Cocoa framework you may build OCCT with XLib front-end adding *MACOSX_USE_GLX* macro to compiler options (you may check the appropriate option in WOK configuration GUI and in CMake configuration). Notice that XQuartz (XLib implementation for Mac OS X) now is an optional component and does not provide a sufficient level of integrity with native (Cocoa-based) applications in the system. It is not possible to build OCCT with both XLib and Cocoa at the same time due to symbols conflict in OpenGL functions. 
 * Animation mode and degeneration presentation mode (simplified presentation for animation) and associated methods have been removed from 3D viewer functionality.
-Correspondingly, the code using methods *SetAnimationModeOn(), SetAnimationModeOff(), AnimationModeIsOn(), AnimationMode(), Tumble(), SetDegenerateModeOn(), SetDegenerateModeOff()* and *DegenerateModeIsOn()* of classes *V3d_View* and *Visual3d_View* will need to be removed or redesigned. Hidden Line Removal presentation was not affected; however, the old code that used methods *V3d_View::SetDegenerateModeOn* or *V3d_View::SetDegenerateModeOff* to control HLR presentation should be updated to use *V3d_View::SetComputedMode* method instead.
+Correspondingly, the code using methods *SetAnimationModeOn(), SetAnimationModeOff(), AnimationModeIsOn(), AnimationMode(), Tumble(), SetDegenerateModeOn(), SetDegenerateModeOff()* and *DegenerateModeIsOn()* of classes *V3d_View* and *Visual3d_View* will need to be removed or redesigned. Please, notice that Hidden Line Removal presentation was not affected; however, the old code that used methods *V3d_View::SetDegenerateModeOn* or *V3d_View::SetDegenerateModeOff* to control HLR presentation should be updated to use *V3d_View::SetComputedMode* method instead.
 * Calls of *Graphic3d_Group::BeginPrimitives()* and *Graphic3d_Group::EndPrimitives()* should be removed from the application code.
 * Application functionality for drawing 2D graphics that was formerly based on *TKV2d* API should be migrated to *TKV3d* API. The following changes are recommended for this migration:
   * A 2D view can be implemented as a *V3d_View* instance belonging to *V3d_Viewer* managed by *AIS_InteractiveContext* instance. To turn *V3d_View* into a 2D view, the necessary view orientation should be set up at the view initialization stage using *V3d_View::SetProj()* method, and view rotation methods simply should not be called.
   * Any 2D graphic entity (formerly represented with *AIS2D_InteractiveObject*) should become a class derived from *AIS_InteractiveObject* base. These entities should be manipulated in a view using *AIS_InteractiveContext* class API.
   * All drawing code should be put into *Compute()* virtual method of a custom interactive object class and use API of *Graphic3d* package. In particular, all geometry should be drawn using class hierarchy derived from *Graphic3d_ArrayOfPrimitives*. Normally, the Z coordinate for 2D geometry should be constant, unless the application implements some advanced 2D drawing techniques like e.g. multiple "Z layers" of drawings.
   * Interactive selection of 2D presentations should be set up inside *ComputeSelection()* virtual method of a custom interactive object class, using standard sensitive entities from *Select3D* package and standard or custom entity owners derived from *SelectMgr_EntityOwner* base.
-Refer to the Visualization User's Guide for further details concerning OCCT 3D visualization and selection classes. See also *Viewer2D* OCCT sample application, which shows how 2D drawing can be implemented using TKV3d API.
+Please refer to the Visualization User's Guide for further details concerning OCCT 3D visualization and selection classes. See also *Viewer2D* OCCT sample application, which shows how 2D drawing can be implemented using TKV3d API.
 * Run-time graphic driver library loading mechanism based on *CSF_GraphicShr* environment variable usage has been replaced by explicit linking against *TKOpenGl* library. The code sample below shows how the graphic driver should be created and initialized in the application code: 
 ~~~~
 // initialize a new viewer with OpenGl graphic driver
@@ -161,10 +161,10 @@ Porting of user applications from an earlier OCCT version to version 6.7.0 requi

@subsection upgrade_670_clipping Object-level clipping and capping algorithm. 

-* It might be necessary to revise and port code related to management of view-level clipping to use *Graphic3d_ClipPlane* instead of *V3d_Plane* instances. Note that *V3d_Plane* class has been preserved -- as previously, it can be used as plane representation. Another approach to represent *Graphic3d_ClipPlane* in a view is to use custom presentable object.
-* The list of arguments of *Select3D_SensitiveEntity::Matches()* method for picking detection has changed. Since now, for correct selection clipping, the implementations should perform a depth clipping check and return (as output argument) minimum depth value found at the detected part of sensitive. Refer to CDL / Doxygen documentation to find descriptive hints and snippets.
+* It might be necessary to revise and port code related to management of view-level clipping to use *Graphic3d_ClipPlane* instead of *V3d_Plane* instances. Please note that *V3d_Plane* class has been preserved -- as previously, it can be used as plane representation. Another approach to represent *Graphic3d_ClipPlane* in a view is to use custom presentable object.
+* The list of arguments of *Select3D_SensitiveEntity::Matches()* method for picking detection has changed. Since now, for correct selection clipping, the implementations should perform a depth clipping check and return (as output argument) minimum depth value found at the detected part of sensitive. Please refer to CDL / Doxygen documentation to find descriptive hints and snippets.
 * *Select3D_SensitiveEntity::ComputeDepth()* abstract method has been removed. Custom implementations should provide depth checks by method *Matches()* instead -- all data required for it is available within a scope of single method.
-* It might be necessary to revise the code of custom sensitive entities and port *Matches()* and *ComputeDepth()* methods to ensure proper selection clipping. Note that obsolete signature of *Matches* is not used anymore by the selector. If your class inheriting *Select3D_SensitiveEntity* redefines the method with old signature the code should not compile as the return type has been changed. This is done to prevent override of removed methods.
+* It might be necessary to revise the code of custom sensitive entities and port *Matches()* and *ComputeDepth()* methods to ensure proper selection clipping. Please note that obsolete signature of *Matches* is not used anymore by the selector. If your class inheriting *Select3D_SensitiveEntity* redefines the method with old signature the code should not compile as the return type has been changed. This is done to prevent override of removed methods.

@subsection upgrade_670_markers Redesign of markers presentation

@@ -210,7 +210,7 @@ If *ViewMapping* and *ViewOrientation* were used directly, this functionality ha

 The current perspective model is not fully backward compatible, so the old perspective-related functionality needs to be reviewed.

-Revise application-specific custom presentations to provide a proper bounding box, otherwise the object might become erroneously clipped by automatic *ZFit* or frustum culling algorithms enabled by default.
+Please revise application-specific custom presentations to provide proper bounding box. Otherwise object might become erroneously clipped by automatic *ZFit* or frustum culling algorithms enabled by default.

@subsection upgrade_680_connected_objects Redesign of Connected Interactive Objects

@@ -439,7 +439,7 @@ class TColStd_Array1OfReal; -> #include <TColStd_Array1OfReal.hxx>
 ~~~~~
 Handle_Class -> Handle(Class)
 ~~~~~
-  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 https://doc.qt.io/qt-4.8/signalsandslots.html).
+  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 <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:
@@ -736,9 +736,9 @@ If you like to preserve the compatibility of your application code with OCCT ver
 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 a specialized WOK version used for OCCT code upgrade can be found in WOK Git repository in branch [CR0_700_2](https://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](https://www.opencascade.com/contact/) if you need more help.
+[Contact us](http://www.opencascade.com/contact/) if you need more help.

@subsection upgrade_occt700_bspline Separation of BSpline cache

@@ -987,11 +987,11 @@ The applications that use *gp_Quaternion* to convert Yaw-Pitch-Roll angles (or o

@subsection upgrade_zoom_persistent_selection Zoom Persistent Selection

-Zoom persistent selection introduces a new structure *Graphic3d_TransformPers* to transform persistence methods and parameters and a new class *Graphic3d_WorldViewProjState* to refer to the camera transformation state. You might need to update your code to deal with the new classes if you were using the related features. Keep in mind the following: 
+Zoom persistent selection introduces a new structure *Graphic3d_TransformPers* to transform persistence methods and parameters and a new class *Graphic3d_WorldViewProjState* to refer to the camera transformation state. You might need to update your code to deal with the new classes if you were using the related features. Please, keep in mind the following: 
 * *Graphic3d_Camera::ModelViewState* has been renamed to *Graphic3d_Camera::WorldViewState*.
 * Transformation matrix utilities from *OpenGl_Utils* namespace have been moved to *Graphic3d_TransformUtils* and *Graphic3d_TransformUtils.hxx* header respectively.
 * Matrix stack utilities from *OpenGl_Utils* namespace have been moved to *OpenGl_MatrixStack* class and *OpenGl_MatrixStack.hxx* header respectively.
-* *OpenGl_View* methods *Begin/EndTransformPersistence* have been removed. Use *Graphic3d_TransformPers::Apply()* instead to apply persistence to perspective and world-view projection matrices.
+* *OpenGl_View* methods *Begin/EndTransformPersistence* have been removed. Please, use *Graphic3d_TransformPers::Apply()* instead to apply persistence to perspective and world-view projection matrices.

@subsection upgrade_occt700_correction_of_texture Texture mapping of objects

@@ -1091,7 +1091,7 @@ The following environment variables have become redundant:

 * *CSF_UnitsLexicon* and *CSF_UnitsDefinition* are no more used.  Units definition (*UnitsAPI/Lexi_Expr.dat* and *UnitsAPI/Units.dat*) is now embedded into source code.
 * *CSF_XSMessage* and *CSF_XHMessage* are now optional.
-  English messages (XSMessage/\*XSTEP.us* and SHMessage/\*SHAPE.us*) are now embedded into source code
+  English messages (XSMessage/*XSTEP.us* and SHMessage/*SHAPE.us*) are now embedded into source code
  and automatically loaded when environment variables are not set.
 * *CSF_ShadersDirectory* is not required any more, though it still can be used to load custom shaders.
  Mandatory GLSL resources are now embedded into source code.
@@ -1124,7 +1124,7 @@ The following classes have been changed:
 * *BRepTools_Modifier* class now has two modes of work. They are defined by the boolean parameter *MutableInput*, which is turned off by default. This means that the algorithm always makes a copy of a sub-shape (e.g. vertex) if its tolerance is to be increased in the output shape. The old mode corresponds to *MutableInput* turned on. This change may impact an application if it implements a class derived from *BRepTools_Modifier*.
 * The second parameter *theIsOuterWire* of method *ShapeAnalysis_Wire::CheckSmallArea* has been removed.
 * In class *GeomPlate_CurveConstraint*, two constructors taking boundary curves of different types have been replaced with one constructor taking the curve of an abstract type.
-* The last optional argument *RemoveInvalidFaces* has been removed from the constructor of class  *BRepOffset_MakeOffset* and method *Initialize*.
+*  The last optional argument *RemoveInvalidFaces* has been removed from the constructor of class  *BRepOffset_MakeOffset* and method *Initialize*.
 * The public method *BOPDS_DS::VerticesOnIn* has been renamed into *SubShapesOnIn* and the new output parameter *theCommonPB* has been added.

@section upgrade_occt720 Upgrade to OCCT 7.2.0
@@ -1503,388 +1503,60 @@ The following obsolete features have been removed:
 * The container *BiTgte_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;
 * The class *BOPTools* has been removed as duplicate of the class *TopExp*;
 * The method *BOPAlgo_Builder::Splits()* has been removed as excessive. The method *BOPAlgo_Builder::Images()* can be used instead.
-* The method *BOPTools_AlgoTools::CheckSameGeom()* has been removed as excessive. The method *BOPTools_AlgoTools::AreFacesSameDomain()* can be used instead.

@section upgrade_occt730 Upgrade to OCCT 7.3.0

@subsection upgrade_730_lights Light sources

-Multiple changes have been applied to lights management within *TKV3d* and *TKOpenGl*:
-* *V3d_Light* class is now an alias to *Graphic3d_CLight*.
-  *Graphic3d_CLight* is now a Handle class with refactored methods for managing light source parameters.
-  Most methods of *V3d_Light* sub-classes have been preserved to simplify porting.
-* Obsolete debugging functionality for drawing a light source has been removed from *V3d_Light*.
-  Methods and constructors that take parameters for debug display and do not affect the light definition itself have also been removed.
-* Light constructors taking *V3d_Viewer* have been marked as deprecated.
-  Use method *AddLight()* of the class *V3d_Viewer* or *V3d_View* to add new light sources to a scene or a single view, respectively.
+Multiple changes have been applied to lights management within TKV3d and TKOpenGl:
+* V3d_Light class is now an alias to Graphic3d_CLight.
+  Graphic3d_CLight is now a Handle class with refactored methods for managing light source parameters
+  (preserving most methods of V3d_Light sub-classes to simplify porting).
+* Obsolete debugging functionality for drawing lights source has been removed from V3d_Light.
+  Methods and constructors taking parameters for this drawing and not affecting light definition itself has been also removed.
+* Light constructors taking V3d_Viewer has been marked deprecated.
+  Application may call V3d_Viewer::AddLight() explicitly to register new light sources created by new constructors within V3d_Viewer, but this step is now optional.
 * The upper limit of 8 light sources has been removed.
-* The classes for specific light source types: *V3d_AmbientLight, V3d_DirectionalLight, V3d_PositionalLight* and *V3d_SpotLight* have been preserved, but it is now possible to define the light of any type by creating base class *Graphic3d_CLight* directly. The specific classes only hide unrelated light properties depending on the type of light source.
-* It is no more required to call *V3d_Viewer::UpdateLights()* after modifying the properties of light sources (color, position, etc.)
+* Dedicated classes per light source type V3d_AmbientLight, V3d_DirectionalLight, V3d_PositionalLight and V3d_SpotLight have been preserved,
+  but it is now possible defining light of any type by creating base class Graphic3d_CLight directly.
+  Dedicated classes only hides visibility of unrelated light properties depending on its type.
+* Calling V3d_Viewer::UpdateLights() is no more required after modifying light sources properties (color, position, etc.).

@subsection upgrade_730_shadingmodels Shading Models

-*Graphic3d_AspectFillArea3d* has been extended by a new property *ShadingModel()*, which previously has been defined globally for the entire View.
+*Graphic3d_AspectFillArea3d* has been extended by a new property *ShadingModel()*, which previously has been defined globally for entire View.

-Previously, a triangle array without normal vertex attributes was implicitly considered as unshaded,
+Previously, triangle array without normal vertex attributes was implicitly considered as unshaded,
 but now such array will be shaded using *Graphic3d_TOSM_FACET* model (e.g. by computing per-triangle normals).
-Therefore, *Graphic3d_TOSM_UNLIT* should be explicitly specified to disable shading of triangles array.
-Alternatively, a material without reflectance properties can be used to disable shading (as before).
+Therefore, *Graphic3d_TOSM_UNLIT* should be explicitly specified for disabling shading or triangles array.
+Alternatively, material without reflectance properties can be used for disabling shading as before.

@subsection upgrade_730_tkopengl Custom low-level OpenGL elements

-The following API changes should be considered while porting custom *OpenGl_Element* objects:
+The following API changes should be considered while porting custom OpenGl_Element objects:
 * *OpenGl_ShaderManager::BindFaceProgram()*, *BindLineProgram()*, *BindMarkerProgram()* now take enumeration arguments instead of Boolean flags.

@subsection upgrade_730_BOPAlgo_Section Changes in BOPAlgo_Section

-The public method *BuildSection()* in the class *BOPAlgo_Section* has become protected. The methods *Perform()* or *PerformWithFiller()* should be called for construction of the result of SECTION operation.
+The public method *BuildSection()* in the class *BOPAlgo_Section* has became protected. The methods *Perform()* or *PerformWithFiller()* should be called for construction of the result of SECTION operation.

@subsection upgrade_730_BRepAdaptor_CompCurve Changes in BRepAdaptor_CompCurve

-The method *BRepAdaptor_CompCurve::SetPeriodic* has been eliminated.
-Since the new version, the method *BRepAdaptor_CompCurve::IsPeriodic()* will always return FALSE. Earlier, it could return TRUE in case if the wire contained only one edge based on a periodic curve. 
+The method BRepAdaptor_CompCurve::SetPeriodic has been eliminated.
+Since new version, the method BRepAdaptor_CompCurve::IsPeriodic() will always return FALSE. Earlier, it could return TRUE in case if the wire contained only one edge based on periodic curve. 

@subsection upgrade_730_removed Removed features
-* The methods *SetDeflection*, *SetEpsilonT*, *SetDiscretize* of the class *IntTools_EdgeFace* have been removed as redundant.
-* Deprecated functionality *V3d_View::Export()*, related enumerations Graphic3d_ExportFormat, Graphic3d_SortType
-  as well as optional dependency from gl2ps library have been removed.
+* The methods *SetDeflection*, *SetEpsilonT*, *SetDiscretize* of the class *IntTools_EdgeFace* have been removed as excessive.
+
+@subsection upgrade_730_IntersectionAPI Changes in classes responsible for intersection algorithm
+
+Interfaces of the following methods have been changed: IntPatch_WLineTool::ComputePurgedWLine(...), IntPatch_PrmPrmIntersection::Perform(...), IntPatch_Intersection::Perform(...), IntPatch_Intersection::ParamParamPerfom(...), IntPatch_Intersection::GeomGeomPerfom(...). Please see documentation about corresponding methods.

@subsection upgrade_730_BuilderSolid Boolean Operations - Solid Builder algorithm

-Previously, the unclassified faces of *BOPAlgo_BuilderSolid* algorithm (i.e. the faces not used for solids creation and located outside of all created solids) were used to form an additional (not closed) solid with INTERNAL orientation.
-Since the new version, these unclassified faces are no longer added into the resulting solids. Instead, the @ref occt_algorithms_ers "warning" with a list of these faces appears.
+Previously, the unclassified faces of *BOPAlgo_BuilderSolid* algorithm (the faces which have not been used for solids creation and located outside of all created solids) have been used to form an additional solid (not closed one) with INTERNAL orientation.
+Since new version, these unclassified faces are no longer added into resulting solids. Instead, the @ref occt_algorithms_ers "warning" containing these faces appears.

-The following public methods of the *BOPAlgo_BuilderSolid* class have been removed as redundant:
-* *void SetSolid(const TopoDS_Solid& theSolid);*
-* *const TopoDS_Solid& Solid() const;*
-
-@subsection upgrade_730_BRepAlgoBO Boolean Operation classes in BRepAlgo are deprecated
-
-The API classes in the package BRepAlgo providing access to old Boolean operations are marked as deprecated:
-* BRepAlgo_Fuse
-* BRepAlgo_Common
-* BRepAlgo_Cut
-* BRepAlgo_Section
-Corresponding classes from the package BRepAlgoAPI should be used instead.
-
-@subsection upgrade_730_replace_CDM_MessageDriver_interface_by_Message_Messenger Unification of the Error/Warning reporting system of Application Framework
-
-Class *CDM_MessageDriver* and its descendants have been removed; class *Message_Messenger* is used instead in all OCAF packages.
-By default, messenger returned by *Message::DefaultMessenger()* is used, thus all messages generated by OCAF are directed in the common message queue of OCCT.
-
-In classes implementing OCAF persistence for custom attributes (those inheriting from *BinMDF_ADriver*, *XmlMDF_ADriver*), uses of method *WriteMessage()* should be replaced by call to method *Send()* of the inherited field *myMessageDriver*. Note that this method takes additional argument indicating the gravity of the message (Trace, Info, Warning, Alarm, or Fail).
-
-Class *Message_PrinterOStream* can be used instead of *CDM_COutMessageDriver* to direct all messages to a stream.
-If custom driver class is used in the application, that class shall be reimplemented inheriting from *Message_Printer* instead of *CDM_MessageDriver*.
-Method *Send()* should be redefined instead of method *Write()* of *CDM_MessageDriver*.
-To use the custom printer in OCAF, it can be either added to default messenger or set into the custom *Message_Messenger* object created in the method *MessageDriver()* of a class inheriting *CDF_Application*.
-
-@section upgrade_occt740 Upgrade to OCCT 7.4.0
-
-@subsection upgrade_740_BRepPrimAPI_MakeRevol Changes in BRepPrimAPI_MakeRevol algorithm
-Previously the algorithm could create a shape with the same degenerated edge shared between some faces. Now it is prevented. The algorithm creates the different copy of this edge for each face. The method *Generated(...)* has been changed in order to apply restriction to the input shape: input shape can be only of type VERTEX, EDGE, FACE or SOLID. For input shape of another type the method always returns empty list.
-
-@subsection upgrade_740_removed Removed features
-* The following methods of the class *BRepAlgoAPI_BooleanOperation* have been removed as obsolete or replaced:
-  - *BuilderCanWork* can be replaced with *IsDone* or *HasErrors* method.
-  - *FuseEdges* removed as obsolete.
-  - *RefineEdges* replaced with new method *SimplifyResult*.
-* The method *ImagesResult* of the class *BOPAlgo_BuilderShape* has been removed as unused. The functionality of this method can be completely replaced by the history methods *Modified* and *IsDeleted*.
-* The method *TrackHistory* of the classes *BOPAlgo_RemoveFeatures* and *BRepAlgoAPI_Defeaturing* has been renamed to *SetToFillHistory*.
-* The method *GetHistory* of the class *BRepAlgoAPI_Defeaturing* has been renamed to *History*.
-* The classes *BRepAlgo_BooleanOperations* and *BRepAlgo_DSAccess* have been removed as obsolete. Please use the BRepAlgoAPI_* classes to perform Boolean operations.
-* *BRepAlgo_DataMapOfShapeBoolean* has been removed as unused.
-* *BRepAlgo_DataMapOfShapeInterference* has been removed as unused.
-* *BRepAlgo_EdgeConnector* has been removed as unused.
-* *BRepAlgo_SequenceOfSequenceOfInteger* has been removed as unused.
-
-@subsection upgrade_740_localcontext Local Context removal
-
-Previously deprecated Local Context functionality has been removed from AIS package,
-so that related methods have been removed from AIS_InteractiveContext interface:
-*HasOpenedContext()*, *HighestIndex()*, *LocalContext()*, *LocalSelector()*, *OpenLocalContext()*, *CloseLocalContext()*,
-*IndexOfCurrentLocal()*, *CloseAllContexts()*, *ResetOriginalState()*, *ClearLocalContext()*, *UseDisplayedObjects()*, *NotUseDisplayedObjects()*,
-*SetShapeDecomposition()*, *SetTemporaryAttributes()*, *ActivateStandardMode()*, *DeactivateStandardMode()*, *KeepTemporary()*,
-*SubIntensityOn()*, *SubIntensityOff()*, *ActivatedStandardModes()*, *IsInLocal()*, *AddOrRemoveSelected()* taking TopoDS_Shape.
-
-A set of deprecated methods previously related to Local Context and now redirecting to other methods has been preserved to simplify porting; they will be removed in next release.
-
-@subsection upgrade_740_geomconvert Changes in behavior of Convert algorithms
-
-Now methods *GeomConvert::ConcatG1*, *GeomConvert::ConcatC1*, *Geom2dConvert::ConcatG1*, *Geom2dConvert::ConcatC1* modify the input argument representing the flag of closedness.
-
-@subsection upgrade_740_selection Changes in selection API and picked point calculation algorithm.
-
-*SelectBasics_PickResult* structure has been extended, so that it now defines a 3D point on the detected entity in addition to Depth value along picking ray.
-*SelectMgr_SelectingVolumeManager::Overlap()* methods have been corrected to fill in *SelectBasics_PickResult* structure (depth and 3D point) instead of only depth value, so that custom *Select3D_SensitiveEntity* implementation should be updated accordingly (including *Select3D_SensitiveSet* subclasses).
-
-@subsection upgrade_740_ocafpersistence Document format version management improvement.
-
-Previously Document format version restored by *DocumentRetrievalDriver* was propagated using static methods of the corresponding units (like *MDataStd* or *MNaming*) to static variables of these units and after that became accessible to Drivers of these units.
-Now Document format version is available to drivers via *RelocationTable*. The Relocation table now keeps *HeaderData* of the document and a format version can be extracted in the following way: *theRelocTable.GetHeaderData()->StorageVersion()*.
-Obsolete methods: *static void SetDocumentVersion (const Standard_Integer DocVersion)* and *static Standard_Integer DocumentVersion()* have been removed from *BinMDataStd*, *BinMNaming*, *XmlMDataStd* and *XmlMNaming*.
-
-@subsection upgrade_740_changed_api_of_brepmesh BRepMesh - revision of the data model
-
-The entire structure of *BRepMesh* component has been revised and separated into several logically connected classes.
-
-In new version, deflection is controlled more accurately, this may be necessary to tune parameters of call of the BRepMesh algorithm on the application side to obtain the same quality of presentation and/or performance as before.
-
-*BRepMesh_FastDiscret* and *BRepMesh_FastDiscretFace* classes have been removed.
-
-The following changes have been introduced in the API of *BRepMesh_IncrementalMesh*, component entry point:
-* Due to revised logic, *adaptiveMin* parameter of the constructor has been removed as meaningless;
-* *BRepMesh_FastDiscret::Parameters* has been moved to a separate structure called *IMeshTools_Parameters*; the signatures of related methods have been changed correspondingly.
-
-* Interface of *BRepMesh_Delaun* class has been changed.
-
-Example of usage:
-Case 1 (explicit parameters):
-~~~~
-#include <IMeshData_Status.hxx>
-#include <IMeshTools_Parameters.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-
-Standard_Boolean meshing_explicit_parameters()
-{
-  BRepMesh_IncrementalMesh aMesher (aShape, 0.1, Standard_False, 0.5, Standard_True);
-  const Standard_Integer aStatus = aMesher.GetStatusFlags();
-  return !aStatus;
-}
-
-Standard_Boolean meshing_new()
-{
-  IMeshTools_Parameters aMeshParams;
-  aMeshParams.Deflection               = 0.1;
-  aMeshParams.Angle                    = 0.5;
-  aMeshParams.Relative                 = Standard_False;
-  aMeshParams.InParallel               = Standard_True;
-  aMeshParams.MinSize                  = Precision::Confusion();
-  aMeshParams.InternalVerticesMode     = Standard_True;
-  aMeshParams.ControlSurfaceDeflection = Standard_True;
-
-  BRepMesh_IncrementalMesh aMesher (aShape, aMeshParams);
-  const Standard_Integer aStatus = aMesher.GetStatusFlags();
-  return !aStatus;
-}
-~~~~
-
-@subsection upgrade_740_chamfer Changes in API of Chamfer algorithms
-
-Some public methods of the class BRepFilletAPI_MakeChamfer are released from excess arguments:
- method Add for symmetric chamfer now takes only 2 arguments: distance and edge;
- method GetDistAngle now takes only 3 arguments: index of contour, distance and angle.
-
-@subsection upgrade_740_aspects Aspects unification
-
-Fill Area, Line and Marker aspects (classes *Graphic3d_AspectFillArea3d*, *Graphic3d_AspectLine3d*, *Graphic3d_AspectMarker3d* and *Graphic3d_AspectText3d*)
-have been merged into new class *Graphic3d_Aspects* providing a single state for rendering primitives of any type.
-The old per-primitive type aspect classes have been preserved as sub-classes of *Graphic3d_Aspects* with default values close to the previous behavior.
-All aspects except Graphic3d_AspectFillArea3d define Graphic3d_TOSM_UNLIT shading model.
-
-The previous approach with dedicated aspects per primitive type was handy in simplified case, but lead to confusion otherwise.
-In fact, drawing points or lines with lighting applied is a valid use case, but only *Graphic3d_AspectFillArea3d* previously defined necessary material properties.
-
-As aspects for different primitive types have been merged, Graphic3d_Group does no more provide per-type aspect properties.
-Existing code relying on old behavior and putting interleaved per-type aspects into single Graphic3d_Group should be updated.
-For example, the following pseudo-code will not work anymore, because all *SetGroupPrimitivesAspect* calls will setup the same property:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());    //!< overrides previous aspect
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aLines); //!< both arrays will use the same aspect
-aGroup->AddPrimitiveArray (aTris);
-~~~~
-
-To solve the problem, the code should be modified to either put primitives into dedicated groups (preferred approach), or using *SetPrimitivesAspect* in proper order:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aTris);
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-aGroup->SetPrimitivesAspect (myDrawer->LineAspect()->Aspect()); //!< next array will use the new aspect
-aGroup->AddPrimitiveArray (aLines);
-~~~~
-
-@subsection upgrade_740_materials Material definition
-
-Decomposition of Ambient, Diffuse, Specular and Emissive properties has been eliminated within *Graphic3d_MaterialAspect* definition.
-As result, the following methods of *Graphic3d_MaterialAspect* class have been removed: SetReflectionMode(), SetReflectionModeOn(), Ambient(), Diffuse(), Emissive(), Specular(), SetAmbient(), SetDiffuse(), SetSpecular(), SetEmissive().
-
-Previously, computation of final value required the following code:
-~~~~
-Graphic3d_MaterialAspect theMaterial; Quantity_Color theInteriorColor;
-Graphic3d_Vec3 anAmbient (0.0f);
-if (theMaterial.ReflectionMode (Graphic3d_TOR_AMBIENT))
-{
-  anAmbient = theMaterial.MaterialType (Graphic3d_MATERIAL_ASPECT)
-            ? (Graphic3d_Vec3 )theInteriorColor           * theMaterial.Ambient()
-            : (Graphic3d_Vec3 )theMaterial.AmbientColor() * theMaterial.Ambient();
-}
-~~~~
-
-New code looks like this:
-~~~~
-Graphic3d_MaterialAspect theMaterial; Quantity_Color theInteriorColor;
-Graphic3d_Vec3 anAmbient = theMaterial.AmbientColor();
-if (theMaterial.MaterialType (Graphic3d_MATERIAL_ASPECT)) { anAmbient *= (Graphic3d_Vec3 )theInteriorColor; }
-~~~~
-
-Existing code should be updated to:
- Replace Graphic3d_MaterialAspect::SetReflectionModeOff() with setting black color; SetReflectionModeOn() calls can be simply removed.
-  R.g. theMaterial.SetAmbientColor(Quantity_NOC_BLACK).
- Replace Graphic3d_MaterialAspect::Ambient(), SetAmbient(), Diffuse(), SetDiffuse(), Specular(), SetSpecular(), Emissive(), SetEmissive() with methods working with pre-multiplied color.
-  E.g. theMaterial.SetAmbientColor(Graphic3d_Vec3 (1.0f, 0.0f, 0.0f) * 0.2f).
- Avoid using Graphic3d_MaterialAspect::Color() and SetColor() with non-physical materials (Graphic3d_MATERIAL_ASPECT).
-  These materials do not include color definition, because it is taken from Graphic3d_Aspects::InteriorColor() - this has not been changed.
-  However, previously it was possible storing the color with SetColor() call and then fetching it with Color() by application code (the rendering ignored this value);
-  now SetColor() explicitly ignores call for Graphic3d_MATERIAL_ASPECT materials and Color() returns DiffuseColor() multiplication coefficients.
-
-@subsection upgrade_740_text Changes in Graphic3d_Text and OpenGl_Text API
-
-Parameters of *Text* in *Graphic3d_Group* are moved into a new *Graphic3d_Text* class. *AddText* of *Graphic3d_Group* should be used instead of the previous *Text*.
-
-The previous code:
-~~~~
-Standard_Real x, y, z;
-theAttachmentPoint.Coord(x,y,z);
-theGroup->Text (theText,
-                Graphic3d_Vertex(x,y,z),
-                theAspect->Height(),
-                theAspect->Angle(),
-                theAspect->Orientation(),
-                theAspect->HorizontalJustification(),
-                theAspect->VerticalJustification());
-~~~~
-should be replaced by the new code:
-~~~~
-Handle(Graphic3d_Text) aText = new Graphic3d_Text (theAspect->Height());
-aText->SetText (theText.ToExtString());
-aText->SetPosition (theAttachmentPoint);
-aText->SetHorizontalAlignment (theAspect->HorizontalJustification());
-aText->SetVerticalAlignment (theAspect->VerticalJustification());
-theGroup->AddText (aText);
-~~~~
-
-*OpenGl_Text* contains *Graphic3d_Text* field.
-
-*OpenGl_TextParam* struct is removed. Constructor and *Init* of *OpenGl_Text* with *OpenGl_TextParam* are also removed.
-Instead of using them, change *OpenGl_Text*.
-
-Please, note, that after modifying *OpenGl_Text*, *Reset* of *OpenGl_Text* should be called.
-
-*FormatParams* of *OpenGl_Text* is replaced by *Text*.
-
-@subsection upgrade_740_prsupdate Presentation invalidation
-
-Historically AIS_InteractiveObject provided two independent mechanisms invalidating presentation (asking presentation manager to recompute specific display mode or all modes):
-
-1. *AIS_InteractiveObject::SetToUpdate()*, marking existing presentation for update.
-   This is main invalidation API, which is expected to be followed by *AIS_InteractiveContext::Update()* call.
-2. *AIS_InteractiveObject::myToRecomputeModes* + *myRecomputeEveryPrs*.
-   This is auxiliary invalidation API, used internally by AIS_InteractiveContext::SetColor()/UnsetColor() and similar modification methods.
-
-The latter one has been removed to avoid confusion and unexpected behavior.
-In addition, two methods *AIS_InteractiveObject::Update()* have been deprecated in favor of new *AIS_InteractiveObject::UpdatePresentations()* recomputing only invalidated presentations.
-
-Custom presentations implementing interface methods *AIS_InteractiveObject::SetColor()* and others should be revised to use *AIS_InteractiveObject::SetToUpdate()*
-or updating presentation without recomputation (see *AIS_InteractiveObject::SynchronizeAspects()* and *AIS_InteractiveObject::replaceAspects()*).
-
-@subsection upgrade_740_interiorstyles Interior styles
-
-* *Aspect_IS_HOLLOW* is now an alias to *Aspect_IS_EMPTY* and does not implicitly enables drawing mesh edges anymore.
-  Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_EMPTY) to get previous behavior of Aspect_IS_HOLLOW style.
-* *Aspect_IS_HIDDENLINE* does not implicitly enables drawing mesh edges anymore.
-  Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_HIDDENLINE) to get previous behavior of Aspect_IS_HIDDENLINE style.
-
-@subsection upgrade_740_modedprs PrsMgr and SelectMgr hierarchy clean up
-
-Proxy classes *Prs3d_Presentation*, *PrsMgr_ModedPresentation* and *PrsMgr_Prs* have been removed.
-Code iterating through the list of low-level structures AIS_InteractiveObject::Presentations() should be updated to access PrsMgr_Presentation directly.
-Forward declarations of *Prs3d_Presentation* should be corrected, since it is now a typedef to *Graphic3d_Structure*.
-
-Proxy classes *SelectBasics_SensitiveEntity* and *SelectBasics_EntityOwner* have been removed - *Select3D_SensitiveEntity* and *SelectMgr_EntityOwner* should be now used directly instead.
-
-@subsection upgrade_740_offset Polygon offset defaults
-
-*Graphic3d_PolygonOffset* default constructor has been corrected to define Units=1 instead of Units=0.
-Default polygon offset settings Mode=Aspect_POM_Fill + Factor=1 + Units=1 are intended to push triangulation
-(Shaded presentation) a little bit behind of lines (Wireframe and Face Edges)
-for reducing z-fighting effect of Shaded+Wireframe combination.
-The change in defaults (Units changed from 0 to 1) is intended to cover scenario when camera direction is perpendicular to model plane (like 2D view).
-
-Application observing unexpected visual difference on this change should consider customizing this property within AIS_InteractiveContext default attributes
-or on per-presentation basis via *Graphic3d_Aspects::SetPolygonOffset()* methods.
-
-@subsection upgrade_740_zlayer Adding ZLayers in given position
-
-Interface of insertion ZLayer in the viewer has been improved with ability to insert new layer before or after existing one.
-Previously undocumented behavior of *V3d_Viewer::AddZlayer()* method has been corrected to insert new layer before *Graphic3d_ZLayerId_Top*.
-Applications might need revising their custom layers creation code and specify precisely their order with new methods *V3d_Viewer::InsertLayerBefore()* and *V3d_Viewer::InsertLayerAfter()*.
-
-@subsection upgrade_740_enum_changed Modified enumerations
-
-Applications using integer values of the following enumerations in persistence
-should be corrected as these enumerations have been modified:
-
-| Name |
-| :----- |
-| AIS_TypeOfAttribute |
-| Aspect_InteriorStyle |
-| Font_FontAspect |
-
-@subsection upgrade_740_geproj Custom defines within env.bat
-
-*env.bat* produced by Visual Studio project generator *genproj.bat* has been modified so that *%CSF_DEFINES%* variable is reset to initial state.
-Custom building environment relying on old behavior and setting extra macros within *%CSF_DEFINES%* before env.bat should be updated
-to either modify custom.bat or setup new variable *%CSF_DEFINES_EXTRA%* instead.
-
-@subsection upgrade_740_BVH_in_BOP Switching Boolean Operations algorithm to use BVH tree instead of UB tree
-
-Since OCCT 7.4.0 Boolean Operations algorithm uses BVH tree instead of UBTree to find the pairs of entities with interfering bounding boxes.
-The following API changes have been made:
-* BOPTools_BoxBndTree and BOPTools_BoxBndTreeSelector have been removed. Use the BOPTools_BoxTree and BOPTools_BoxTreeSelector instead.
-* BOPTools_BoxSelector::SetBox() method now accepts the BVH_Box instead of Bnd_Box.
-* Methods BOPTools_BoxSelector::Reject and BOPTools_BoxSelector::Accept have been removed as unused.
-* The RunParallel flag has been removed from the list of parameters of BOPAlgo_Tools::IntersectVertices method. Earlier, it performed selection from the UB tree in parallel mode. Now all interfering pairs are found in one pass, using pair traverse of the same BVH tree.
-
-@subsection upgrade_740_stdnamespace Standard_Stream.hxx no more has "using std::" statements
-*Standard_Stream.hxx* header, commonly included by other OCCT header files, does no more add entities from *std namespace* related to streams (like *std::cout*, *std::istream* and others) into global namespace.
-The application code relying on this matter should be updated to either specify std namespace explicitly (like std::cout) or add "using std::" statements locally.
-
-@section upgrade_occt750 Upgrade to OCCT 7.5.0
-
-@subsection upgrade_750_srgb_color RGB color definition
-
-OCCT 3D Viewer has been improved to properly perform lighting using in linear RGB color space and then convert result into non-linear gamma-shifted sRGB color space before displaying on display.
-This change affects texture mapping, material definition and color definition.
-
-Previously *Quantity_Color* definition was provided with unspecified RGB color space.
-In practice, mixed color spaces have been actually used, with non-linear sRGB prevailing in general.
-Since OCCT 7.5.0, *Quantity_Color* now specifies that components are defined in linear RGB color space.
-
-This change affects following parts:
-* Standard colors defined by *Quantity_NameOfColor* enumeration have been converted into linear RGB values within Quantity_Color construction.
-* Application may use new enumeration value *Quantity_TOC_sRGB* for passing/fetching colors in sRGB color space,
-  which can be useful for interoperation with color picking widgets (returning 8-bit integer values within [0..255] range)
-  or for porting colors constants within old application code without manual conversion.
-* *Graphic3d_MaterialAspect* color components are now expected in linear RGB color space,
-  and standard OCCT materials within *Graphic3d_NameOfMaterial* enumeration have been updated accordingly.
-* Texture mapping now handles new *Graphic3d_TextureRoot::IsColorMap()* for interpreting content in linear RGB or sRGB color space.
-  It is responsibility of user specifying this flag correctly. The flag value is TRUE by default.
-* Method *Image_PixMap::PixelColor()* has been extended with a new Boolean flag for performing linearization of non-linear sRGB.
-  This flag is FALSE by default; application should consider passing TRUE instead for further handling *Quantity_Color* properly as linear RGB values.
-
-@subsection upgrade_750_aspectwindow Aspect_Window interface change
-
-Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so that application classes implementing this interface should be updated accordingly.
-
-@subsection upgrade_750_rename Renaming of types
-
-Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity.
+The following public methods of the *BOPAlgo_BuilderSolid* class have been removed as excessive:
+* void SetSolid(const TopoDS_Solid& theSolid);
+* const TopoDS_Solid& Solid() const;
--- a/dox/overview/images/overview_3rdparty.png
+++ b/dox/overview/images/overview_3rdparty.png
--- a/dox/overview/images/overview_installation.png
+++ b/dox/overview/images/overview_installation.png
--- a/dox/overview/images/sample_webgl.png
+++ b/dox/overview/images/sample_webgl.png
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -18,7 +18,7 @@ modeling (CAD), manufacturing / measuring (CAM) or numerical simulation (CAE).
@section OCCT_OVW_SECTION_2 Copyrights

 Open CASCADE Technology and all materials, including this documentation, is 
-Copyright (c) 1999-2018 by OPEN CASCADE S.A.S. All rights reserved.
+Copyright (c) 1999-2017 by OPEN CASCADE S.A.S. All rights reserved.

@htmlonly<center>@endhtmlonly
 https://www.opencascade.com
@@ -32,7 +32,7 @@ Open CASCADE Technology is free software; you can redistribute it and / or modif
@ref license_lgpl_21 "GNU Lesser General Public License (LGPL) version 2.1", with additional @ref occt_lgpl_exception "exception".

 Note that LGPL imposes some obligations on the application linked with Open CASCADE Technology.
-If you wish to use OCCT in a proprietary application, please pay a special attention to address the requirements of LGPL section 6.
+If you wish to use OCCT in a proprietary application, please, pay special attention to address the requirements of LGPL section 6.
 At minimum the following should be considered:
 1. Add the notice visible to the users of your application clearly stating that Open CASCADE Technology is used in this application, and that they have rights in this regard according to LGPL. 
   Such notice can be added in About dialog box (this is mandatory if this box contains copyright statements) or a similar place and/or in the documentation. 
@@ -55,7 +55,7 @@ disclaimer.

 You are hereby informed that all software is a property of its respective authors and is protected by 
 international and domestic laws on intellectual property and trademarks. 
-Should you need further information, directly contact the authors.
+Should you need further information, please directly contact the authors.

 **CAS.CADE** and **Open CASCADE** are registered trademarks of 
 OPEN CASCADE S.A.S.
@@ -80,7 +80,7 @@ and, in case you need any further information, directly contact their authors.
 **Qt** is a cross-platform application framework that is widely used for developing application software 
 with graphical user interface (GUI). Qt is free and open source software distributed under 
 the terms of the GNU Lesser General Public License. In OCCT Qt is used for programming samples. 
-If you need further information on Qt, refer to Qt Homepage (https://www.qt.io/)
+If you need further information on Qt, please, refer to Qt Homepage (https://www.qt.io/)

 **Tcl** is a high-level programming language. Tk is a graphical user interface (GUI) toolkit, 
 with buttons, menus, listboxes, scrollbars, and so on. Taken together Tcl and Tk provide a solution 
@@ -88,7 +88,11 @@ to develop cross-platform graphical user interfaces with a native look and feel.
 Scriptics Corp., Sun Microsystems, and other companies. However, Tcl/Tk is an open source, and 
 the copyright allows you to use, modify, and redistribute Tcl/Tk for any purpose, without an 
 explicit license agreement and without paying any license fees or royalties. 
-To use Tcl/Tk, refer to the Licensing Terms (https://www.tcl.tk/software/tcltk/license.html).
+To use Tcl/Tk, please refer to the Licensing Terms (https://www.tcl.tk/software/tcltk/license.html).
+
+**GL2PS** is developed by Christophe Geuzaine and others. It is optionally used by OCCT to
+export content of OpenGL scene to vector graphics formats (PS, PDF, EMF, SVG). 
+The library is licensed under GL2PS license (http://www.geuz.org/gl2ps/COPYING.GL2PS).

 **FreeType 2** is developed by Antoine Leca, David Turner, Werner Lemberg and others. 
 It is a software font engine that is designed to be small, efficient, highly customizable and 
@@ -109,18 +113,18 @@ implementation of 3D viewer. OpenGL specification is developed by the
 Khronos group, https://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, refer to VTK Homepage https://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 
 for automatic creation of Technical Documentation from C++ header files. 
-If you need further information on Doxygen, refer to https://www.stack.nl/~dimitri/doxygen/index.html.
+If you need further information on Doxygen, please refer to https://www.stack.nl/~dimitri/doxygen/index.html.

 **Graphviz** is open source graph visualization software developed by John Ellson, Emden Gansner, Yifan Hu and Arif Bilgin. 
 Graph visualization is representiation of structured information as diagrams of abstract graphs and networks. 
 This product is used together with Doxygen in Open CASCADE Technology for automatic creation of Technical Documentation 
 (generation of dependency graphs). Current versions of Graphviz are licensed on an open source 
-basis under The Eclipse Public License (EPL) (https://www.graphviz.org/license/).
+basis under The Eclipse Public License (EPL) (http://www.graphviz.org/License.php).

 **Inno Setup** is a free script-driven installation system created in CodeGear Delphi by Jordan Russell. 
 In OCCT Inno Setup is used to create Installation Wizard on Windows. 
@@ -130,10 +134,10 @@ It is licensed under Inno Setup License (http://www.jrsoftware.org/files/is/lice
 and others used by multimedia applications. This library is developed by Hervé Drolon and Floris van den Berg. 
 FreeImage is easy to use, fast, multithreading safe, compatible with all 32-bit or 64-bit versions of Windows, 
 and cross-platform (works both with Linux and Mac OS X). FreeImage is optionally used by OCCT to work
-with images, on conditions of the FreeImage Public License (FIPL) (https://freeimage.sourceforge.net/freeimage-license.txt).
+with images, on conditions of the FreeImage Public License (FIPL) (http://freeimage.sourceforge.net/freeimage-license.txt).

 **David M. Gay's floating point routines** (dtoa.c) are used for fast reading of floating point values from text strings.
-These routines are available under MIT-like license (see https://www.netlib.org/fp/).
+These routines are available under MIT-like license (see http://www.netlib.org/fp/).

 **CMake** is an open-source, cross-platform family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files, and generate native makefiles and workspaces that can be used in the compiler environment of your choice. 
 OCCT uses CMake as a build system. CMake is available under BSD 3-Clause license. See more at https://cmake.org/
@@ -150,12 +154,6 @@ FFmpeg is optionally used by OCCT for video recording, on LGPL conditions (https
 for generation of User and Developer Guides in PDF format. See https://miktex.org for information
 on this tool.

-**RapidJSON** is an Open Source JSON parser and generator for C++.
-RapidJSON is optionally used by OCCT for reading glTF files (https://rapidjson.org/).
-
-**DejaVu** fonts are a font family based on the Vera Fonts under a permissive license (MIT-like, https://dejavu-fonts.github.io/License.html).
-DejaVu Sans (basic Latin sub-set) is used by OCCT as fallback font when no system font is available.
-
 Adobe Systems, Inc. provides **Adobe Reader**, which can be used to view files in Portable Document Format (PDF). 

@section OCCT_OVW_SECTION_3 Documentation
@@ -210,13 +208,13 @@ for which OCCT is certified to work.

 | OS        | Compiler |
 | --------- | ----------- |
-| Windows   | Microsoft Visual Studio: 2008 SP1, 2010 SP1, 2012 Update 4, 2013 Update 5, 2015 Update 3, 2017 <sup>1</sup>, 2019 <br> GCC 4.3+ (Mingw-w64)|
+| Windows   | Microsoft Visual Studio: 2008 SP1, 2010 SP1<sup>1</sup>, 2012 Update 4, 2013 Update 5, 2015, 2017 <br> GCC 4.3+ (Mingw-w64)|
 | Linux     | GNU gcc 4.3+ <br> LLVM CLang 3.6+ |
 | OS X / macOS | XCode 6 or newer |
 | Android   | NDK r10, GNU gcc 4.8 or newer |
-| Web       | Emscripten SDK 1.39 or newer (CLang) |

-1) VC++ 141 64-bit is used for regular testing and for building binary package of official release of OCCT on Windows.
+1) VC++ 10 64-bit is used for regular testing and for building 
+  binary package of official release of OCCT on Windows.

@subsection overview_req_libs Third-party libraries

@@ -225,12 +223,12 @@ for which OCCT is certified to work.
 | Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ <br> Direct3D 9 |
 | Qt (for samples and demos) | Desktop: Qt 4.8.6+ https://www.qt.io/download/ <br> Android: Qt 5.3.2+ https://www.qt.io/download/ |
 | TCL (for testing tools)    | Tcl/Tk 8.6.3+ https://www.tcl.tk/software/tcltk/download.html <br> or ActiveTcl 8.6 https://www.activestate.com/activetcl/downloads (for Windows)| 
-| Freetype (for text rendering) | FreeType 2.4.11-2.7.1 https://sourceforge.net/projects/freetype/files/ |
+| Freetype (for text rendering) | FreeType 2.4.11-2.5.5 https://sourceforge.net/projects/freetype/files/ |
 | FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ https://sourceforge.net/projects/freeimage/files |
 | FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org/download.html |
-| RapidJSON (optional, for reading glTF) | RapidJSON 1.1+ https://rapidjson.org/ |
+| 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 https://www.threadingbuildingblocks.org/ |
-| VTK (for VTK Integration Services | VTK 6.1+ https://www.vtk.org/download/ |
+| VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/download/ |
 | Doxygen (optional for building documentation) | Doxygen 1.8.5+ https://www.stack.nl/~dimitri/doxygen/download.html |

@subsection overview_req_hw Hardware
@@ -288,13 +286,13 @@ When the installation is complete, you will find the directories for 3rd party p

@figure{/overview/images/overview_3rdparty.png}

-The contents of the OCCT-7.4.0 directory (called further "OCCT root", or $CASROOT) are as follows:
+The contents of the OCCT-7.0.0 directory (called further "OCCT root", or $CASROOT) are as follows:

@figure{/overview/images/overview_installation.png, "The directory tree"}

  * **adm**   This folder contains administration files, which allow rebuilding OCCT;
  * **adm/cmake**  This folder contains files of CMake building procedure;
-  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++ 2010, 2012, 2013, 2015, 2017 and 2019 which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
+  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++  2005, 2008, 2010, 2012 and 2013 which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
  * **data**  This folder contains CAD files in different formats, which can be used to test the OCCT functionality;
  * **doc**  This folder contains OCCT documentation in HTML and PDF format;
  * **dox**  This folder contains sources of OCCT documentation in plain text (MarkDown) format;
@@ -302,7 +300,6 @@ The contents of the OCCT-7.4.0 directory (called further "OCCT root", or $CASROO
  * **samples**  This folder contains sample applications.
  * **src**  This folder contains OCCT source files. They are organized in folders, one per development unit;
  * **tests**  This folder contains scripts for OCCT testing.
-  * **tools**  This folder contains sources of Inspector tool.
  * **win64/vc10**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2010;

@section OCCT_OVW_SECTION_4_2 Environment Variables
@@ -313,7 +310,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 (vc10 -- vc142) 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. 
@@ -336,7 +333,7 @@ The scripts are located in the OCCT root folder.

  * **CASROOT** is used to define the root directory of Open CASCADE Technology;
  * **PATH** is required to define the path to OCCT binaries and 3rdparty folder;
-  * **LD_LIBRARY_PATH** is required to define the path to OCCT libraries (on UNIX platforms only; **DYLD_LIBRARY_PATH** variable in case of macOS);
+  * **LD_LIBRARY_PATH** is required to define the path to OCCT libraries (on UNIX platforms only);
  * **MMGT_OPT** (optional) if set to 1, the memory manager performs optimizations as described below; if set to 2, 
    Intel (R) TBB optimized memory manager is used; if 0 (default), every memory block is allocated 
    in C memory heap directly (via malloc() and free() functions). 
@@ -403,7 +400,7 @@ the specified resource file and activates the commands implemented in the plug-i
 The whole process of using the plug-in mechanism as well as the instructions for extending Test Harness is described in the @ref occt_user_guides__test_harness.

 Draw Test Harness provides an environment for OCCT automated testing system. 
-Check its @ref occt_dev_guides__tests "Automated Testing System" for details.
+Please, consult its @ref occt_dev_guides__tests "Automated Testing System" for details.

 Remarks:

@@ -417,7 +414,8 @@ Remarks:

 **On Linux:**

-* If OCCT was built by Code::Blocks  use <i>$CASROOT/draw.sh</i> file to launch *DRAWEXE* executable.
+1. If OCCT was built by Code::Blocks  use <i>$CASROOT/draw_cbp.sh</i> file to launch *DRAWEXE* executable;
+2. If OCCT was built by Automake    use <i>$CASROOT/draw_amk.sh</i> file to launch *DRAWEXE* executable;

 Draw[1]> prompt appears in the command window

@@ -573,11 +571,3 @@ There is a sample demonstrating usage of OCCT on iOS with Apple UIKit framework.
@figure{/overview/images/sample_ios_uikit.png}

 See \subpage occt_samples_ios_uikit "iOS sample Readme" for details.
-
-@subsubsection OCCT_OVW_SECTION_7_3_6 Web
-
-WebGL Viewer sample demonstrating usage of OCCT 3D Viewer in Web browser with Emscripten SDK can be found in `samples/webgl`.
-
-@figure{/overview/images/sample_webgl.png}
-
-See \subpage occt_samples_webgl "WebGL sample Readme" for details.
--- a/dox/resources/occ_logo.png
+++ b/dox/resources/occ_logo.png
--- a/dox/resources/occt_rm.doxyfile
+++ b/dox/resources/occt_rm.doxyfile
@@ -23,7 +23,7 @@ WARNINGS               = NO
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC "Standard_DEPRECATED=//! @deprecated "
+PREDEFINED             = Standard_EXPORT Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 SEARCH_INCLUDES        = YES
--- a/dox/resources/occt_ug_html.doxyfile
+++ b/dox/resources/occt_ug_html.doxyfile
@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
@@ -55,6 +56,6 @@ USE_MATHJAX            = YES
 MATHJAX_FORMAT         = HTML-CSS

 # Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image html \1"
-ALIASES += figure{2}="\image html \1 \2"
-ALIASES += figure{3}="\image html \1 \2"
+ALIASES += figure{1}="\image html \1 \n"
+ALIASES += figure{2}="\image html \1 \2 \n"
+ALIASES += figure{3}="\image html \1 \2 \n"
--- a/dox/resources/occt_ug_pdf.doxyfile
+++ b/dox/resources/occt_ug_pdf.doxyfile
@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
--- a/dox/technical_overview/technical_overview.md
+++ b/dox/technical_overview/technical_overview.md
@@ -56,9 +56,9 @@ This module also provides a variety of general-purpose services, such as:
  * Progress indication and user break interfaces, giving a possibility even for low-level algorithms to communicate with the user in a universal and convenient way;
  * and many others...

-See the details in @ref occt_user_guides__foundation_classes "Foundation Classes User's Guide"
+Please, see the details in @ref occt_user_guides__foundation_classes "Foundation Classes User's Guide"

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

@section OCCT_TOVW_SECTION_3 Modeling Data

@@ -85,12 +85,12 @@ Topology defines relationships between simple geometric entities.  A shape, whic

 Complex shapes can be defined as assemblies of simpler entities.

-See the details in @ref occt_user_guides__modeling_data "Modeling Data User's Guide"
+Please, see the details in @ref occt_user_guides__modeling_data "Modeling Data User's Guide"

 3D geometric models can be stored in OCCT native BREP format.
 See @ref occt_user_guides__brep_wp "BREP Format Description White Paper" for details on the format.

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

@section OCCT_TOVW_SECTION_4 Modeling Algorithms

@@ -147,9 +147,9 @@ See @ref occt_user_guides__boolean_operations "Boolean Operations" User's Guide

@figure{/technical_overview/images/0004.png}
 
-See the details in @ref occt_user_guides__modeling_algos "Modeling Algorithms User's Guide".
+Please, see the details in @ref occt_user_guides__modeling_algos "Modeling Algorithms User's Guide".

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

@section OCCT_TOVW_SECTION_4a Mesh 

@@ -163,8 +163,8 @@ Open CASCADE Technology includes two mesh converters:
 - STL converter translates Open CASCADE shapes to STL files. STL (STtereoLithography) format is widely used for rapid prototyping (3D printing).

 Open CASCADE SAS also offers Advanced Mesh Products:
- <a href="https://www.opencascade.com/content/mesh-framework">Open CASCADE Mesh Framework (OMF)</a>
- <a href="https://www.opencascade.com/content/express-mesh">Express Mesh</a>
+- <a href="http://www.opencascade.com/content/mesh-framework">Open CASCADE Mesh Framework (OMF)</a>
+- <a href="http://www.opencascade.com/content/express-mesh">Express Mesh</a>

@figure{/technical_overview/images/0003.png}

@@ -204,11 +204,11 @@ Here are just a few examples:

@figure{/technical_overview/images/0008.png, "Display of shape cross-section and dimensions"}

-For more details, see @ref occt_user_guides__visualization "Visualization User's Guide".
+For more details see @ref occt_user_guides__visualization "Visualization User's Guide".

 The visualization of OCCT topological shapes by means of VTK library provided by VIS component is described in a separate @ref occt_user_guides__vis "VTK Integration Services" User's Guide.

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


@section OCCT_TOVW_SECTION_6 Data Exchange
@@ -222,14 +222,12 @@ See also: our <a href="https://www.opencascade.com/content/tutorial-learning">E-
 * **Standardized Data Exchange** interfaces allow querying and examining the input file, converting its contents to a CAD model and running validity checks on a fully translated shape. The following formats are currently supported.
 	* @ref occt_user_guides__step "STEP" (AP203 : Mechanical Design, this covers General 3D CAD; AP214: Automotive Design) 
 	* @ref occt_user_guides__iges "IGES" (up to 5.3) 
-	* glTF, OBJ, VRML and STL meshes.
+	* VRML and STL meshes. 
 * @ref occt_user_guides__xde "Extended data exchange" (XDE) allows translating  additional attributes attached to geometric data (colors, layers, names, materials etc).
-* <a href="https://www.opencascade.com/content/advanced-data-exchange-components">Advanced Data Exchange Components</a> are available in addition to standard Data Exchange interfaces to support interoperability and data adaptation (also using @ref OCCT_TOVW_SECTION_6a "Shape Healing") with CAD software using the following proprietary formats:
-	* <a href="https://www.opencascade.com/content/acis-sat-import-export">ACIS SAT</a>
-	* <a href="https://www.opencascade.com/content/parasolid-import">Parasolid</a>
-	* <a href="https://www.opencascade.com/content/dxf-import-export">DXF</a>
-	* <a href="https://www.opencascade.com/content/ifc-import">IFC</a>
-	* <a href="https://www.opencascade.com/content/jt-import-export">JT</a>
+* <a href="http://www.opencascade.com/content/advanced-data-exchange-components">Advanced Data Exchange Components</a> are available in addition to standard Data Exchange interfaces to support interoperability and data adaptation (also using @ref OCCT_TOVW_SECTION_6a "Shape Healing") with CAD software using the following proprietary formats:
+	* <a href="http://www.opencascade.com/content/acis-sat-import-export">ACIS SAT</a>
+	* <a href="http://www.opencascade.com/content/parasolid-import">Parasolid</a>
+	* <a href="http://www.opencascade.com/content/dxf-import-export">DXF</a> 

 These components are based on the same architecture as interfaces with STEP and IGES.

@@ -265,9 +263,9 @@ Each sub-domain of Shape Healing has its own scope of functionality:
 | Customization | Modifies the shape representation to fit specific needs. | The shape is not modified, only the mathematical form of its internal representation is changed. |
 | Processing | Mechanism of shape modification via a user-editable resource file. | |

-For more details, refer to @ref occt_user_guides__shape_healing "Shape Healing User's guide".
+For more details refer to @ref occt_user_guides__shape_healing "Shape Healing User's guide".

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


@section OCCT_TOVW_SECTION_7 Application Framework
@@ -287,9 +285,9 @@ 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". 
+For more details see @ref occt_user_guides__ocaf "OCAF User's Guide". 

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


@section OCCT_TOVW_SECTION_8 Draw Test Harness
@@ -312,4 +310,4 @@ In addition, **Test Harness** provides commands to create and manipulate curves

 You can add custom commands to test or demonstrate any new functionalities, which you develop.

-For more details, see @ref occt_user_guides__test_harness "Draw Test Harness Manual".
+For more details see @ref occt_user_guides__test_harness "Draw Test Harness Manual".
--- a/dox/tutorial/tutorial.md
+++ b/dox/tutorial/tutorial.md
@@ -701,7 +701,7 @@ Congratulations! Your bottle is complete. Here is the result snapshot of the Tut
@figure{/tutorial/images/tutorial_image019.png,"",320}

 We hope that this tutorial has provided you with a feel for the industrial strength power of Open CASCADE Technology.
-If you want to know more and develop major projects using Open CASCADE Technology, we invite you to study our training, support, and consulting services on our site at https://www.opencascade.com/content/technology-support. Our professional services can maximize the power of your Open CASCADE Technology applications.
+If you want to know more and develop major projects using Open CASCADE Technology, we invite you to study our training, support, and consulting services on our site at http://www.opencascade.com/content/technology-support. Our professional services can maximize the power of your Open CASCADE Technology applications.


@section sec6 Appendix
--- a/dox/user_guides/boolean_operations/boolean_operations.md
+++ b/dox/user_guides/boolean_operations/boolean_operations.md
@@ -797,7 +797,7 @@ The General Fuse algorithm has a set of options, which allow speeding-up the ope
 * Usage of Oriented Bounding Boxes in the operation;
 * History support.

-For more detailed information on these options, see the @ref occt_algorithms_11a "Advanced options" section.
+For more detailed information on these options please see the @ref occt_algorithms_11a "Advanced options" section.

@subsection occt_algorithms_7_3b Usage

@@ -900,7 +900,7 @@ bbuild result

@subsection occt_algorithms_7_3 Examples

-Have a look at the examples to better understand the definitions.
+Please, have a look at the examples, which can help to better understand the definitions.

@subsubsection occt_algorithms_7_3_1	Case 1: Three edges intersecting at a point 

@@ -1891,21 +1891,6 @@ The input data for this step is as follows:
 | 2.3 |	Build solids <i>(SDi)</i> from *SFS*. |	*BOPAlgo_BuilderSolid* |
 | 2.4 |	Add the solids <i>(SDi)</i> to the result	| |

-@subsection occt_algorithms_bop_on_opensolids Boolean operations on open solids
-
-The Boolean operations on open solids are tricky enough that the standard approach of Boolean operations for building the result, based on the splits of solids does not work.
-It happens because the algorithm for splitting solids (*BOPAlgo_BuilderSolid*) always tries to create the closed loops (shells) and make solids from them. But if the input solid is not closed, what can be expected from its splits?
-For performing Boolean Operations on open solids another approach is used, which does not rely on the splits of the solids to be correct, but tries to select the splits of faces, which are necessary for the given type of operation.
-The point here is that the type of Boolean operation clearly defines the states for the faces to be taken into result:
- For **COMMON** operation all the faces from the arguments located inside any solid of the opposite group must be taken;
- For **FUSE** operation all the faces from the arguments located outside of all solids of the opposite group must be taken;
- For **CUT** operation all the faces from the Objects located outside of all solids of the Tools and all faces from the Tools located inside any solid of the Objects must be taken;
- For **CUT21** operation all the faces from the Objects located inside any solid of the Tools and all faces from the Tools located outside of all solids of the Objects must be taken.
-From the selected faces the result solids are built. Please note, that the result may contain as normal (closed) solids as the open ones.
-
-Even with this approach, the correct result of Boolean operation on open solids cannot be always guaranteed.
-This is explained by non-manifold nature of open solids: in some cases classification of a face depends on the point of the face chosen for classification.
-
@section occt_algorithms_10a Section Algorithm 

@subsection occt_algorithms_10a_1 Arguments
@@ -2186,7 +2171,7 @@ aMV.SetArguments(aLS);
 // setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
 ...
 // Additional option of the algorithm
-Standard_Boolean bAvoidInternalShapes = Standard_False; // Set to True to exclude from the result any shapes internal to the solids
+Standard_Boolean bAvoidInternalShapes = Standard_False; /* Avoid or not the internal for solids shapes in the result*/
 aMV.SetAvoidInternalShapes(bAvoidInternalShapes);

 // Perform the operation
@@ -2443,7 +2428,7 @@ A lot of failures of GFA algorithm can be caused by bugs in low-level algorithms
 * 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.
+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.


@subsection occt_algorithms_10_1	Arguments
@@ -2539,7 +2524,7 @@ Let us also consider a cylinder-based *Face 2* with radii *R=3000* and *H=6000*

@figure{/user_guides/boolean_operations/images/operations_image047.png,"P-Curves for Face 2",230}

-Pay attention to the Zoom value of the Figures.
+Please, pay attention to the Zoom value of the Figures.

 It is obvious that starting with some value of *ScF*, e.g. *ScF>1000000*, all sloped p-Curves on *Face 2*  will be almost vertical. At least, there will be no difference between the values of angles computed by standard C Run-Time Library functions, such as *double acos(double x)*. The loss of accuracy in computation of angles can cause failure of some BP sub-algorithms, such as building faces from a set of edges or building solids from a set of faces.

@@ -2834,10 +2819,10 @@ To enable the safe processing mode for the operation in DRAW, it is necessary to
 bnondestructive 1
 ~~~~

-@subsection occt_algorithms_11a_4 How to disable check of input solids for inverted status
+@subsection occt_algorithms_11a_4 Disabling check of the input solids for inverted status

-By default, all input solids are checked for inverted status, i.e. the solids are classified to understand if they are holes in the space (negative volumes) or normal solids (positive volumes). The possibility to disable the check of the input solids for inverted status is the advanced option in Boolean Operation component. This option can be applied to all Basic operations, such as General Fuse, Splitting, Boolean, Section, Maker Volume and Cells building.
-This option allows avoiding time-consuming classification of the input solids and processing them in the same way as positive volumes, saving up to 10 percent of time on the cases with a big number of input solids.
+By default, all input solids are checked for inverted status, i.e. the solids are classified to understand if they are holes in the space (negative volumes) or normal solids (positive volumes). The possibility to disable the check of the input solids for inverted status is the advanced option in Boolean Operation component. This option can be applied to all Basic operations such as General Fuse, Splitting, Boolean, Section, Maker Volume, Cells building.
+This option allows avoiding time-consuming classification of the input solids and operate with them as with positive volumes, saving up to 10 percent of time on the cases with big number of input solids.

 The classification should be disabled only if the user is sure that there are no negative volumes among the input solids, otherwise the result may be invalid.

@@ -2857,7 +2842,7 @@ aGF.SetCheckInverted(Standard_False);
 ~~~~

 #### TCL level
-To enable/disable the classification of the solids in DRAW, it is necessary to call *bcheckinverted* command with the appropriate value:
+To enable/disable the classification of the solids in DRAW, it is necessary to call the *bcheckinverted* command with appropriate value:
 * 0 - disabling the classification;
 * 1 - default value, enabling the classification.

@@ -2867,7 +2852,7 @@ bcheckinverted 0

@subsection occt_algorithms_11a_5_obb Usage of Oriented Bounding Boxes

-Since Oriented Bounding Boxes are usually much tighter than Axes Aligned Bounding Boxes (for more information on OBB see the @ref occt_modat_6 "Bounding boxes" chapter of Modeling data User guide) its usage can significantly speed-up the intersection stage of the operation by reducing the number of interfering objects.
+Since Oriented Bounding Boxes are usually much tighter than Axes Aligned Bounding Boxes (for more information on OBB please see the @ref occt_modat_6 "Bounding boxes" chapter of Modeling data User guide) its usage can significantly speed-up the intersection stage of the operation by reducing the number of interfering objects.

@subsubsection occt_algorithms_11a_5_obb_1 Usage

@@ -3041,7 +3026,7 @@ modified m2 cut_hist e2

@subsubsection occt_algorithms_history_gen Generated shapes

-Two intersecting edges will both have the intersection vertices Generated from them.
+The two intersecting edges will both have the intersection vertices Generated from them.

 As for the operation with intersecting faces, consider the following example:

@@ -3085,50 +3070,6 @@ generated gf2 com_hist f2

 ~~~~

-@section occt_algorithms_simplification BOP result simplification
-
-The API algorithms implementing Boolean Operations provide possibility to simplify the result shape by unification of the connected tangential edges and faces.
-This simplification is performed by the method *SimplifyResult* which is implemented in the class *BRepAlgoAPI_BuilderAlgo* (General Fuse operation).
-It makes it available for users of the classes *BRepAlgoAPI_BooleanOperation* (all Boolean Operations) and *BRepAlgoAPI_Splitter* (split operation).
-
-The simplification is performed by the means of *ShapeUpgrade_UnifySameDom* algorithm. The result of operation is overwritten with the simplified result.
-
-The simplification is performed without creation of the Internal shapes, i.e. shapes connections will never be broken. It is performed on the whole result shape.
-Thus, if the input shapes contained connected tangent edges or faces unmodified during the operation they will also be unified.
-
-History of the simplification is merged into the main history of operation, thus it will be accounted when asking for Modified, Generated and Deleted shapes.
-
-Some options of the main operation are passed into the Unifier:
- Fuzzy tolerance of the operation is given to the Unifier as the linear tolerance.
- Non destructive mode here controls the safe input mode in Unifier.
-
-For controlling this possibility in DRAW the command **bsimplify** has been implemented. See the @ref occt_draw_bop_options "Boolean Operations options" chapter in draw user guide.
-
-
-@subsection occt_algorithms_simplification_examples Examples
-
-Here is the simple example of simplification of the result of Fuse operation of two boxes:
-
-~~~~
-bsimplify -f 1
-
-box b1 10 10 15
-box b2 3 7 0 10 10 15
-bclearobjects
-bcleartools
-baddobjects b1
-baddtools b2
-bfillds
-bapibop r 1
-~~~~
-
-<table align="center">
-  <tr>
-    <td>@figure{/user_guides/boolean_operations/images/bop_simple_001.png, "Not simplified result", 420}</td>
-    <td>@figure{/user_guides/boolean_operations/images/bop_simple_002.png, "Simplified result", 420}</td>
-  </tr>
-</table>
-

@section occt_algorithms_11b Usage 

--- a/dox/user_guides/boolean_operations/images/bop_simple_001.png
+++ b/dox/user_guides/boolean_operations/images/bop_simple_001.png
--- a/dox/user_guides/boolean_operations/images/bop_simple_002.png
+++ b/dox/user_guides/boolean_operations/images/bop_simple_002.png
--- a/dox/user_guides/draw_test_harness/draw_test_harness.md
+++ b/dox/user_guides/draw_test_harness/draw_test_harness.md
--- a/dox/user_guides/foundation_classes/foundation_classes.md
+++ b/dox/user_guides/foundation_classes/foundation_classes.md
@@ -5,7 +5,7 @@ Foundation Classes  {#occt_user_guides__foundation_classes}

@section occt_fcug_1 Introduction

-This manual explains how to use Open CASCADE Technology (**OCCT**)  Foundation Classes. It provides basic documentation on foundation classes. For  advanced information on foundation classes and their applications, see our <a href="https://www.opencascade.com/content/tutorial-learning">E-learning & Training</a> offerings.
+This manual explains how to use Open CASCADE Technology (**OCCT**)  Foundation Classes. It provides basic documentation on foundation classes. For  advanced information on foundation classes and their applications, see our <a href="http://www.opencascade.com/content/tutorial-learning">E-learning & Training</a> offerings.
   
 Foundation Classes provide a variety of general-purpose  services such as automated dynamic memory management (manipulation of objects  by handle), collections, exception handling, genericity by down-casting and  plug-in creation. 

@@ -183,12 +183,12 @@ The table below presents the equivalence existing between  C++ fundamental types
 | int	| Standard_Integer |
 | double 	| Standard_Real |
 | float	| Standard_ShortReal |
-| bool	| Standard_Boolean |
+| unsigned int	| Standard_Boolean |
 | char	| Standard_Character |
-| char16_t	| Standard_ExtCharacter |
+| short	| Standard_ExtCharacter |
 | char\*	| Standard_CString |
 | void\*	| Standard_Address |
-| char16_t\*	| Standard_ExtString |
+| short\*	| Standard_ExtString |

 \* The types with asterisk are pointers. 

@@ -197,12 +197,12 @@ The table below presents the equivalence existing between  C++ fundamental types
 * **Standard_Integer** : fundamental type representing 32-bit integers yielding  negative, positive or null values. *Integer* is implemented as a *typedef* of the C++ *int* fundamental type. As such, the algebraic operations  +, -, *, / as well as the ordering and equivalence relations <, <=, ==, !=, >=, >  are defined on it. 
 * **Standard_Real** : fundamental type representing real numbers with finite  precision and finite size. **Real** is implemented as a *typedef* of  the C++ *double* (double precision) fundamental type. As such, the  algebraic operations +, -, *, /, unary- and the ordering and equivalence  relations <, <=, ==, !=, >=, >  are defined on reals. 
 * **Standard_ShortReal** : fundamental type representing real numbers with finite  precision and finite size. *ShortReal* is implemented as a *typedef* of  the C++ *float* (simple precision) fundamental type. As such, the  algebraic operations +, -, *, /, unary- and the ordering and equivalence  relations <, <=, ==, !=, >=, >  are defined on reals. 
-* **Standard_Boolean** : fundamental type representing logical  expressions. It has two values: *false* and *true*. *Boolean* is implemented  as a *typedef* of the C++ *bool* fundamental type. As such,  the algebraic operations *and, or, xor* and *not* as well as equivalence relations == and != are defined on Booleans. 
+* **Standard_Boolean** : fundamental type representing logical  expressions. It has two values: *false* and *true*. *Boolean* is implemented  as a *typedef* of the C++ *unsigned int* fundamental type. As such,  the algebraic operations *and, or, xor* and *not* as well as equivalence relations == and != are defined on Booleans. 
 * **Standard_Character** : fundamental type representing the  normalized ASCII character set. It may be assigned the values of the 128 ASCII  characters. *Character* is implemented as a *typedef* of the C++ *char* fundamental type. As such, the ordering and equivalence relations <, <=, ==, !=, >=, >  are defined on characters using the order of the  ASCII chart (ex: A B). 
-* **Standard_ExtCharacter** : fundamental type representing the  Unicode character set. It is a 16-bit character type. *ExtCharacter* is  implemented as a *typedef* of the C++ *char16_t* fundamental type. As  such, the ordering and equivalence relations <, <=, ==, !=, >=, >   are defined on extended characters using the order of the UNICODE chart (ex:  A B). 
-* **Standard_CString** : fundamental type representing string  literals. A string literal is a sequence of UTF-8 (8 bits) code points enclosed in double quotes. *CString* is implemented as a *typedef* of the C++ *char* fundamental type. 
+* **Standard_ExtCharacter** : fundamental type representing the  Unicode character set. It is a 16-bit character type. *ExtCharacter* is  implemented as a *typedef* of the C++ *short* fundamental type. As  such, the ordering and equivalence relations <, <=, ==, !=, >=, >   are defined on extended characters using the order of the UNICODE chart (ex:  A B). 
+* **Standard_CString** : fundamental type representing string  literals. A string literal is a sequence of ASCII (8 bits) characters enclosed  in double quotes. *CString* is implemented as a *typedef* of the C++ *char* fundamental type. 
 * **Standard_Address** : fundamental type representing a generic  pointer. *Address* is implemented as a *typedef* of the C++ *void* fundamental  type. 
-* **Standard_ExtString** is a fundamental type representing string  literals as sequences of Unicode (16 bits) characters. *ExtString* is  implemented as a *typedef* of the C++ *char16_t* fundamental type. 
+* **Standard_ExtString** is a fundamental type representing string  literals as sequences of Unicode (16 bits) characters. *ExtString* is  implemented as a *typedef* of the C++ *short* fundamental type. 

@subsubsection occt_fcug_2_1_2 Types manipulated by value
 There are three categories of types which are manipulated by  value: 
@@ -254,13 +254,13 @@ Objects of classes derived (directly or indirectly) from *Transient*, are normal
 Handle is defined as template class *opencascade::handle<>*.
 Open CASCADE Technology  provides preprocessor macro *Handle()* that is historically used throughout OCCT code to name a handle:
 ~~~~~{.cpp}
-Handle(Geom_Line) aLine; // "Handle(Geom_Line)" is expanded to "opencascade::handle<Geom_Line>"
+Handle(Geom_Line) aLine; // "Handle(Geom_Line)" is expanded to "opencascade::handleL<Geom_Line>"
 ~~~~~

 In addition, for standard OCCT classes additional *typedef* is defined for a handle, as the name of a class prefixed by *Handle_*.
 For instance, the above example can be also coded as:
 ~~~~~{.cpp}
-Handle_Geom_Line aLine; // "Handle_Geom_Line" is typedef to "opencascade::handle<Geom_Line>"
+Handle_Geom_Line aLine; // "Handle_Geom_Line" is typedef to "opencascade::handleL<Geom_Line>"
 ~~~~~

 #### Using a Handle
@@ -593,16 +593,16 @@ The following paragraphs describe recommended approaches for  using exceptions w

 To raise an exception of a definite type method Raise() of  the appropriate exception class shall be used. 
 ~~~~~
-Standard_DomainError::Raise(“Cannot cope with this condition”);
+DomainError::Raise(“Cannot cope with this condition”);
 ~~~~~
-raises an exception of *Standard_DomainError* type with the associated message “Cannot cope with this condition”, the message being optional. This exception may be caught by a handler of a *Standard_DomainError* type as follows: 
+raises an exception of *DomainError* type with the associated  message “Cannot cope with this condition”, the message being optional. This  exception may be caught by a handler of a *DomainError* type as follows: 
 ~~~~~
 try {
  OCC_CATCH_SIGNALS
  // try block
 }
-catch(const Standard_DomainError& ) {
-// handle Standard_DomainError exceptions here
+catch(DomainError) {
+// handle DomainError exceptions here
 }
 ~~~~~

@@ -652,7 +652,8 @@ Using this syntax, the *Value* function becomes:
 ~~~~~
 Item  TCollection_Array1::Value (const Standard_Integer&index) const
     { 
-  Standard_OutOfRange_Raise_if(index < r1 || index > r2, “index out of range in  Array1::Value”);
+  OutOfRange_Raise_if(index < r1 || index > r2,
+                      “index out of range in  Array1::Value”);
  return contents[index];
 }
 ~~~~~
@@ -1681,7 +1682,7 @@ All these functions are provided by geometric processor package <i> gp</i>. Its

 The *gp* package defines the basic geometric entities used for algebraic calculation and basic analytical geometry  in 2d & 3d space. It also provides basic transformations such as identity,  rotation, translation, mirroring, scale transformations, combinations of  transformations, etc. Entities are handled by value.  

-Note that <i> gp</i> curves and surfaces are analytic: there is no parameterization and no orientation on <i>gp</i> entities, i.e. these entities do not provide functions which work with these properties. 
+Please, note that <i> gp</i> curves and surfaces are analytic: there is no parameterization and no orientation on <i>gp</i> entities, i.e. these entities do not provide functions which work with these properties. 

 If you need, you may use more evolved data structures provided by <i> Geom</i> (in 3D space) and <i> Geom2d</i> (in the plane). However, the definition of <i> gp</i> entities is identical to the one of equivalent <i> Geom</i> and <i> Geom2d</i> entities, and they are located in the plane or in space with the same kind of positioning systems. They implicitly contain the orientation, which they express on the <i> Geom </i> and <i> Geom2d </i> entities, and they induce the definition of their parameterization.

--- a/dox/user_guides/iges/iges.md
+++ b/dox/user_guides/iges/iges.md
@@ -9,13 +9,13 @@ The IGES interface reads IGES files and translates them to Open CASCADE Technolo

 Other kinds of data such as colors and names can be read or written with the help of XDE tools <i> IGESCAFControl_Reader</i> and <i> IGESCAFControl_Writer</i>. 

-**Note** :
+Please, note:

  * an IGES model is an IGES file that has been loaded into memory.
  * an IGES entity is an entity in the IGES normal sense.
  * a root entity is the highest level entity of any given type, e.g. type 144 for surfaces and type 186 for solids. Roots are not referenced by other entities.

-This manual mainly explains how  to convert an IGES file to an Open CASCADE Technology (**OCCT**) shape and  vice versa. It provides basic documentation on conversion. For advanced  information on conversion, see our <a href="https://www.opencascade.com/content/tutorial-learning">E-learning & Training</a> offerings.
+This manual mainly explains how  to convert an IGES file to an Open CASCADE Technology (**OCCT**) shape and  vice versa. It provides basic documentation on conversion. For advanced  information on conversion, see our <a href="http://www.opencascade.com/content/tutorial-learning">E-learning & Training</a> offerings.

 IGES files produced in accordance with IGES standard versions up to and including version 5.3 can be read. IGES files that are produced by this  interface conform to IGES version 5.3 (Initial Graphics Exchange Specification,  IGES 5.3. ANS US PRO/IPO-100-1996). 

@@ -178,10 +178,10 @@ if  (!Interface_Static::SetRVal ("read.maxprecision.val",0.1))
 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.  
-*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*.  
+defines the using of  *BRepLib::SameParameter*. Its possible values are:  
+* 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:  
 ~~~~~
 Standard_Integer mv =  Interface_Static::IVal("read.stdsameparameter.mode"); 
@@ -202,7 +202,7 @@ The processor also  decides to re-compute either the 3D or the 2D curve even if
  * the number of sub-curves in  the 2D curve is different from the number of sub-curves in the 3D curve. This  can be either due to different numbers of sub-curves given in the IGES file or  because of splitting of curves during translation. 
  * 3D or 2D curve is a Circular  Arc (entity type 100) starting and ending in the same point (note that this  case is incorrect according to the IGES standard).
  
-The parameter  *read.surfacecurve.mode* defines which curve (3D or 2D) is used for re-computing  the other one:
+The parameter  *read.surfacecurve.mode* defines which curve (3D or 2D) is used for re-computing  the other one:  
 * *Default(0)* use  the preference flag value in the entity's Parameter Data section. The flag  values are:  
  * 0: no preference given, 
  * 1: use 2D for 142 entities  and 3D for 141 entities, 
@@ -251,7 +251,7 @@ Default value is 0.01.
 <h4>read.iges.bspline.approxd1.mode</h4>
 This parameter is obsolete (it is rarely used in real  practice). If set to True, it affects the translation of bspline curves of  degree 1 from IGES: these curves (which geometrically are polylines) are split  by duplicated points, and the translator attempts to convert each of the  obtained parts to a bspline of a higher continuity.  

-Read this parameter with:  
+Read this parameter  with:  
 ~~~~~
 Standard_Real bam =   Interface_Static::CVal("read.iges.bspline.approxd1.mode"); 
 ~~~~~
@@ -266,9 +266,9 @@ Default value is Off.
 <h4>read.iges.resource.name and read.iges.sequence</h4>
 These two parameters define the name of the resource file  and the name of the sequence of operators   (defined in that file) for Shape Processing, which is automatically performed  by the IGES   translator. The Shape Processing is a user-configurable step, which is  performed after   the translation and consists in application of a set of operators to a  resulting shape. This is   a very powerful tool allowing to customize the shape and to adapt it to the  needs of   a receiving application. By default, the sequence consists of a single operator  *ShapeFix* that calls Shape Healing from the IGES translator.  

-Find an example of the resource file for IGES (which  defines parameters corresponding to the sequence applied by default, i.e. if the resource file is  not found) in the Open CASCADE Technology sources by the path <i>%CASROOT%/src/XSTEPResource/IGES</i>. 
+Please find an example of the resource file for IGES (which  defines parameters   corresponding to the sequence applied by default, i.e. if the resource file is  not found) in   the Open CASCADE Technology installation, by the path   <i>%CASROOT%/src/XSTEPResource/IGES</i> . 

-IGES translator will use that file if you 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. 
+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,  
@@ -286,7 +286,7 @@ A list of entities can  be formed by invoking the method *IGESControl_Reader::Gi
 Handle(TColStd_HSequenceOfTransient)  list = reader.GiveList(); 
 ~~~~~
 Several predefined  operators can be used to select a list of entities of a specific type. 
-To make a selection, use the method *IGESControl_Reader::GiveList* with the selection type in  quotation marks as an argument. You can also make cumulative selections. For  example, you would use the following syntax: 
+To make a selection, you  use the method *IGESControl_Reader::GiveList* with the selection type in  quotation marks as an argument. You can also make cumulative selections. For  example, you would use the following syntax: 
 1. Requesting the faces in the  file: 
 ~~~~~
 faces =  Reader.GiveList("iges-faces"); 
@@ -400,12 +400,12 @@ 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.
+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.
 
@subsection occt_iges_2_4 Mapping of IGES  entities to Open CASCADE Technology shapes

@@ -577,7 +577,7 @@ All  methods are in charge of transferring curves  from IGES curve entities <i>(
  * *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, refer to class *ShapeFix_Wire*. 
+  * *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*.
  
  
@@ -710,7 +710,7 @@ if  (!Interface_Static::SetRVal(;write.precision.val;,0.01))
 ~~~~~
 Default value is 0.0001. 

-<h4>write.iges.resource.name</h4> and <h4>write.iges.sequence</h4> are the same as the corresponding read.iges.\* parameters. Note that the  default sequence for writing contains *DirectFaces* operator, which converts elementary surfaces based on left-hand axes (valid in CASCADE) to right-hand axes (which are valid only in IGES). 
+<h4>write.iges.resource.name</h4> and <h4>write.iges.sequence</h4> are the same as the corresponding read.iges.\* parameters, please, see above. Note that the  default sequence for writing   contains *DirectFaces* operator, which converts elementary surfaces based on left-hand axes (valid in CASCADE) to right-hand axes (which are valid only in IGES). 

 Default values : 
 ~~~~~
--- a/dox/user_guides/inspector/images/3DView.png
+++ b/dox/user_guides/inspector/images/3DView.png
--- a/dox/user_guides/inspector/images/3DView_set_orientation.png
+++ b/dox/user_guides/inspector/images/3DView_set_orientation.png
--- a/dox/user_guides/inspector/images/TStandaloneEXE.png
+++ b/dox/user_guides/inspector/images/TStandaloneEXE.png
--- a/dox/user_guides/inspector/images/TStandaloneEXE_open.png
+++ b/dox/user_guides/inspector/images/TStandaloneEXE_open.png
--- a/dox/user_guides/inspector/images/VStudio_projects.png
+++ b/dox/user_guides/inspector/images/VStudio_projects.png
--- a/dox/user_guides/inspector/images/dfbrowser.png
+++ b/dox/user_guides/inspector/images/dfbrowser.png
--- a/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg
+++ b/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg
@@ -73,8 +73,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="529.17338"
-     inkscape:cy="317.0623"
+     inkscape:cx="128.94698"
+     inkscape:cy="215.23058"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -85,10 +85,10 @@
     inkscape:showpageshadow="false"
     inkscape:snap-nodes="false"
     inkscape:snap-global="false"
-     inkscape:window-width="1332"
+     inkscape:window-width="1522"
     inkscape:window-height="784"
-     inkscape:window-x="581"
-     inkscape:window-y="97"
+     inkscape:window-x="1725"
+     inkscape:window-y="5"
     inkscape:window-maximized="0" />
  <metadata
     id="metadata3732">
@@ -200,19 +200,5 @@
       inkscape:export-filename="D:\OCCT\master_CR29018\dox\user_guides\inspector\images\selection_in_tree_view.png"
       inkscape:export-xdpi="90"
       inkscape:export-ydpi="90" />
-    <image
-       y="55.529915"
-       x="167.95375"
-       id="image1593"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAIAAABLixI0AAAAA3NCSVQICAjb4U/gAAAAsElEQVQ4
-jcWU4QnEIAyFtWSKCg4hbucmzuQUYufI/fCQeG1VTODer5TCx3tJjA4hKCGBc857zwfFGKFW1tpt
-Ss65FgffUVPHQkQxFlMdS2stxpLMyPQF9AMRG+6ROzYObz9KuVi+qIw5xVjqFnM6mdF+0ZgrkUdz
-NOasiFKulciT/aq4xd7N92t9CP9+27rXM2vxDVH7tN68ORXx05P9+3Vv7nfv283mCJRSKSU+SFgf
-ylJCrIGwaxIAAAAASUVORK5CYII=
-"
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="6.6145835"
-       width="6.6145835" />
  </g>
 </svg>
--- a/dox/user_guides/inspector/images/drawexe_tinspector.png
+++ b/dox/user_guides/inspector/images/drawexe_tinspector.png
--- a/dox/user_guides/inspector/images/preferences.png
+++ b/dox/user_guides/inspector/images/preferences.png
--- a/dox/user_guides/inspector/images/property_panel_item_selection.svg
+++ b/dox/user_guides/inspector/images/property_panel_item_selection.svg
@@ -57,9 +57,9 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="585.11712"
-     inkscape:cy="337.7975"
+     inkscape:zoom="1"
+     inkscape:cx="314.86686"
+     inkscape:cy="103.10687"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -70,8 +70,8 @@
     fit-margin-bottom="0"
     inkscape:window-width="1252"
     inkscape:window-height="826"
-     inkscape:window-x="276"
-     inkscape:window-y="50"
+     inkscape:window-x="2069"
+     inkscape:window-y="98"
     inkscape:window-maximized="0" />
  <metadata
     id="metadata3933">
@@ -81,7 +81,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -155,19 +155,5 @@
       inkscape:export-filename="D:\OCCT\master_CR29018\dox\user_guides\inspector\images\selection_in_tree_view.png"
       inkscape:export-xdpi="90"
       inkscape:export-ydpi="90" />
-    <image
-       y="102.39896"
-       x="62.498363"
-       id="image5982"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAIAAABLixI0AAAAA3NCSVQICAjb4U/gAAAAsElEQVQ4
-jcWU4QnEIAyFtWSKCg4hbucmzuQUYufI/fCQeG1VTODer5TCx3tJjA4hKCGBc857zwfFGKFW1tpt
-Ss65FgffUVPHQkQxFlMdS2stxpLMyPQF9AMRG+6ROzYObz9KuVi+qIw5xVjqFnM6mdF+0ZgrkUdz
-NOasiFKulciT/aq4xd7N92t9CP9+27rXM2vxDVH7tN68ORXx05P9+3Vv7nfv283mCJRSKSU+SFgf
-ylJCrIGwaxIAAAAASUVORK5CYII=
-"
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="6.6145835"
-       width="6.6145835" />
  </g>
 </svg>
--- a/dox/user_guides/inspector/images/search.png
+++ b/dox/user_guides/inspector/images/search.png
--- a/dox/user_guides/inspector/images/shapeview.png
+++ b/dox/user_guides/inspector/images/shapeview.png
--- a/dox/user_guides/inspector/images/shapeview_tree_columns.png
+++ b/dox/user_guides/inspector/images/shapeview_tree_columns.png
--- a/dox/user_guides/inspector/images/treeview_preferences.svg
+++ b/dox/user_guides/inspector/images/treeview_preferences.svg
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="165.36458mm"
-   height="99.483337mm"
-   viewBox="0 0 165.36458 99.483337"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="treeview_preferences.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient920"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1;"
-         offset="0"
-         id="stop918" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="237.05748"
-     inkscape:cy="217.01184"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1336"
-     inkscape:window-height="850"
-     inkscape:window-x="276"
-     inkscape:window-y="52"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showborder="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-208.35938,-140.66904)">
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4147-9"
-       width="164.83542"
-       height="98.95417"
-       x="208.62396"
-       y="140.93362"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#e3f4d7;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4159-1"
-       width="155.83388"
-       height="89.326508"
-       x="212.62471"
-       y="145.50125"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.42238337;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-1"
-       width="40.466312"
-       height="11.316654"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.42572066;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-5-9"
-       width="41.108295"
-       height="11.316654"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="291.19687"
-       y="156.27933"
-       id="text5675-5"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3"
-         x="291.19687"
-         y="156.27933"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="331.87143"
-       y="156.27933"
-       id="text5679-5"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0"
-         x="331.87143"
-         y="156.27933"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_4</tspan></text>
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.97454143;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-7-0"
-       width="145.13353"
-       height="68.954567"
-       x="217.1886"
-       y="160.74771"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5293566;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-1-3"
-       width="63.558933"
-       height="11.316654"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="243.21165"
-       y="156.4707"
-       id="text5675-5-2"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-2"
-         x="243.21165"
-         y="156.4707"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Name</tspan></text>
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8"
-       width="63.558926"
-       height="80.271225"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-8"
-       width="40.466305"
-       height="80.271225"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-8-8"
-       width="41.108303"
-       height="80.271225"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1"
-       width="63.558929"
-       height="11.316656"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-0"
-       width="40.466309"
-       height="11.316656"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-7"
-       width="41.108307"
-       height="11.316656"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44990167;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5"
-       width="38.957039"
-       height="58.495327"
-       x="307.89423"
-       y="158.80739"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="174.62115"
-       id="text5675-5-4"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-6"
-         x="317.94843"
-         y="174.62115"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.78735"
-       y="165.06331"
-       id="text5675-5-2-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-2-1"
-         x="317.78735"
-         y="165.06331"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Name</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="184.37038"
-       id="text5679-5-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2"
-         x="317.94843"
-         y="184.37038"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_2</tspan></text>
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8"
-       width="38.957031"
-       height="9.7492247"
-       x="307.89423"
-       y="158.80739"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-8"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="168.55661"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-7"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="178.30583"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-4"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="188.05505"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-2"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="197.80428"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-71"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="207.5535"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <image
-       y="170.78539"
-       x="310.04617"
-       id="image1119"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <image
-       y="161.03616"
-       x="310.04617"
-       id="image1119-4"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <image
-       y="200.03305"
-       x="310.04617"
-       id="image1119-7"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="194.1196"
-       id="text5679-5-9-2"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-3"
-         x="317.94843"
-         y="194.1196"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_3</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="203.86882"
-       id="text5679-5-9-4"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-9"
-         x="317.94843"
-         y="203.86882"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_4</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="213.61804"
-       id="text5679-5-9-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-4"
-         x="317.94843"
-         y="213.61804"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_5</tspan></text>
-  </g>
-</svg>
--- a/dox/user_guides/inspector/images/vinspector.png
+++ b/dox/user_guides/inspector/images/vinspector.png
--- a/dox/user_guides/inspector/images/vinspector_tree_columns.png
+++ b/dox/user_guides/inspector/images/vinspector_tree_columns.png
--- a/dox/user_guides/inspector/inspector.md
+++ b/dox/user_guides/inspector/inspector.md
@@ -5,39 +5,41 @@ Inspector  {#occt_user_guides__inspector}
 
@section occt_inspector_1 Introduction

-This manual explains how to use the Inspector.
+This manual explains how to use Inspector.

@subsection occt_inspector_1_1 Overview
-Inspector is a Qt-based library that provides functionality to interactively inspect low-level content of the OCAF data model, OCCT viewer and Modeling Data.
+Inspector is a Qt-based library that provides functionality to interactively inspect low-level content of the OCAF data model, OCCT viewer and Modelisation Data.
 This component is aimed to assist the developers of OCCT-based applications to debug the problematic situations that occur in their applications.

 Inspector has a plugin-oriented architecture. The current release contains the following plugins:

 | Plugin | OCCT component | Root class of OCCT investigated component |
 | :----- | :----- | :----- |
-| @ref occt_inspector_2_2 "DFBrowser"| OCAF | *TDocStd_Application* |
-| @ref occt_inspector_2_3 "VInspector"| Visualization | *AIS_InteractiveContext* |
-| @ref occt_inspector_2_4 "ShapeView"| Modeling Data | *TopoDS_Shape* |
+| @ref occt_inspector_2_2 "DFBrowser"| OCAF | TDocStd_Application |
+| @ref occt_inspector_2_3 "VInspector"| Visualization | AIS_InteractiveContext |
+| @ref occt_inspector_2_4 "ShapeView"| Modelisation Data | TopoDS_Shape |


 Each plugin implements logic of a corresponding OCCT component.

-Each of the listed plugins is embedded in the common framework, thus it is possible to manage, which plugins should be loaded by the Inspector, and to extend their number by implementing a new plugin.
+Each of the listed plugins is embeded in the common framework.
+The user is able to manage which plugins should be loaded by Inspector.
+Also he can extend number of plugins by implementing a new plugin.


@subsection occt_inspector_1_3 Getting started

 There are two launch modes:
-1. Launch **TInspectorEXE** executable sample. For more details see @ref occt_inspector_4_1 "TInspectorEXE" section;
-2. Launch DRAW, load plugin INSPECTOR, and use *tinspector* command.
-   For more details, see @ref occt_inspector_4_2 "Launch in DRAW Test Harness" section.
+1. Launch **TInspectorEXE** executable sample. For more details see @ref occt_inspector_6 "TInspectorEXE" section;
+2. Launch DRAW, load plugin INSPECTOR, and use **tinspector** command.
+   For more details see @ref occt_inspector_7 "Launch in DRAW Test Harness" section.


-**Note**. If you have no Inspector library in your build directory, make sure that OCCT is compiled with *BUILD_Inspector* 
-option ON. For more details see @ref occt_inspector_5 "Build procedure".
+Note. If you have no Inspector library in your build directory, please make sure that OCCT is compiled with *BUILD_Inspector* 
+option ON. For more details see @ref occt_inspector_4 "Build procedure".


-@section occt_inspector_2 Inspector Plugins
+@section occt_inspector_2 Inspector

@subsection occt_inspector_2_1 Overview

@@ -53,9 +55,9 @@ Inspector consists of the following components:

@figure{dfbrowser.png, "DFBrowser"}

-This plugin visualizes the content of *TDocStd_Application* in a tree view. It shows application documents, 
-the hierarchy of *TDF_Labels*, the content of *TDF_Attributes* and interconnection between attributes (e.g. references).
-Additionally there is a 3D view to visualize *TopoDS_Shape* elements stored in the document.
+This plugin visualizes content of TDocStd_Application in a tree view. It shows documents of the application,
+hierarchy of TDF_Labels, content of TDF_Attributes and interconnection between attributes (e.g. references).
+Additionally it has 3D view to visualize TopoDS_Shape elements stored in the document.

@subsubsection occt_inspector_2_2_2 Elements

@@ -67,95 +69,96 @@ Each OCAF element has own tree view item:

 | Type | Tree item | Text | Description |
 | :----- | :----- | :----- | :----- |
-| *TDocStd_Application* | Application | *TDocStd_Application* | The root of tree view. Its children are documents.|
-| *TDocStd_Document* | Document | entry : name | A child of *Application* item. Its children are *Label* and *Attribute* items.<br> Text view is an entry of the root label and the value of *TDataStd_Name* attribute for the label if it exists. |
-| *TDF_Label* | Label | entry : name | A child of a *Document* or another *Label* item. Its children and text view are the same as for Document item. |
-| *TDF_Attribute* | Attribute | attribute type [additional information] | A child of a *Label*. It has no children. <br> Text view is the attribute type *(DynamicType()->Name()* of *TDF_Attribute*) and additional information (a combination of attribute values). |
+| TDocStd_Application | Application | TDocStd_Application | It is the root of tree view. Children are documents.|
+| TDocStd_Document | Document | entry : name | It is a child of Application item. Children are Labels and Attributes items.<br> Text view is an entry of the root label and the value of TDataStd_Name attribute for the label if it exists. |
+| TDF_Label | Label | entry : name | It is a child of a Document or another Label item. Children and text view are the same as for Document item. |
+| TDF_Attribute | Attribute | attribute type [additional information] | It is a child of a Label. It has no children. <br> Text view is the attribute type (DynamicType()->Name() of TDF_Attribute) and additional information (a combination of attribute values) |


-Additional information about TDF_Attributes:
+Additional information of TDF_Attributes:

 | Type | Text |
 | :----- | :----- |
-| *TDocStd_Owner* | [storage format] |
-| *TDataStd_AsciiString*,<br> *TDataStd_Name*,<br> *TDataStd_Real*,<br> other *Simple* type attributes | [value] |
-| *TDataStd_BooleanList*,<br> *TDataStd_ExtStringList*,<br> other *List* attributes | [value_1 ... value_n] |
-| *TDataStd_BooleanArray*,<br> *TDataStd_ByteArray*,<br> other *Array* type attributes | [value_1 ... value_n] |
-| *TDataStd_TreeNode* | [tree node ID  ==> Father()->Label()] (if it has a father) or <br> [tree node ID <== First()->Label()] (if it has NO father)|
-| *TDataStd_TreeNode(XDE)* | [XDE tree node ID  ==> Father()->Label()] (if it has a father), <br> [XDE tree Node ID <== label_1, ..., label_n] (if it has NO father)|
-| *TNaming_NamedShape* | [shape type : evolution] |
-| *TNaming_UsedShapes* | [map extent] |
+| TDocStd_Owner | [storage format] |
+| TDataStd_AsciiString,<br> TDataStd_Name,<br> TDataStd_Real,<br> @ref occt_attribute_simple_types "other Simple types" | [value] |
+| TDataStd_BooleanList,<br> TDataStd_ExtStringList,<br> @ref occt_attribute_list_types "other List types" | [value_1 ... value_n] |
+| TDataStd_BooleanArray,<br> TDataStd_ByteArray,<br> @ref occt_attribute_array_types "other Array types" | [value_1 ... value_n] |
+| TDataStd_TreeNode | [tree node ID  ==> Father()->Label()] (if it has father) or <br> [tree node ID <== First()->Label()] (if it has NO father)|
+| TDataStd_TreeNode(XDE) | [@ref occt_attribute_xde_tree_node_id "XDE tree node ID"  ==> Father()->Label()] (if it has father), <br> [@ref occt_attribute_xde_tree_node_id "XDE tree Node ID" <== label_1, ..., label_n] (if it has NO father)|
+| TNaming_NamedShape | [shape type : evolution] |
+| TNaming_UsedShapes | [map extent] |


 Custom color of items:

 | OCAF element Type | Color |
 | :----- | :----- |
-| *TDF_Label* | <b>dark green</b>, if the label has *TDataStd_Name* attribute, <br><b>light grey</b> if the label is empty (has no attributes on all levels of  hierarchy),<br> <b>black</b> otherwise. |
-| *TNaming_NamedShape* | <b>dark gray</b> for *TopAbs_FORWARD* orientation of *TopoDS_Shape*, <br> <b>gray</b> for *TopAbs_REVERSED* orientation of *TopoDS_Shape*, <br> <b>black</b> for other orientation. |
+| TDF_Label | <b>dark green</b>, if the label has TDataStd_Name attribute, <br><b>light grey</b> if the label is empty (has no attributes on all levels of hierarchy),<br> <b>black</b> otherwise |
+| TNaming_NamedShape | <b>dark gray</b> for TopAbs_FORWARD orientation of TopoDS_Shape, <br> <b>gray</b> for TopAbs_REVERSED orientation of TopoDS_Shape, <br> <b>black</b> for other orientation |


-Context pop-up menu:
+Context popup menu:
 | Action | Functionality |
 | :----- | :----- |
-| Expand | Expands the next two levels under the selected item. |
-| Expand All | Expands the whole tree of the selected item. |
-| Collapse All | Collapses the whole tree of the selected item. |
+| Expand | Expands the next two levels under the selected item |
+| Expand All | Expands the whole tree of the selected item |
+| Collapse All | Collapses the whole tree of the selected item |


 <b>Property Panel</b>

-Property panel is used to display the content of *Label* or *Attribute* tree view items or Search result view.
-The information is usually shown in one or several tables.
+Property panel is used to display content of Label or Attribute tree view items.
+This control is used for content of Label or Attribute tree view items or Search result view.
+Information is usually shown in one or several tables.

-*TDF_Attribute* has the following content in the Property Panel:
+TDF_Attribute has the following content in Property Panel:

 <table>
 <tr><th>Type</th><th>Description</th><th>Content</th></tr>
-<tr><td><i>TDF_Label</i></td>
+<tr><td>TDF_Label</td>
    <td> a table of [entry or attribute name, value]</td>
    <td>@figure{property_panel_label.png, "",140}</td></tr>
-<tr><td><i>TDocStd_Owner</i>,<br> Simple type attributes, <br> List type attributes</td>
+<tr><td>TDocStd_Owner,<br> @ref occt_attribute_simple_types "Simple types", <br> @ref occt_attribute_list_types "List types"</td>
    <td>a table of [method name, value]</td>
    <td>@figure{property_panel_simple_type.png, "",140}</td></tr>
-<tr><td><i>TDataStd_BooleanArray</i>,<br> <i>TDataStd_ByteArray</i>,<br> other Array type attributes</td>
-    <td>2 controls: <br> - a table of [array bound, value], <br> - a table of [method name, value] </td>
+<tr><td>TDataStd_BooleanArray,<br> TDataStd_ByteArray,<br> @ref occt_attribute_array_types "other Array types"</td>
+    <td>2 controls: <br>  * a table of [array bound, value], <br>  * table of [method name, value]</td>
    <td>@figure{property_panel_array.png, "",140}</td></tr>
-<tr><td><i>TDataStd_TreeNode</i></td>
-    <td>2 controls: <br> - a table of [Tree ID, value] (visible only if Tree ID() != ID() ), <br> - a tree view of tree nodes starting from *Root()* of the tree node. The current tree node has <b>dark blue</b> text.</td>
+<tr><td>TDataStd_TreeNode</td>
+    <td>2 controls: <br>  * a table of [Tree ID, value] (visible only if Tree ID() != ID()), <br>  * a tree view of tree nodes starting from Root() of the tree node. The current tree node has <b>dark blue</b> text.</td>
    <td>@figure{property_panel_tree_node.png, "",140} </td></tr>
-<tr><td><i>TDataStd_NamedData</i></td>
+<tr><td>TDataStd_NamedData</td>
    <td>tab bar of attribute elements, each tab has a table of [name, value]</td>
    <td>@figure{property_panel_named_data.png, "",140}</td></tr>
-<tr><td><i>TNaming_UsedShapes</i></td>
-    <td>a table of all shapes handled by the framework</td>
+<tr><td>TNaming_UsedShapes</td>
+    <td>a table of all  the shapes handled by the framework</td>
    <td>@figure{property_panel_tnaming_used_shapes.png, "",140}</td></tr>
-<tr><td><i>TNaming_NamedShape</i></td>
-    <td>2 controls: <br> - a table of [method name, value] including CurrentShape/OriginalShape methods result of <i>TNaming_Tools</i>, <br> - an evolution table. <br> Tables contain buttons for @ref occt_shape_export "TopoDS_Shape export".</td>
+<tr><td>TNaming_NamedShape</td>
+    <td>2 controls: <br>  * a table of [method name, value] including CurrentShape/OriginalShape methods result of TNaming_Tools, <br>  * an evolution table. <br> Tables contain buttons for @ref occt_shape_export "TopoDS_Shape export".</td>
    <td>@figure{property_panel_tnaming_named_shape.png, "",140}</td></tr>
-<tr><td><i>TNaming_Naming</i></td>
-    <td>2 controls: <br> - a table of <i>TNaming_Name</i> values,<br> - a table of [method name, value]</td>
+<tr><td>TNaming_Naming</td>
+    <td>2 controls: <br>  * a table of TNaming_Name vlaues,<br>  * a table of [method name, value]</td>
    <td>@figure{property_panel_tnaming_naming.png, "",140}</td></tr>
 </table>


 <b>Dump view</b>

-@figure{dump_attribute.png, "Dump of TDF_Attribute",200}
+@figure{dump_attribute.png, "Dump of TDF_Attribute"}

-Dump view shows the result of <b>TDF_Attribute::Dump()</b> or <b>TDF_Label::Dump()</b> of the selected tree view item.
+Dump view shows result of <b>TDF_Attribute::Dump()</b> or <b>TDF_Label::Dump()</b> of selected tree view item.

 <b>3D view</b>

-3D View visualizes *TopoDS_Shape* elements of OCAF attribute via AIS facilities.
+3D View visualizes TopoDS_Shape elements of OCAF attribute via AIS facilities.

-DFBrowser creates two kinds of presentations depending on the selection place:
+DFBrowser creates two kinds presentations depending on the selection place:

 <table>
-<tr><th>Kind</th><th>Source object</th><th>Visualization properties</th><th>View</th></tr>
+<tr><th>Kind</th><th>Source object</th><th>Visualization propeties</th><th>View</th></tr>
 <tr><td>Main presentation</td>
-    <td>Tree view item:<br> *TPrsStd_AISPresentation*,<br> *TNaming_NamedShape*,<br> *TNaming_Naming*</td>
-    <td>Color: a default color for shape type of the current *TopoDS_Shape*.</td>
+    <td>Tree view item:<br> TPrsStd_AISPresentation,<br> TNaming_NamedShape,<br> TNaming_Naming</td>
+    <td>Color: a default color for shape type of the current TopoDS_Shape</td>
    <td>@figure{display_main_presentation.png, "",100}</td></tr>
 <tr><td>Additional presentation</td>
    <td>References in Property panel</td>
@@ -168,8 +171,8 @@ DFBrowser creates two kinds of presentations depending on the selection place:
 <b>Tree Navigation</b>

 Tree Navigation shows a path to the item selected in the tree view.
-The path is a sequence of label entries and attribute type names.
-Each element in the path is selectable - simply click on it to select the corresponding tree view item.
+The path is a sequence of label entries and attribute type name.
+Each element in the path is selectable - the user can click on it to select the corresponding tree view item.

 Navigation control has buttons to go to the previous and the next selected tree view items.

@@ -181,14 +184,14 @@ Update button synchronizes content of tree view to the current content of OCAF d
 <b>Search</b>

 The user can search OCAF element by typing:
-  * *TDF_Label* entry,
-  * *TDF_Attribute* name,
-  * *TDataStd_Name* and *TDataStd_Comment* attributes value.
+  * TDF_Label entry,
+  * TDF_Attribute name,
+  * TDataStd_Name and TDataStd_Comment attributes value.

-@figure{search.png,"Search",360}
+@figure{search.png,"Search"}

 As soon as the user confirms the typed criteria, the Property panel is filled by all satisfied values.
-The user can click a value to highlight the corresponding tree view item. By double click the item will be selected.
+The user can click a value to hightligt the corresponding tree view item. By double click the item will be selected.


@subsubsection occt_inspector_2_2_3 Elements cooperation
@@ -196,22 +199,22 @@ The user can click a value to highlight the corresponding tree view item. By dou
 <b>Tree item selection</b>

 Selection of tree view item updates content of the following controls:
-  * Navigation line;
-  * Property Panel;
-  * 3D View (if it is possible to create an interactive presentation);
-  * Dump View.
+  * Navigation line
+  * Property Panel
+  * 3D View (if it is possible to create an interactive presentation)
+  * Dump View

@figure{dfbrowser_selection_in_tree_view.svg,"",360}

 <b>Property Panel item selection </b>

-If the property panel shows content of *TDF_Label*:
-  * selection of the table row highlights the corresponding item in the tree view,
-  * double click on the table row selects this item in the tree view.
+If property panel shows content of TDF_Label:
+  * selection of the table row hightlights the corresponding item in tree view,
+  * double click on the table row selects this item in tree view.

-If the property panel shows content of *TDF_Attribute* that has reference to another attribute, selection of this reference:
-  * highlights the referenced item in the tree view,
-  * displays additional presentation in the 3D view if it can be created.
+If property panel shows content of TDF_Attribute that has reference to another attribute, selection of this reference:
+  * highlights the referenced item in TreeView,
+  * displays additional presentation in 3D view if it can be created.

@figure{property_panel_item_selection.svg,"",360}

@@ -219,28 +222,28 @@ Attributes having references:

 | Type | Reference | Additional presentation
 | :----- | :----- | :----- |
-| *TDF_Reference* | *TDF_Label* | |
-| *TDataStd_ReferenceArray*, <br> *TDataStd_ReferenceList*, <br> *TNaming_Naming* | One or several *TDF_Label* in a container. | |
-| *TDataStd_TreeNode* | *TDF_Label* | |
-| *TNaming_NamedShape* | *TDF_Label* in Evolution table |  *TopoDS_Shapes* selected in the property panel tables. |
-| *TNaming_UsedShapes* | one or several *TNaming_NamedShape* | *TopoDS_Shapes* of the selected *TNaming_NamedShape*. |
+| TDF_Reference | TDF_Label | |
+| TDataStd_ReferenceArray, <br> TDataStd_ReferenceList, <br> TNaming_Naming | one or several TDF_Label in a container | |
+| TDataStd_TreeNode | TDF_Label | |
+| TNaming_NamedShape | TDF_Label in Evolution table | selected TopoDS_Shapes in property panel tables |
+| TNaming_UsedShapes | one or several TNaming_NamedShape | TopoDS_Shapes of selected TNaming_NamedShape |


@subsubsection occt_shape_export TopoDS_Shape export

-Property panel of *TNaming_NamedShape* attribute has controls to export *TopoDS_Shape* to:
-  * BREP. **Save file** dialog is open to enter the result file name,
-  * @ref occt_inspector_2_4 "ShapeView" plugin. The dialog for exporting element to ShapeView allows activating this plugin immediately.
+Property panel of TNaming_NamedShape attribute has controls to export TopoDS_Shape to:
+  * BREP. The save file dialog is started to enter the result file name,
+  * @ref occt_inspector_2_4 "ShapeView" plugin. Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly.


@subsection occt_inspector_2_3 VInspector Plugin

@subsubsection occt_inspector_2_3_1 Overview

-@figure{vinspector.png, "VInspector",360}
+@figure{vinspector.png, "VInspector"}

-This plugin visualizes interactive objects displayed in *AIS_InteractiveContext* in a tree view with computed selection
-components for each presentation. It shows the selected elements in the context and allows selecting these elements.
+It visualizes interactive objects displayed in AIS_InteractiveContext in a tree view with columputed selection
+components for each presentation. It shows the selected elements in the context and allows to select these elements.

@subsubsection occt_inspector_2_3_2 Elements

@@ -248,85 +251,81 @@ components for each presentation. It shows the selected elements in the context

 <b>Presentations tree view</b>

-This view shows presentations and selection computed on them. Also, the view has columns with information about the state of visualization elements.
+It shows presentations and selection computed of them. Also, the view has columns with information about state of visualization elements.

 VInspector tree items.

 | Type | Description |
 | :----- | :----- |
-| *AIS_InteractiveContext* | The root of tree view. Its children are interactive objects obtained by *DisplayedObjects* and *ErasedObjects* methods.|
-| *AIS_InteractiveObject* | A child of *AIS_InteractiveContext* item. Its children are *SelectMgr_Selection* obtained by iteration on *CurrentSelection*.  |
-| *SelectMgr_Selection* | A child of *AIS_InteractiveObject*. Its children are *SelectMgr_SensitiveEntity* obtaining by iteration on *Sensitive*. |
-| *SelectMgr_SensitiveEntity* | A child of *SelectMgr_Selection*. Its children are *SelectMgr_SensitiveEntity* obtaining by iteration on *OwnerId*. |
-| *SelectBasics_EntityOwner* | A child of *SelectMgr_SensitiveEntity*. It has no children. |
+| AIS_InteractiveContext | It is the root of tree view. Children are interactive objects obtained by *DisplayedObjects* and *ErasedObjects* methods.|
+| AIS_InteractiveObject | It is a child of AIS_InteractiveContext item. Children are SelectMgr_Selection obtained by iteration on *CurrentSelection*  |
+| SelectMgr_Selection | It is a child of AIS_InteractiveObject. Children are SelectMgr_SensitiveEntity obtaining by iteration on *Sensitive* |
+| SelectMgr_SensitiveEntity | It is a child of SelectMgr_Selection. Children are SelectMgr_SensitiveEntity obtaining by iteration on *OwnerId* |
+| SelectBasics_EntityOwner | It is a child SelectMgr_SensitiveEntity. It has no children. |


 Custom color of tree view items:

 | OCAF element Type | Column | What | Color |
 | :----- | :----- | :----- | :----- |
-| *AIS_InteractiveObject* | 0 | Text | <b>dark gray</b> in *ErasedObjects* list of *AIS_InteractiveContext*,<br> <b>black</b> otherwise |
-| *AIS_InteractiveObject*, <br> *SelectMgr_SensitiveEntity*, <br> *SelectBasics_EntityOwner*| 1 | Background | <b>dark blue</b>, if there is a selected owner under the item, <br> <b>black</b> otherwise |
-| *SelectMgr_Selection*,<br> *SelectMgr_SensitiveEntity*,<br> *electBasics_EntityOwner* | all | Text | <b>dark gray</b>, if *SelectionState* of *SelectMgr_Selection* is not *SelectMgr_SOS_Activated*,<br> <b>black</b> otherwise |
+| AIS_InteractiveObject | 0 | Text | <b>dark gray</b>, it is in *ErasedObjects* list of AIS_InteractiveContext,<br> <b>black</b> otherwise |
+| AIS_InteractiveObject, <br> SelectMgr_SensitiveEntity, <br> SelectBasics_EntityOwner| 1 | Background | <b>dark blue</b>, if there is a selected owner under the item, <br> <b>black</b> otherwise |
+| SelectMgr_Selection,<br> SelectMgr_SensitiveEntity,<br> SelectBasics_EntityOwner| all | Text | <b>dark gray</b>, if *SelectionState* of SelectMgr_Selection is not *SelectMgr_SOS_Activated*,<br> <b>black</b> otherwise |


 Context popup menu in tree view:
 | Action | Item | Functionality |
 | :----- | :----- | :----- |
-| Export to ShapeView | *AIS_InteractiveObject* | Exports *TopoDS_Shape* of the *AIS_Interactive* presentation to ShapeView plugin. <br> It should be *AIS_Shape* presentation and ShapeView plugin should be registered in Inspector<br> Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediately. |
-| Show | *AIS_InteractiveObject* | Displays presentation in *AIS_InteractiveContext*. |
-| Hide | *AIS_InteractiveObject* | Erases presentation from *AIS_InteractiveContext*. |
+| Export to ShapeView | AIS_InteractiveObject | Exports TopoDS_Shape of AIS_Interactive presentation to ShapeView plugin. <br> It should be AIS_Shape presentation and ShapeView plugin should be registered in Inspector<br> Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly. |
+| Show | AIS_InteractiveObject | *Display* presentation in AIS_InteractiveContext |
+| Hide | AIS_InteractiveObject | *Erase* presentation from AIS_InteractiveContext |

 <b>Update</b>

-This button synchronizes the plugin content with the current state of *AIS_InteractiveContext* and updates the presence of items and their current selection.
+It synchronizes content of the plugin to the current state of AIS_InteractiveContext.
+It updates the presence of items and the current selection for the items.

 <b>Selection controls</b>

-Selection controls switch on/off the possibility to set selection in the context from VInspector plugin.
+Selection controls switch on/off the posibility to set selection in the context from VInspector plugin.

 | Action | Tree view item | Functionality |
 | :----- | :----- | :----- |
-| Select Presentations | *AIS_InteractiveObject* | Calls *AddOrRemoveSelected* of interactive object for the selected item. |
-| Select Owners | *SelectMgr_EntityOwner* or <br> *SelectMgr_SensitiveEntity* | Calls *AddOrRemoveSelected* of *SelectMgr_EntityOwner* for the selected item. |
+| Select Presentations | AIS_InteractiveObject | Calls *AddOrRemoveSelected* of interactive object for the selected item |
+| Select Owners | SelectMgr_EntityOwner or <br> SelectMgr_SensitiveEntity | Calls *AddOrRemoveSelected* of SelectMgr_EntityOwner for the selected item |

-Note that the initial selection in the context will be cleared.
+Please note, that the initial selection in context will be cleared.
 If the button is toggled, the button selection is active. Only one button may be toggled at the moment.


 <b>History view</b>

-At present, the History view is under implementation and may be used only in a custom application where Inspector is loaded.
+At present the History view is under implementation and may be used only in a custom application where Inspector is loaded.

-To fill this view, *VInspectorAPI_CallBack* should be redefined in the application and send signals about some actions applied to the context.
-After that, the call back should be given as a parameter in the plugin.
+To fill this view, VInspectorAPI_CallBack should be redefined in the application and send signals about some actions applyed to context.
+After, the call back should be given as parameter in the plugin.
 If done, new items will be created in the history view for each action.

@subsubsection occt_inspector_2_3_3 Elements cooperation

-*VInspector* marks the presentations currently selected in *AIS_InteractiveContext* with a blue background in tree items. Use **Update** button to synchronize VInspector selected items state to the context.
+Vinspector markes current selected presentations in AIS_InteractiveContext with blue background in tree items. Use "Update" button to synchronize VInspector selected items state to the context.

-It is also possible to perform selection in the context using "Selection controls" VInspector feature. However, this operation should be performed carefully as
-it clears the current selection in *AIS_InteractiveContext*.
+It is also possible to perform selection in context using "Selection controls" VInspector. However, it should be performed carefully as
+it clears the current selection in AIS_InteractiveContext.

 Selection change:
 | From | To | Action | Result |
 | :----- | :----- | :----- | :----- |
-| *AIS_InteractiveContext* | VInspector | Performs selection in *AIS_InteractiveContext*. | Click **Update** button in VInspector and check **Selection** column: <br> *AIS_InteractiveContext* item contains some selected objects, <br> the value of some *AIS_InteractiveObject* is filled if they are selected for this presentation or its entity owner. |
-| VInspector | *AIS_InteractiveContext* | Activates one of Selection controls and selects one or several elements in the tree view. | The objects become selected in *AIS_InteractiveContext*. |
-
-@subsubsection occt_inspector_2_3_4 VInspector tree view columns
-
-Use context pop-up menu on the tree view header to select, which columns should be displayed.
-@figure{vinspector_tree_columns.png, "Vinspector tree header context menu",360}
+| AIS_InteractiveContext | VInspector | perform selection in AIS_InteractiveContext | Click "Update" button in VInspector and check "Selection" column: <br> AIS_InteractiveContext item has anount of selected objects,<br> some of AIS_InteractiveObject have filled value if it selection happens for this presentation or entity owner of it |
+| VInspector | AIS_InteractiveContext | activate one of Selection controls and select one or several elements in tree view | The objects become selected in AIS_InteractiveContext |

@subsection occt_inspector_2_4 ShapeView Plugin

@subsubsection occt_inspector_2_4_1 Overview

-@figure{shapeview.png, "ShapeView",360}
+@figure{shapeview.png, "ShapeView"}

-This plugin visualizes content of *TopoDS_Shape* in a tree view.
+This plugin visualizes content of TopoDS_Shape in a tree view.

@subsubsection occt_inspector_2_4_2 Elements

@@ -334,147 +333,99 @@ This plugin visualizes content of *TopoDS_Shape* in a tree view.

 <b>TopoDS_Shape View</b>

-The view elements are *TopoDS_Shape* objects.
-The shape is exploded into sub-shapes using *TopoDS_Iterator* of the *TopoDS_Shape*.
-Children sub-shapes are presented in the view as children of the initial shape.
-By iterating recursively through all shapes we obtain a tree view of items shown in the ShapeView.
+Elements of the view are TopoDS_Shape objects.
+This shape is exploded into sub-shapes using TopoDS_Iterator of the TopoDS_Shape.
+Child sub-shapes are presented in the view as children of the initial shape.
+Iterating recursively by all shapes we obtain a tree view of items shown in the ShapeView.

-The columns of the View show some information about *TopoDS_Shape* of the item.
-The first column allows changing the visibility of the item shape in the 3D view.

-Context pop-up menu in tree view:
+Columns of the View show some information about TopoDS_Shape of the item.
+The most informative column is the last column of TopoDS_Vertex and TopoDS_Edge shape types.
+
+For TopoDS_Vertex it contains the point coordinates,
+
+for TopoDS_Edge it contains the first and the last point coordinates, the edge length and some other parameters.
+
+
+Context popup menu in tree view:
 | Action | Functionality |
 | :----- | :----- |
-| Load BREP file | Opens the selected file and appends the resulting *TopoDS_Shape* into the tree view. |
-| Remove all shape items | Clears tree view. |
-| BREP view | Shows the text view with BREP content of the selected item. Creates the BREP file in a temporary directory of the plugin. |
-| Close All BREP views | Closes all opened text views. |
-| BREP directory | Displays the folder, where temporary BREP files have been stored. |
+| Load BREP file | Opens selected file and appends the result TopoDS_Shape into tree view |
+| Remove all shape items | Clears tree view |
+| BREP view | Shows text view with BREP content of the selected item. It creates BREP file in temporary directory of the plugin. |
+| Close All BREP views | Closes all opened text views |
+| BREP directory | Displays folder where temporary BREP files have been stored.  |

@subsubsection occt_inspector_2_4_3 Elements cooperation

-Selection of one or several items in *TopoDS_Shape* View creates its *AIS_Shape* presentation and displays it in the 3D View.
+Selection of one or several items in TopoDS_Shape View creates AIS_Shape presentation for it and displays it in the 3D View.

-@subsubsection occt_inspector_2_4_4 ShapeView tree view columns
-
-Use context pop-up menu on the tree view header to select, which columns should be displayed.
-@figure{shapeview_tree_columns.png, "ShapeView tree header context menu",360}


@section occt_inspector_3 Common controls
+@subsection occt_inspector_3_1 3D View

-@subsection occt_inspector_3_1 Tree View
+@subsubsection occt_inspector_3_1_1 Overview

-This control shows presentation hierarchy of the investigated OCCT element, e.g. *TDocStd_Application* for DFBrowser, see @ref occt_inspector_1_1 "Overview".
-The first column contains the name, other columns are informative.
+@figure{3DView.png, "3D View"}

-The tree view has a context menu with plugin-specific actions.
-
-@subsubsection occt_inspector_3_1_1 Tree View preferences
-
-It is possible to define visibility and width of columns.
-This option is available in a view that contains more than one column,
- e.g. @ref occt_inspector_2_3_4 "VInspector tree view columns"
- and @ref occt_inspector_2_4_4 "ShapeView tree view columns".
-
-@figure{treeview_preferences.svg, "Preferences schema",360}
+Control for OCCT 3D viewer. It creates visualization view components with possibilities to perform some
+user actions for the view.


-@subsection occt_inspector_3_2 3D View
+@subsubsection occt_inspector_3_1_2 Elements

-@subsubsection occt_inspector_3_2_1 Overview
+@figure{3DView_elements.svg,"3DView Elements"}

-@figure{3DView.png, "3D View",360}
-
-This control for OCCT 3D viewer creates visualization view components and allows performing some user actions in the view.
-
-
-@subsubsection occt_inspector_3_2_2 Elements
-
-@figure{3DView_elements.svg,"3DView Elements",360}
-
-3D View contains the following elements:
+3D View contains:
 | Element | Functionality |
 | :----- | :----- |
-| 3D view | V3d viewer with mouse events processing. |
-| Context | Allows choosing another context that should be used in the plugin. The following contexts are available:<br> **Own** - the context of this view, <br> **External** - the context of the @ref occt_inspector_4_3 "external application", which initializes the plugin, <br> **None** - the visualization is not performed at all (useful if the presentation is too complex). |
-| Multi/Single | The buttons define what to do with the previously displayed objects: <br> **Multi** displays new presentations together with already displayed ones, <br> **Single** removes all previously displayed presentations. |
-| Clean | Removes all displayed presentations. |
-| Fit All,<br> Fit Area,<br> Zoom,<br> Pan,<br> Rotation | Scene manipulation actions<br> (Fit All is checkable. If checked(by double click), display/hide of new objects will perform **Fit All** of the scene.) |
-| Display Mode | Sets *AIS_Shading* or *AIS_WireFrame* display mode for all presentations. |
-
-Context popup menu:
-| Action | Functionality |
-| :----- | :----- |
-| Set View Orientation | Shows the list of available *V3d_View* projections. Selection of an item with change the view. |
-
-@figure{3DView_set_orientation.png,"Set view orientation",360}
-
-@subsubsection occt_inspector_3_2_3 3D View preferences.
-View preferences store the current view orientation.
-
-@subsection occt_inspector_3_3 Preferences context menu
-
-@figure{preferences.png,"Plugin preferences",360}
-
-Context menu contains:
-| Element | Functionality |
-| :----- | :----- |
-| Tree Level Line,<br> PropertyPanel,<br> Dump, <br> View| Names of dock widgets in the active plugin. If the button is checked, dock widget is visible. |
-| Store Preferences | Creates ".tinspector.xml" preferences file with the current settings for each plugin.<br> This file is created in TEMP/TMP directory (by default) or in a user-defined directory. |
-| Remove Preferences | Removes preferences file. After the Inspector is restarted, default values will be applied. |
+| 3D view | V3d viewer with mouse events processing |
+| Context | choice of another context that should be used in the plugin. <br> It is possible to use the next contexts:<br> Own - context of this view, <br> External - context come in parameters which intializes plugin, <br> None - do not perform visualization at all |
+| Multi/Single | Buttons defined what to do with the previous displayed objects: <br> Multi displays new presentations in additional to already displayed, <br> Single removes all previuos displayed presentations |
+| Clean | Removes all displayed presentations |
+| Fit All,<br> Fit Area,<br> Zoom,<br> Pan,<br> Rotation | Scene manipulation actions |
+| Display Mode | Sets *AIS_Shading* or *AIS_WireFrame* display mode for all presentations |


-The following controls have store/restore preferences:
-| Element | Preferences |
-| :----- | :----- |
-| Geometry| Inspector window size and position. <br>State of dockable widgets : visibility, position, size.|
-| @ref occt_inspector_3_1_1 "Tree View preferences"| Columns visible in the tree view and their width. |
-| @ref occt_inspector_3_2_3 "3D View preferences"| 3D view camera direction. |
+@section occt_inspector_6 TInspectorEXE sample

-@section occt_inspector_4 Getting Started
+Inspector functionality can be tried using this sample.

-@subsection occt_inspector_4_1 TInspectorEXE sample
+Use *inspector.bat* script file placed in binary directory of OCCT to launch it.

-This sample allows trying Inspector functionality.
-
-Use *inspector.bat* script file placed in a binary directory of OCCT to launch it.
-
-This script accepts the names of plugin's DLL that should be loaded. By default it loads all plugins described above.
+This script accepts the names of plugin's DLL that should be loaded. By default it loads all described above plugins.


-@figure{TStandaloneEXE.png, "TStandaloneEXE",360}
+@figure{TStandaloneEXE.png, "TStandaloneEXE"}

-Click on the Open button shows the dialog to select a file.
-@figure{TStandaloneEXE_open.png, "",360}
+Click on the Open button shows the dialog to select a file. The user is able to select one of the sample files or load own one.
+@figure{TStandaloneEXE_open.png, ""}

-Depending on the active plugin, it is possible to select the following files in the dialog:<br>
- DFBRowser: OCAF document or STEP files;
- VInspector: BREP files;
- ShapeView: BREP files.
+Depending on the active plugin, the following files should be selected in the dialog:
+OCAF document or STEP files for DFBRowser and BREP files for VInspector and ShapeView plugins.

-Click the file name in the proposed directory and enter it manually or using **Browse** button.
+It is possible to click the file name in the proposed directory, enter it manually or using Browser button.
+The last Loading icon becomes enabled if file name is correct.

-By default, TInspectorEXE opens the following files for plugins:
+
+By default TInspectorEXE opens the next files for plugins:
 | Plugin DLL library name | Files |
 | :----- | :----- |
 | TKDFBrowser | step/screw.step |
 | TKVInspector | occ/hammer.brep |
 | TKShapeView | occ/face1.brep, <br> occ/face2.brep |

-These files are found relatively to *CSF_OCCTDataPath*.
+These files are found relatively *CSF_OCCTDataPath*.

-@subsubsection occt_inspector_4_1_1 TInspectorEXE preferences
-The application stores recently loaded files. On the application start, the last file is activated.
-**Open file** dialog contains recently loaded files.
-Selection of a new file updates the container of recently loaded files and rewrites preferences.

-Source code of *TIspectorEXE* is a good sample for @ref occt_inspector_4_3 "using the Inspector in a custom application".
+Source code of TIspectorEXE is a good sample for @ref occt_inspector_8 "Using Inspector in a custom application".

-@subsection occt_inspector_4_2 How to launch the Inspector in DRAW Test Harness

-*TKToolsDraw* plugin provides DRAW commands for Qt tools. Use *INSPECTOR* parameter of @ref occt_draw_1_3_3 "pload" 
-command to download the commands of this library. It contains *tinspector* command to start Inspector under DRAW.
+@section occt_inspector_7 Launch in DRAW Test Harness
+
+TKToolsDraw plugin is created to provide DRAW commands for Qt tools. Use INSPECTOR parameter of @ref occt_draw_1_3_3 "pload" 
+command to download commands of this library. It contains tinspector command to start Inspector under DRAW.
 See more detailed description of the @ref occt_draw_13_1 "tinspector" command.

 The simple code to start Inspector with all plugins loaded:
@@ -484,31 +435,26 @@ pload INSPECTOR
 tinspector
 ~~~~~

-@figure{drawexe_tinspector.png,"tinspector",360}
+@figure{drawexe_tinspector.png,"tinspector"}

-This command does the following:
- all available Plugins are presented in the Inspector. These are @ref occt_inspector_2_2 "DFBrowser", @ref occt_inspector_2_3 "VInspector" and  @ref occt_inspector_2_4 "ShapeView";
- DFBrowser is the active plugin;
- OCAF tree is empty.
+Result of this command is the next:
+- all available Plugins are presented in the Inspector. These are @ref occt_inspector_2_2 "DFBrowser", @ref occt_inspector_2_3 "VInspector" and  @ref occt_inspector_2_4 "ShapeView".
+- DFBrowser is an active plugin
+- tree of OCAF is empty.

-After this, we should create objects in DRAW and update *tinspector*.
-The examples of using Inspector in DRAW can be found in OCCT source directory /tests/tools.
+After, we should create objects in DRAW and update tinspector.

-@subsection occt_inspector_4_3 How to use the Inspector in a custom application
+@section occt_inspector_8 Using in a custom application

-The example of using the Inspector in a custom application is presented in OCCT qt sample - <b>FuncDemo</b>.
-For building qt samples, switch on *BUILD_SAMPLES_QT* variable in @ref build_cmake_conf "Configuration process".
-
-In general, the following steps should be taken:
-* Set dependencies to OCCT and Qt in the application (Header and Link);
-* Create an instance of *TInspector_Communicator*;
-* Register the plugins of interest in the communicator by DLL library name;
-* Initialize the communicator with objects that will be investigated;
-* Set visible true for the communicator.
+To use Inspector in an application, the next steps should be done:
+* Set dependencies to OCCT and Qt in application (Header and Link)
+* Create an instance of TInspector_Communicator.
+* Register plugins of interest in the communicator by DLL library name
+* Initialize communicator with objects that will be investigated
+* Set visible true for commumicator


-
-Here is an example of C++ implementation:
+C++ code is similar:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}

 #include <inspector/TInspector_Communicator.hxx>
@@ -533,56 +479,100 @@ void CreateInspector()
  }
  MyTCommunicator->SetVisible (true);
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Give one the following objects for a plugin using a container of parameters:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 | Plugin | to be initialized by |
 | :----- | :----- |
-| *TKDFBrowser* | *TDocStd_Application* |
-| *TKVInspector* | *AIS_InteractiveContext* |
-| *TKShapeView* | *TopoDS_TShape* |
+| TKDFBrowser | TDocStd_Application |
+| TKVInspector | AIS_InteractiveContext |
+| TKShapeView | TopoDS_TShape |


-@section occt_inspector_5 Build procedure

-
-@subsection occt_inspector_5_1 Building with CMake within OCCT
+@section occt_inspector_4 Build procedure

 By default the Inspector compilation is off.
-To compile it, set the *BUILD_Inspector* flag to "ON". See @ref build_cmake_conf "Configuration process".
+To compile it, set the <b>BUILD_Inspector</b> flag to "ON". See @ref build_cmake_conf "Configuration process".

-When this option is switched ON, MS Visual Studio project has an additional tree of folders:
+When this option is switched On, MS Visual Studio project has an additional tree of folders:

-@figure{VStudio_projects.png,"Inspector packages in MS Visual Studio",160}
+@figure{VStudio_projects.png,"Inspector packages in MS Visual Studio"}


-@section occt_inspector_6 Sources and packaging
+@section occt_inspector_5 Sources and packaging

 OCCT sources are extended by the /tools directory.

-Distribution of plugin packages :
-| Source packages | Plugin |
+Distribution of packages participated in plugins:
+| Sources packages| Plugin |
 | :----- | :----- |
-| *DFBrowser*, <br> *DFBrowserPane*, <br> *DFBrowserPaneXDE*, <br> *TKDFBrowser* | DFBrowser |
-| *VInspector*, <br> *TKVInspector*  | VInspector |
-| *ShapeView*, <br> *TKShapeView* | ShapeView |
+| DFBrowser, <br> DFBrowserPane, <br> DFBrowserPaneXDE, <br> TKDFBrowser | DFBrowser |
+| VInspector, <br> TKVInspector  | VInspector |
+| ShapeView, <br> TKShapeView | ShapeView |

 Other packages:
-| Source packages| Used in |
+| Sources packages| Used in |
 | :----- | :----- |
-| *TInspectorAPI*, <br> *TKInspectorAPI* | Interface for connection to plugin. |
-| *TreeModel*, <br> *TKTreeView* | Items-oriented model to simplify work with GUI tree control. |
-| *View*, <br> *TKView* | 3D View component. |
-| *TInspector*, <br> *TKTInspector*  | Inspector window, where plugins are placed. |
-| *ToolsDraw*, <br> *TKToolsDraw* | Plugin for DRAW to start Inspector. |
+| TInspectorAPI, <br> TKInspectorAPI | Iterface for connection to plugin. |
+| TreeModel, <br> TKTreeView | Items-oriented model to simplify work with GUI tree control. |
+| View, <br> TKView | 3D View component |
+| TInspector, <br> TKTInspector  | Inspector window where plugins are placed |
+| ToolsDraw, <br> TKToolsDraw | Plugin for DRAW to start Inspector |


-In MSVC studio, a separate folder contains Inspector projects.
+In MSVC studio the separate folder contains Inspector projects.

-@section occt_inspector_7 Glossary
-* **Component** -- a part of OCCT , e.g. OCAF, VISUALIZATION, MODELING and others. 
-* **Plugin** -- a library that is loaded in some executable/library. Here, the plugins are:
+@section occt_inspector_9 Glossary
+* **Component** -- OCCT part, e.g. OCAF, VISUALIZATION, MODELING and others. 
+* **Plugin** -- library that is loaded in some executable/library. Here, the plugins are:
  * DFBrowser,
  * ShapeView,
  * VInspector.
+
+@subsection occt_attribute_simple_types TDF_Attribute Simple types
+Types where the content is a single value
+
+| Type | Kind of value |
+| :----- | :----- |
+| TDataStd_AsciiString | TDataStd_AsciiString |
+| TDataStd_Comment | TCollection_ExtendedString |
+| TDataStd_Integer | Standard_Integer |
+| TDataStd_Name | TCollection_ExtendedString |
+| TDataStd_Real | Standard_Real |
+| TDF_Reference | TDF_Label |
+| TDF_TagSource | Standard_Integer |
+
+
+@subsection occt_attribute_list_types TDF_Attribute List types
+
+| Type | Kind of value (container of) |
+| :----- | :----- |
+| TDataStd_BooleanList | Standard_Boolean |
+| TDataStd_ExtStringList | TCollection_ExtendedString |
+| TDataStd_IntegerList | Standard_Integer |
+| TDataStd_RealList | Standard_Real |
+| TDataStd_ReferenceList | TDF_Label |
+
+@subsection occt_attribute_array_types TDF_Attribute Array types
+
+| Type | Kind of value (container of) |
+| :----- | :----- |
+| TDataStd_BooleanArray | Standard_Boolean |
+| TDataStd_ByteArray | Standard_Byte |
+| TDataStd_ExtStringArray | TCollection_ExtendedString |
+| TDataStd_IntegerArray | Standard_Integer |
+| TDataStd_RealArray | Standard_Real |
+| TDataStd_ReferenceArray | TDF_Label |
+
+@subsection occt_attribute_xde_tree_node_id XDE tree node ID description
+| GUID | Text |
+| :----- | :----- |
+| XCAFDoc::ShapeRefGUID() | Shape Instance Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorGen) | Generic Color Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorSurf) | Surface Color Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorCurv) | Curve Color Link |
+| XCAFDoc::DimTolRefGUID() | DGT Link |
+| XCAFDoc::DatumRefGUID() | Datum Link |
+| XCAFDoc::MaterialRefGUID() | Material Link |
+
--- a/dox/user_guides/modeling_algos/images/modeling_algos_image057.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_image057.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mesh_001.svg
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mesh_001.svg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gka	c30097d4ce	Additional fix for 29713	2018-04-25 19:42:27 +03:00
gka	871a52cf1b	0029713: Test Harness command "fixshape" can not fix attached face Fix to reverse invalid oriented pcurves was made	2018-04-23 16:41:44 +03:00
				`@@ -1 +0,0 @@`
				`#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"`