[mathtext] mv to builtin subdir for consistency

CMakeLists.txt

@@ -403,6 +403,7 @@ add_subdirectory (hist)
 add_subdirectory (tree)
 add_subdirectory (io)
 add_subdirectory (net)
+add_subdirectory (builtins/mathtext) # hard coded builtin for graf2d
 add_subdirectory (graf2d)
 add_subdirectory (graf3d)
 if(NOT minimal)

graf2d/mathtext/CMakeLists.txt → builtins/mathtext/CMakeLists.txt

@@ -5,22 +5,22 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ROOT_LINKER_LIBRARY(mathtext
-  fontembed.cxx
-  fontembedps.cxx
-  mathrender.cxx
-  mathrenderstyle.cxx
-  mathrendertoken.cxx
-  mathtext.cxx
-  mathtextencode.cxx
-  mathtextparse.cxx
-  mathtextview.cxx
+  fontembed.cc
+  fontembedps.cc
+  mathrender.cc
+  mathrenderstyle.cc
+  mathrendertoken.cc
+  mathtext.cc
+  mathtextencode.cc
+  mathtextparse.cc
+  mathtextview.cc
   TYPE
     STATIC
   NOINSTALL
 )
 
 check_cxx_compiler_flag(-Wbidi-chars=none GCC_HAS_BIDI_CHARS_FLAG)
 if(GCC_HAS_BIDI_CHARS_FLAG)
-    set_source_files_properties(src/fontembed.cxx COMPILE_FLAGS "-Wbidi-chars=none")
+    set_source_files_properties(src/fontembed.cc COMPILE_FLAGS "-Wbidi-chars=none")
 endif()
 set_property(TARGET mathtext PROPERTY POSITION_INDEPENDENT_CODE ON)

documentation/doxygen/Doxyfile

@@ -1085,7 +1085,7 @@ EXCLUDE                = ../../interpreter/ \
     ../../core/lzma/ \
     ../../core/newdelete/ \
     ../../core/textinput/ \
-    ../../graf2d/mathtext/ \
+    ../../builtins/mathtext/ \
     ../../graf3d/ftgl/ \
     ../../graf3d/x3d/ \
     ../../net/rootd/ \

documentation/doxygen/makeinput.sh

@@ -80,7 +80,7 @@ echo "        ../../bindings/r/                \\" >> Doxyfile_INPUT
 # echo "        ../../core/lzma/                 \\" >> Doxyfile_INPUT
 # echo "        ../../core/newdelete/            \\" >> Doxyfile_INPUT
 # echo "        ../../core/textinput/            \\" >> Doxyfile_INPUT
-# echo "        ../../graf2d/mathtext/           \\" >> Doxyfile_INPUT
+# echo "        ../../builtins/mathtext/           \\" >> Doxyfile_INPUT
 # echo "        ../../graf3d/ftgl/               \\" >> Doxyfile_INPUT
 # echo "        ../../graf3d/x3d/                \\" >> Doxyfile_INPUT
 # echo "        ../../net/rootd/                 \\" >> Doxyfile_INPUT

graf2d/CMakeLists.txt

@@ -11,7 +11,6 @@ endif()
 add_subdirectory(gpad)
 add_subdirectory(graf)
 add_subdirectory(postscript)
-add_subdirectory(mathtext)
 if(WIN32)
   add_subdirectory(win32gdk)
 elseif(x11)

graf2d/graf/src/TMathText.cxx

@@ -22,8 +22,8 @@
 #include "TVirtualPS.h"
 #include "TText.h"
 
-#include "../../../graf2d/mathtext/inc/mathtext.h"
-#include "../../../graf2d/mathtext/inc/mathrender.h"
+#include "../../../builtins/mathtext/inc/mathtext.h"
+#include "../../../builtins/mathtext/inc/mathrender.h"
 
 /** \class TMathText
 \ingroup BasicGraphics

graf2d/postscript/src/TPostScript.cxx

@@ -250,7 +250,7 @@ To change the color model use `gStyle->SetColorModelPS(c)`.
 #include "TSystem.h"
 #include "TEnv.h"
 
-#include "../../../graf2d/mathtext/inc/fontembed.h"
+#include "../../../builtins/mathtext/inc/fontembed.h"
 
 // to scale fonts to the same size as the old TT version
 const Float_t kScale = 0.93376068;