diff --git a/src/Plugins/Metafont/load_tex.hpp b/src/Plugins/Metafont/load_tex.hpp index b83233f2b5..aa813baae9 100644 --- a/src/Plugins/Metafont/load_tex.hpp +++ b/src/Plugins/Metafont/load_tex.hpp @@ -14,6 +14,8 @@ #include "load_pk.hpp" #include "load_tfm.hpp" +void setup_tex (); +void init_tex (); void load_tex (string family, int size, int dpi, int dsize, tex_font_metric& tfm, font_glyphs& pk); diff --git a/src/System/Boot/init_texmacs.cpp b/src/System/Boot/init_texmacs.cpp index 88d36e5684..d13677142f 100644 --- a/src/System/Boot/init_texmacs.cpp +++ b/src/System/Boot/init_texmacs.cpp @@ -34,13 +34,10 @@ #include #include #endif +#include "Metafont/load_tex.hpp" int install_status = 0; -extern void setup_tex (); // from Plugins/Metafont/tex_init.cpp -extern void init_tex (); // from Plugins/Metafont/tex_init.cpp - - /****************************************************************************** * Texmacs paths ******************************************************************************/ diff --git a/tests/L3/Graphics/Fonts/font_test.cpp b/tests/L3/Graphics/Fonts/font_test.cpp index 1f1c1188c3..d6742f6a62 100644 --- a/tests/L3/Graphics/Fonts/font_test.cpp +++ b/tests/L3/Graphics/Fonts/font_test.cpp @@ -9,21 +9,26 @@ * in the root directory or . ******************************************************************************/ +#include "Metafont/load_tex.hpp" +#include "base.hpp" #include "font.hpp" +#include "sys_utils.hpp" #include class TestFont : public QObject { Q_OBJECT private slots: + void init () { init_lolly (); } void test_get_extents (); }; void TestFont::test_get_extents () { - // sys-chinese-rm-medium-right-10-600-smart - // font fn= smart_font ("sys-chinese", "rm", "medium", "right", 10, 600); - // cout << fn->res_name << LF; + set_new_fonts (true); + init_tex (); + font fn= smart_font ("sys-chinese", "rm", "medium", "right", 10, 600); + qcompare (fn->res_name, "sys-chinese-rm-medium-right-10-600-smart"); } QTEST_MAIN (TestFont)