From 8055ed24ff9f9d8a6441ffef30e6c3458aee4ace Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 24 Oct 2018 03:38:13 -0500 Subject: [PATCH] Move font data to a subfolder --- Marlin/src/core/language.h | 2 +- .../fontdata_6x9_marlin.h} | 0 .../fontdata_ISO10646_1.h} | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_an.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_bg.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_ca.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_cz.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_da.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_de.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_el-gr.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_el.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_en.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_es.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_eu.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_fi.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_fr.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_gl.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_hr.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_it.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_jp-kana.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_ko_KR.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_nl.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_pl.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_pt-br.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_pt.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_ru.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_sk.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_test.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_tr.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_uk.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_zh_CN.h | 0 Marlin/src/lcd/dogm/{ => fontdata}/language_data_zh_TW.h | 0 Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp | 6 +++--- buildroot/share/fonts/genallfont.sh | 6 +++--- 34 files changed, 7 insertions(+), 7 deletions(-) rename Marlin/src/lcd/dogm/{dogm_font_data_6x9_marlin.h => fontdata/fontdata_6x9_marlin.h} (100%) rename Marlin/src/lcd/dogm/{dogm_font_data_ISO10646_1.h => fontdata/fontdata_ISO10646_1.h} (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_an.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_bg.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_ca.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_cz.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_da.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_de.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_el-gr.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_el.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_en.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_es.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_eu.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_fi.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_fr.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_gl.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_hr.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_it.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_jp-kana.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_ko_KR.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_nl.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_pl.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_pt-br.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_pt.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_ru.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_sk.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_test.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_tr.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_uk.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_zh_CN.h (100%) rename Marlin/src/lcd/dogm/{ => fontdata}/language_data_zh_TW.h (100%) diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index c6389272c..b6bddd2b8 100644 --- a/Marlin/src/core/language.h +++ b/Marlin/src/core/language.h @@ -264,7 +264,7 @@ // LCD Menu Messages -#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(language_data_##M.h) +#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/language_data_##M.h) #define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M) #define INCLUDE_LANGUAGE_DATA LANGUAGE_DATA_INCL(LCD_LANGUAGE) diff --git a/Marlin/src/lcd/dogm/dogm_font_data_6x9_marlin.h b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h similarity index 100% rename from Marlin/src/lcd/dogm/dogm_font_data_6x9_marlin.h rename to Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h diff --git a/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h similarity index 100% rename from Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h rename to Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h diff --git a/Marlin/src/lcd/dogm/language_data_an.h b/Marlin/src/lcd/dogm/fontdata/language_data_an.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_an.h rename to Marlin/src/lcd/dogm/fontdata/language_data_an.h diff --git a/Marlin/src/lcd/dogm/language_data_bg.h b/Marlin/src/lcd/dogm/fontdata/language_data_bg.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_bg.h rename to Marlin/src/lcd/dogm/fontdata/language_data_bg.h diff --git a/Marlin/src/lcd/dogm/language_data_ca.h b/Marlin/src/lcd/dogm/fontdata/language_data_ca.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_ca.h rename to Marlin/src/lcd/dogm/fontdata/language_data_ca.h diff --git a/Marlin/src/lcd/dogm/language_data_cz.h b/Marlin/src/lcd/dogm/fontdata/language_data_cz.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_cz.h rename to Marlin/src/lcd/dogm/fontdata/language_data_cz.h diff --git a/Marlin/src/lcd/dogm/language_data_da.h b/Marlin/src/lcd/dogm/fontdata/language_data_da.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_da.h rename to Marlin/src/lcd/dogm/fontdata/language_data_da.h diff --git a/Marlin/src/lcd/dogm/language_data_de.h b/Marlin/src/lcd/dogm/fontdata/language_data_de.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_de.h rename to Marlin/src/lcd/dogm/fontdata/language_data_de.h diff --git a/Marlin/src/lcd/dogm/language_data_el-gr.h b/Marlin/src/lcd/dogm/fontdata/language_data_el-gr.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_el-gr.h rename to Marlin/src/lcd/dogm/fontdata/language_data_el-gr.h diff --git a/Marlin/src/lcd/dogm/language_data_el.h b/Marlin/src/lcd/dogm/fontdata/language_data_el.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_el.h rename to Marlin/src/lcd/dogm/fontdata/language_data_el.h diff --git a/Marlin/src/lcd/dogm/language_data_en.h b/Marlin/src/lcd/dogm/fontdata/language_data_en.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_en.h rename to Marlin/src/lcd/dogm/fontdata/language_data_en.h diff --git a/Marlin/src/lcd/dogm/language_data_es.h b/Marlin/src/lcd/dogm/fontdata/language_data_es.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_es.h rename to Marlin/src/lcd/dogm/fontdata/language_data_es.h diff --git a/Marlin/src/lcd/dogm/language_data_eu.h b/Marlin/src/lcd/dogm/fontdata/language_data_eu.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_eu.h rename to Marlin/src/lcd/dogm/fontdata/language_data_eu.h diff --git a/Marlin/src/lcd/dogm/language_data_fi.h b/Marlin/src/lcd/dogm/fontdata/language_data_fi.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_fi.h rename to Marlin/src/lcd/dogm/fontdata/language_data_fi.h diff --git a/Marlin/src/lcd/dogm/language_data_fr.h b/Marlin/src/lcd/dogm/fontdata/language_data_fr.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_fr.h rename to Marlin/src/lcd/dogm/fontdata/language_data_fr.h diff --git a/Marlin/src/lcd/dogm/language_data_gl.h b/Marlin/src/lcd/dogm/fontdata/language_data_gl.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_gl.h rename to Marlin/src/lcd/dogm/fontdata/language_data_gl.h diff --git a/Marlin/src/lcd/dogm/language_data_hr.h b/Marlin/src/lcd/dogm/fontdata/language_data_hr.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_hr.h rename to Marlin/src/lcd/dogm/fontdata/language_data_hr.h diff --git a/Marlin/src/lcd/dogm/language_data_it.h b/Marlin/src/lcd/dogm/fontdata/language_data_it.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_it.h rename to Marlin/src/lcd/dogm/fontdata/language_data_it.h diff --git a/Marlin/src/lcd/dogm/language_data_jp-kana.h b/Marlin/src/lcd/dogm/fontdata/language_data_jp-kana.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_jp-kana.h rename to Marlin/src/lcd/dogm/fontdata/language_data_jp-kana.h diff --git a/Marlin/src/lcd/dogm/language_data_ko_KR.h b/Marlin/src/lcd/dogm/fontdata/language_data_ko_KR.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_ko_KR.h rename to Marlin/src/lcd/dogm/fontdata/language_data_ko_KR.h diff --git a/Marlin/src/lcd/dogm/language_data_nl.h b/Marlin/src/lcd/dogm/fontdata/language_data_nl.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_nl.h rename to Marlin/src/lcd/dogm/fontdata/language_data_nl.h diff --git a/Marlin/src/lcd/dogm/language_data_pl.h b/Marlin/src/lcd/dogm/fontdata/language_data_pl.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_pl.h rename to Marlin/src/lcd/dogm/fontdata/language_data_pl.h diff --git a/Marlin/src/lcd/dogm/language_data_pt-br.h b/Marlin/src/lcd/dogm/fontdata/language_data_pt-br.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_pt-br.h rename to Marlin/src/lcd/dogm/fontdata/language_data_pt-br.h diff --git a/Marlin/src/lcd/dogm/language_data_pt.h b/Marlin/src/lcd/dogm/fontdata/language_data_pt.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_pt.h rename to Marlin/src/lcd/dogm/fontdata/language_data_pt.h diff --git a/Marlin/src/lcd/dogm/language_data_ru.h b/Marlin/src/lcd/dogm/fontdata/language_data_ru.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_ru.h rename to Marlin/src/lcd/dogm/fontdata/language_data_ru.h diff --git a/Marlin/src/lcd/dogm/language_data_sk.h b/Marlin/src/lcd/dogm/fontdata/language_data_sk.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_sk.h rename to Marlin/src/lcd/dogm/fontdata/language_data_sk.h diff --git a/Marlin/src/lcd/dogm/language_data_test.h b/Marlin/src/lcd/dogm/fontdata/language_data_test.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_test.h rename to Marlin/src/lcd/dogm/fontdata/language_data_test.h diff --git a/Marlin/src/lcd/dogm/language_data_tr.h b/Marlin/src/lcd/dogm/fontdata/language_data_tr.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_tr.h rename to Marlin/src/lcd/dogm/fontdata/language_data_tr.h diff --git a/Marlin/src/lcd/dogm/language_data_uk.h b/Marlin/src/lcd/dogm/fontdata/language_data_uk.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_uk.h rename to Marlin/src/lcd/dogm/fontdata/language_data_uk.h diff --git a/Marlin/src/lcd/dogm/language_data_zh_CN.h b/Marlin/src/lcd/dogm/fontdata/language_data_zh_CN.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_zh_CN.h rename to Marlin/src/lcd/dogm/fontdata/language_data_zh_CN.h diff --git a/Marlin/src/lcd/dogm/language_data_zh_TW.h b/Marlin/src/lcd/dogm/fontdata/language_data_zh_TW.h similarity index 100% rename from Marlin/src/lcd/dogm/language_data_zh_TW.h rename to Marlin/src/lcd/dogm/fontdata/language_data_zh_TW.h diff --git a/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp index 3e91cbde7..524b6b8ba 100644 --- a/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp @@ -60,7 +60,7 @@ #include "../../feature/bedlevel/ubl/ubl.h" #endif -// The Marlin special symbols is now in the dogm_font_data_ISO10646_1.h +// The Marlin special symbols is now in the fontdata_ISO10646_1.h #define FONT_SPECIAL_NAME ISO10646_1_5x7 // Only Western languages support big / small fonts @@ -70,7 +70,7 @@ #endif #if ENABLED(USE_SMALL_INFOFONT) - #include "dogm_font_data_6x9_marlin.h" + #include "fontdata/fontdata_6x9_marlin.h" #define FONT_STATUSMENU_NAME u8g_font_6x9 #define INFO_FONT_HEIGHT 7 #else @@ -80,7 +80,7 @@ #include LANGUAGE_DATA_INCL(LCD_LANGUAGE) -#include "dogm_font_data_ISO10646_1.h" +#include "fontdata/fontdata_ISO10646_1.h" #define FONT_MENU_NAME ISO10646_1_5x7 // DOGM parameters (size in pixels) diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh index cc0e3f27b..b4afc4fbb 100755 --- a/buildroot/share/fonts/genallfont.sh +++ b/buildroot/share/fonts/genallfont.sh @@ -64,13 +64,13 @@ for LANG in ${MARLIN_LANGS:=$LANGS_DEFAULT} ; do ${EXEC_WXGGEN} "${FN_FONT}" sed -i fontutf8-data.h -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' 2>/dev/null cd ../ - mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/language_data_${LANG}.h + mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/fontdata/language_data_${LANG}.h rm -rf ${DN_WORK}/ done # # Generate default ASCII font (char range 0-255): -# Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h +# Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h # #if [ "${MARLIN_LANGS}" == "${LANGS_DEFAULT}" ]; then if [ 1 = 1 ]; then @@ -82,7 +82,7 @@ if [ 1 = 1 ]; then TMP1=$(cat tmp1.h) ; rm tmp1.h TMP2=$(cat tmp2.h) ; rm tmp2.h - cat <../src/lcd/dogm/dogm_font_data_ISO10646_1.h + cat <../src/lcd/dogm/fontdata/fontdata_ISO10646_1.h /** * Marlin 3D Printer Firmware * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]