From f1878720a5df34d2b3d413efde44c8ba2f8a426f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 8 Oct 2003 23:20:02 +0000
Subject: [PATCH] Load CJK fonts as grayscale.  Simplify.

---
 .../Themes/default/Fonts/_japanese 16px.ini   | 29 +++----------------
 .../Themes/default/Fonts/_japanese 24px.ini   | 29 +++----------------
 .../Themes/default/Fonts/_korean 16px.ini     | 26 +++--------------
 .../Themes/default/Fonts/_korean 24px.ini     | 24 ++-------------
 4 files changed, 15 insertions(+), 93 deletions(-)

diff --git a/stepmania/Themes/default/Fonts/_japanese 16px.ini b/stepmania/Themes/default/Fonts/_japanese 16px.ini
index d7090f92aa..784b7f1297 100644
--- a/stepmania/Themes/default/Fonts/_japanese 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_japanese 16px.ini	
@@ -4,27 +4,21 @@
 
 # Constructed from MS Gothic, 8pt, 72 pixels/cm, "Strong" antialiasing.
 
-[main]
+[common]
 Top=8
 Baseline=23
 LineSpacing=20
+TextureHints=grayscale 16bpp
+DefaultWidth=20
 
+[main]
 # This page maps to basic-japanese (Unicode U+3000 to U+30FF.)
 range basic-japanese=0
 
-# All characters on this page have a width of 20 pixels; it's a strictly
-# monospaced font.
-DefaultWidth=20
-
 # Smaller center dot.
 251=10
 
 [kanji 1]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=一二三四五六七八
 line 1=九十本語＆（）？
 line 2=！
@@ -35,11 +29,6 @@ line 6=弾新谷大見解魔法
 line 7=扉夜空才遅伝説真
 
 [kanji 2]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=朝来晴決戦曜恋好
 line 1=林原浜崎笠弘子倉
 line 2=木麻衣村由姫松緒
@@ -50,11 +39,6 @@ line 6=地丙太郎会野順人
 line 7=時金月春色風中勇
 
 [kanji 3]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=気比奈夕怪娘菅家
 line 1=庭用悪矩形波倶楽
 line 2=部城上祐司榎温後
@@ -65,11 +49,6 @@ line 6=観測綾岩琢長沼英
 line 7=夏秋冬連花夢式情
 
 [kanji 4]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=惡憎敎有析武死生
 line 1=男眠胎自魂女宏和
 line 2=魅惑音頭踊貸与園
diff --git a/stepmania/Themes/default/Fonts/_japanese 24px.ini b/stepmania/Themes/default/Fonts/_japanese 24px.ini
index 8310497f00..48167eb429 100644
--- a/stepmania/Themes/default/Fonts/_japanese 24px.ini	
+++ b/stepmania/Themes/default/Fonts/_japanese 24px.ini	
@@ -4,27 +4,21 @@
 
 # Constructed from MS Gothic, 11pt, 72 pixels/cm, "Smooth" antialiasing.
 
-[main]
+[common]
 Top=5
 Baseline=26
 LineSpacing=28
+TextureHints=grayscale 16bpp
+DefaultWidth=28
 
+[main]
 # This page maps to basic-japanese (Unicode U+3000 to U+30FF.)
 range basic-japanese=0
 
-# All characters on this page have a width of 20 pixels; it's a strictly
-# monospaced font.
-DefaultWidth=28
-
 # Smaller center dot.
 251=14
 
 [kanji 1]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=一二三四五六七八
 line 1=九十本語＆（）？
 line 2=！
@@ -35,11 +29,6 @@ line 6=弾新谷大見解魔法
 line 7=扉夜空才遅伝説真
 
 [kanji 2]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=朝来晴決戦曜恋好
 line 1=林原浜崎笠弘子倉
 line 2=木麻衣村由姫松緒
@@ -50,11 +39,6 @@ line 6=地丙太郎会野順人
 line 7=時金月春色風中勇
 
 [kanji 3]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=気比奈夕怪娘菅家
 line 1=庭用悪矩形波倶楽
 line 2=部城上祐司榎温後
@@ -65,11 +49,6 @@ line 6=観測綾岩琢長沼英
 line 7=夏秋冬連花夢式情
 
 [kanji 4]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=惡憎敎有析武死生
 line 1=男眠胎自魂女宏和
 line 2=魅惑音頭踊貸与園
diff --git a/stepmania/Themes/default/Fonts/_korean 16px.ini b/stepmania/Themes/default/Fonts/_korean 16px.ini
index 664a97fbe8..52e2ddda6d 100644
--- a/stepmania/Themes/default/Fonts/_korean 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 16px.ini	
@@ -1,14 +1,11 @@
-[main]
-Top=8
-Baseline=23
-LineSpacing=20
-
-[jamo 1]
+[common]
 Top=8
 Baseline=23
 LineSpacing=20
 DefaultWidth=20
+TextureHints=grayscale 16bpp
 
+[jamo 1]
 line 0=경고교굴기길나넛
 line 1=놀누는니단도듀라
 line 2=랑래랩레련로론루
@@ -19,11 +16,6 @@ line 6=써쓰애야어에영옝
 line 7=와요워위유윤이잉
 
 [jamo 2]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=자잦잭젠준지직찾
 line 1=책초치캉커쿨크클
 line 2=키타틴파팍패플피
@@ -34,11 +26,6 @@ line 6=민국성숙가감강같
 line 7=거건검게곡과구그
 
 [jamo 3]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=김께꼭꾸꿍난널네
 line 1=녀논눈님더돌둥드
 line 2=들따때또뛰띠렁렛
@@ -50,14 +37,9 @@ line 7=오올우울원은을의
 
 
 [jamo 4]
-Top=8
-Baseline=23
-LineSpacing=20
-DefaultWidth=20
-
 line 0=잊제젝조존좋줘증
 line 1=진집짜착찬처추칼
 line 2=큰탑터투트티펌페
 line 3=폼핑할함해행헤혀
 line 4=환회휘태난터까시
-line 5=간
\ No newline at end of file
+line 5=간
diff --git a/stepmania/Themes/default/Fonts/_korean 24px.ini b/stepmania/Themes/default/Fonts/_korean 24px.ini
index f96ffcd045..499062d220 100644
--- a/stepmania/Themes/default/Fonts/_korean 24px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 24px.ini	
@@ -1,14 +1,11 @@
-[main]
-Top=5
-Baseline=26
-LineSpacing=28
-
-[jamo 1]
+[common]
 Top=5
 Baseline=26
 LineSpacing=28
 DefaultWidth=28
+TextureHints=grayscale 16bpp
 
+[jamo 1]
 line 0=경고교굴기길나넛
 line 1=놀누는니단도듀라
 line 2=랑래랩레련로론루
@@ -19,11 +16,6 @@ line 6=써쓰애야어에영옝
 line 7=와요워위유윤이잉
 
 [jamo 2]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=자잦잭젠준지직찾
 line 1=책초치캉커쿨크클
 line 2=키타틴파팍패플피
@@ -34,11 +26,6 @@ line 6=민국성숙가감강같
 line 7=거건검게곡과구그
 
 [jamo 3]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=김께꼭꾸꿍난널네
 line 1=녀논눈님더돌둥드
 line 2=들따때또뛰띠렁렛
@@ -49,11 +36,6 @@ line 6=양억언엄업여연예
 line 7=오올우울원은을의
 
 [jamo 4]
-Top=5
-Baseline=26
-LineSpacing=28
-DefaultWidth=28
-
 line 0=잊제젝조존좋줘증
 line 1=진집짜착찬처추칼
 line 2=큰탑터투트티펌페