Fri Jan 7 20:11:48 PST 2000 Michael Jennings <mej@eterm.org>

	A patch from Sung-Hyun Nam <namsh@lgic.co.kr> to improve multi-byte
	font configuration in the default theme files.


SVN revision: 1870

9 files changed, 104 insertions, 119 deletions

diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index 324a03f..05aa36f 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 251ffdd..00804b8 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -6,13 +6,6 @@ EXTRA_DIST = Eterm/theme.cfg.in irc/theme.cfg.in chooser/theme.cfg.in emacs/them
              Eterm/menus.cfg irc/menus.cfg chooser/menus.cfg emacs/menus.cfg mutt/menus.cfg trans/menus.cfg \
              cEterm/menus.cfg cEterm/theme.cfg.in auto/menus.cfg auto/theme.cfg.in
 
-all: Makefile
-	-@for i in $(THEMES) ; do \
-	  echo "Generating theme config file for the $$i theme." ; \
-	  $(SED) -e 's%@''PREFIX''@%${prefix}%g' -e 's%@''PKGDATADIR''@%${DESTDIR}${pkgdatadir}%g' -e 's%@''THEME''@%'$$i'%g' \
-	    $(srcdir)/$$i/theme.cfg.in > $(srcdir)/$$i/theme.cfg ; \
-	done
-
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes
 	-@for i in $(THEMES) ; do \
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index 286389d..c453794 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index 84b13cf..9fd4bad 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -81,12 +80,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -96,12 +95,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 0fdd98e..e9510a9 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index a524cc9..a2d6407 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index 129cb1f..a8566d2 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 shine
-    font 3 nexus
-    font 4 fixed
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 8x13
     font 6 9x15
     font 7 10x20
@@ -99,12 +98,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 86e3daa..16a4210 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index 764506e..62bc939 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -4,8 +4,7 @@
 #                              the version it was written for,
 #                              minus the "DR-" if any.
 #
-# This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# This is a sample Eterm config file.
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -82,12 +81,12 @@ begin main
 # the Eterm defaults.  The "bold" font is the font used if color BD has
 # not been set and Eterm cannot map the foreground color to one of the
 # high-intensity colors (8-15).
-    font default 2
-    font 0 5x7
-    font 1 6x10
-    font 2 fixed
-    font 3 8x13
-    font 4 9x15
+    font default @DEF_FONT_IDX@
+    font 0 @FONT0@
+    font 1 @FONT1@
+    font 2 @FONT2@
+    font 3 @FONT3@
+    font 4 @FONT4@
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
@@ -97,12 +96,12 @@ begin main
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
 #  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
+#    font 0 @MFONT0@
+#    font 1 @MFONT1@
+#    font 2 @MFONT2@
+#    font 3 @MFONT3@
+#    font 4 @MFONT4@
+#    encoding @MULTICHAR_ENCODING@
 #  end multichar
 
 # Define the imageclasses.