[Refactor] 不要なフォントファイル群を削除

diff --git a/configure.ac b/configure.ac
index 48fdd0e..fac2d96 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,4 +150,4 @@ AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(gethostname mkdir select socket strtol vsnprintf mkstemp usleep)
 
-AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/font/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile)
+AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile)

diff --git a/lib/xtra/Makefile.am b/lib/xtra/Makefile.am
index cd9248d..34d6949 100644 (file)
--- a/lib/xtra/Makefile.am
+++ b/lib/xtra/Makefile.am
@@ -2,4 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = font graf music sound
+SUBDIRS = graf music sound

diff --git a/lib/xtra/font/10X20.FON b/lib/xtra/font/10X20.FON
deleted file mode 100644 (file)
index 5a51ee9..0000000
Binary files a/lib/xtra/font/10X20.FON and /dev/null differ

diff --git a/lib/xtra/font/12X24.FON b/lib/xtra/font/12X24.FON
deleted file mode 100644 (file)
index 7542c93..0000000
Binary files a/lib/xtra/font/12X24.FON and /dev/null differ

diff --git a/lib/xtra/font/5X8.FON b/lib/xtra/font/5X8.FON
deleted file mode 100644 (file)
index 53cdb63..0000000
Binary files a/lib/xtra/font/5X8.FON and /dev/null differ

diff --git a/lib/xtra/font/6X10.FON b/lib/xtra/font/6X10.FON
deleted file mode 100644 (file)
index cb93c32..0000000
Binary files a/lib/xtra/font/6X10.FON and /dev/null differ

diff --git a/lib/xtra/font/6X12.FON b/lib/xtra/font/6X12.FON
deleted file mode 100644 (file)
index 304af0b..0000000
Binary files a/lib/xtra/font/6X12.FON and /dev/null differ

diff --git a/lib/xtra/font/6X13.FON b/lib/xtra/font/6X13.FON
deleted file mode 100644 (file)
index 9e59e40..0000000
Binary files a/lib/xtra/font/6X13.FON and /dev/null differ

diff --git a/lib/xtra/font/6X13B.FON b/lib/xtra/font/6X13B.FON
deleted file mode 100644 (file)
index 07fa493..0000000
Binary files a/lib/xtra/font/6X13B.FON and /dev/null differ

diff --git a/lib/xtra/font/6X9.FON b/lib/xtra/font/6X9.FON
deleted file mode 100644 (file)
index c0913ac..0000000
Binary files a/lib/xtra/font/6X9.FON and /dev/null differ

diff --git a/lib/xtra/font/7X13.FON b/lib/xtra/font/7X13.FON
deleted file mode 100644 (file)
index d7f24c6..0000000
Binary files a/lib/xtra/font/7X13.FON and /dev/null differ

diff --git a/lib/xtra/font/7X13B.FON b/lib/xtra/font/7X13B.FON
deleted file mode 100644 (file)
index 6031925..0000000
Binary files a/lib/xtra/font/7X13B.FON and /dev/null differ

diff --git a/lib/xtra/font/8X13.FON b/lib/xtra/font/8X13.FON
deleted file mode 100644 (file)
index adf8ffa..0000000
Binary files a/lib/xtra/font/8X13.FON and /dev/null differ

diff --git a/lib/xtra/font/8X13B.FON b/lib/xtra/font/8X13B.FON
deleted file mode 100644 (file)
index e1d3510..0000000
Binary files a/lib/xtra/font/8X13B.FON and /dev/null differ

diff --git a/lib/xtra/font/9X15.FON b/lib/xtra/font/9X15.FON
deleted file mode 100644 (file)
index 7963de7..0000000
Binary files a/lib/xtra/font/9X15.FON and /dev/null differ

diff --git a/lib/xtra/font/9X15B.FON b/lib/xtra/font/9X15B.FON
deleted file mode 100644 (file)
index ff5ab21..0000000
Binary files a/lib/xtra/font/9X15B.FON and /dev/null differ

diff --git a/lib/xtra/font/Makefile.am b/lib/xtra/font/Makefile.am
deleted file mode 100644 (file)
index 2f70f30..0000000
--- a/lib/xtra/font/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Makefile.am -- Process this file with automake to process Makefile.in
-
-EXTRA_DIST = \
-       10X20.FON 12X24.FON 5X8.FON 6X10.FON 6X12.FON 6X13.FON \
-       6X13B.FON 6X9.FON 7X13.FON 7X13B.FON 8X13.FON 8X13B.FON \
-       9X15.FON 9X15B.FON xm10x17.fnt xm10x17b.fnt xm12x20.fnt \
-       xm12x20b.fnt xm16x25.fnt xm16x25b.fnt xm4x6.fnt xm5x8.fnt \
-       xm6x12.fnt xm6x12b.fnt xm8x13.fnt xm8x13b.fnt xm8x16.fnt \
-       xm8x16b.fnt

diff --git a/lib/xtra/font/xm10x17.fnt b/lib/xtra/font/xm10x17.fnt
deleted file mode 100644 (file)
index bf96f2c..0000000
Binary files a/lib/xtra/font/xm10x17.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm10x17b.fnt b/lib/xtra/font/xm10x17b.fnt
deleted file mode 100644 (file)
index 4df0743..0000000
Binary files a/lib/xtra/font/xm10x17b.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm12x20.fnt b/lib/xtra/font/xm12x20.fnt
deleted file mode 100644 (file)
index 7d4b3ab..0000000
Binary files a/lib/xtra/font/xm12x20.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm12x20b.fnt b/lib/xtra/font/xm12x20b.fnt
deleted file mode 100644 (file)
index d43c199..0000000
Binary files a/lib/xtra/font/xm12x20b.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm16x25.fnt b/lib/xtra/font/xm16x25.fnt
deleted file mode 100644 (file)
index abe43d4..0000000
Binary files a/lib/xtra/font/xm16x25.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm16x25b.fnt b/lib/xtra/font/xm16x25b.fnt
deleted file mode 100644 (file)
index e676a37..0000000
Binary files a/lib/xtra/font/xm16x25b.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm4x6.fnt b/lib/xtra/font/xm4x6.fnt
deleted file mode 100644 (file)
index f879fe4..0000000
Binary files a/lib/xtra/font/xm4x6.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm5x8.fnt b/lib/xtra/font/xm5x8.fnt
deleted file mode 100644 (file)
index 1d3f597..0000000
Binary files a/lib/xtra/font/xm5x8.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm6x12.fnt b/lib/xtra/font/xm6x12.fnt
deleted file mode 100644 (file)
index 173a687..0000000
Binary files a/lib/xtra/font/xm6x12.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm6x12b.fnt b/lib/xtra/font/xm6x12b.fnt
deleted file mode 100644 (file)
index 81c2da4..0000000
Binary files a/lib/xtra/font/xm6x12b.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm8x13.fnt b/lib/xtra/font/xm8x13.fnt
deleted file mode 100644 (file)
index 57d2dd3..0000000
Binary files a/lib/xtra/font/xm8x13.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm8x13b.fnt b/lib/xtra/font/xm8x13b.fnt
deleted file mode 100644 (file)
index 00c25d6..0000000
Binary files a/lib/xtra/font/xm8x13b.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm8x16.fnt b/lib/xtra/font/xm8x16.fnt
deleted file mode 100644 (file)
index 0f7de64..0000000
Binary files a/lib/xtra/font/xm8x16.fnt and /dev/null differ

diff --git a/lib/xtra/font/xm8x16b.fnt b/lib/xtra/font/xm8x16b.fnt
deleted file mode 100644 (file)
index 54b4e49..0000000
Binary files a/lib/xtra/font/xm8x16b.fnt and /dev/null differ

diff --git a/src/main-win.cpp b/src/main-win.cpp
index f0a92a8..73e0360 100644 (file)
--- a/src/main-win.cpp
+++ b/src/main-win.cpp
@@ -37,8 +37,7 @@
  * </p>
  *
  * <p>
- * The "lib/user/font-win.prf" contains attr/char mappings for use with the
- * normal "lib/xtra/font/*.fon" font files.
+ * The "lib/user/font-win.prf" contains attr/char mappings for wall.bmp.
  * </p>
  *
  * <p>

diff --git a/src/system/h-config.h b/src/system/h-config.h
index 4f7030c..322258b 100644 (file)
--- a/src/system/h-config.h
+++ b/src/system/h-config.h
@@ -211,25 +211,26 @@
 /* #define MAINTAINER  "rr9@angband.org" */
 #define MAINTAINER "echizen@users.sourceforge.jp"
 
-#ifdef JP
+/*
+ * OPTION: Default font (when using X11).
+ */
 #ifdef USE_XFT
+#ifdef JP
 #define DEFAULT_X11_FONT "monospace-24:lang=ja:spacing=90"
 #define DEFAULT_X11_FONT_SUB "sans-serif-16:lang=ja"
 #else
-/*
- * OPTION: Default font (when using X11).
- */
-#define DEFAULT_X11_FONT \
-       "-*-*-medium-r-normal--24-*-*-*-*-*-iso8859-1" \
-       ",-*-*-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0"
-/*     "12x24" \
-       ",kanji24"*/
-#define DEFAULT_X11_FONT_SUB \
-       "-*-*-medium-r-normal--16-*-*-*-*-*-iso8859-1" \
-       ",-*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0"
+#define DEFAULT_X11_FONT "monospace-24:lang=en:spacing=90"
+#define DEFAULT_X11_FONT_SUB "sans-serif-16:lang=en"
+#endif
+#else
+#ifdef JP
+#define DEFAULT_X11_FONT "-*-*-medium-r-normal--24-*-*-*-*-*-iso8859-1,-*-*-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0"
+#define DEFAULT_X11_FONT_SUB "-*-*-medium-r-normal--16-*-*-*-*-*-iso8859-1,-*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0"
+#else
+#define DEFAULT_X11_FONT "-*-*-medium-r-normal--24-*-*-*-*-*-iso8859-1"
+#define DEFAULT_X11_FONT_SUB "-*-*-medium-r-normal--16-*-*-*-*-*-iso8859-1"
+#endif
 #endif
-/*     "8x16" \
-       ",kanji16"*/
 
 /*
  * OPTION: Default fonts (when using X11)
@@ -242,22 +243,3 @@
 #define DEFAULT_X11_FONT_5             DEFAULT_X11_FONT_SUB
 #define DEFAULT_X11_FONT_6             DEFAULT_X11_FONT_SUB
 #define DEFAULT_X11_FONT_7             DEFAULT_X11_FONT_SUB
-
-#else
-/*
- * OPTION: Default font (when using X11).
- */
-#define DEFAULT_X11_FONT               "9x15"
-
-/*
- * OPTION: Default fonts (when using X11)
- */
-#define DEFAULT_X11_FONT_0             "10x20"
-#define DEFAULT_X11_FONT_1             "9x15"
-#define DEFAULT_X11_FONT_2             "9x15"
-#define DEFAULT_X11_FONT_3             "5x8"
-#define DEFAULT_X11_FONT_4             "5x8"
-#define DEFAULT_X11_FONT_5             "5x8"
-#define DEFAULT_X11_FONT_6             "5x8"
-#define DEFAULT_X11_FONT_7             "5x8"
-#endif