aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/fontconfig-japanese.diff
blob: 793b2dd11e2978b2b116816db95cfe8029a35b4a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
# used for Debian wheezy and Ubuntu 12.04 LTS or newer

--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig	2013-02-07 17:01:24.723477262 +0100
+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2013-02-07 17:03:39.043477916 +0100
@@ -57,142 +57,142 @@
 
 serif.plain.latin-1=DejaVu Serif
 #serif.plain.latin-1.motif=LuxiSerif-Regular
-serif.plain.japanese-kochi=Kochi Mincho
 serif.plain.japanese-sazanami=Sazanami Mincho
 serif.plain.japanese-vlgothic=Sazanami Mincho
+serif.plain.japanese-ipafont=IPAMincho
 serif.plain.korean-nanum=NanumMyeongjo
 
 serif.bold.latin-1=DejaVu Serif Bold
 #serif.bold.latin-1.motif=LuxiSerif-Bold
-serif.bold.japanese-kochi=Kochi Mincho
 serif.bold.japanese-sazanami=Sazanami Mincho
 serif.bold.japanese-vlgothic=Sazanami Mincho
+serif.bold.japanese-ipafont=IPAMincho
 serif.bold.korean-nanum=NanumMyeongjo Bold
 
 serif.italic.latin-1=DejaVu Serif Oblique
 #serif.italic.latin-1.motif=LuxiSerif-Oblique
-serif.italic.japanese-kochi=Kochi Mincho
 serif.italic.japanese-sazanami=Sazanami Mincho
 serif.italic.japanese-vlgothic=Sazanami Mincho
+serif.italic.japanese-ipafont=IPAMincho
 serif.italic.korean-nanum=NanumMyeongjo
 
 serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
 #serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique
-serif.bolditalic.japanese-kochi=Kochi Mincho
 serif.bolditalic.japanese-sazanami=Sazanami Mincho
 serif.bolditalic.japanese-vlgothic=Sazanami Mincho
+serif.bolditalic.japanese-ipafont=IPAMincho
 serif.bolditalic.korean-nanum=NanumMyeongjo Bold
 
 sansserif.plain.latin-1=DejaVu Sans
 #sansserif.plain.latin-1.motif=LuxiSans-Regular
-sansserif.plain.japanese-kochi=Kochi Gothic
 sansserif.plain.japanese-sazanami=Sazanami Gothic
 sansserif.plain.japanese-vlgothic=VL PGothic
+sansserif.plain.japanese-ipafont=IPAPGothic
 sansserif.plain.korean-nanum=NanumGothic
 
 sansserif.bold.latin-1=DejaVu Sans Bold
 #sansserif.bold.latin-1.motif=LuxiSans-Bold
-sansserif.bold.japanese-kochi=Kochi Gothic
 sansserif.bold.japanese-sazanami=Sazanami Gothic
 sansserif.bold.japanese-vlgothic=VL PGothic
+sansserif.bold.japanese-ipafont=IPAPGothic
 sansserif.bold.korean-nanum=NanumGothic Bold
 
 sansserif.italic.latin-1=DejaVu Sans Oblique
 #sansserif.italic.latin-1.motif=LuxiSans-Oblique
-sansserif.italic.japanese-kochi=Kochi Gothic
 sansserif.italic.japanese-sazanami=Sazanami Gothic
 sansserif.italic.japanese-vlgothic=VL PGothic
+sansserif.italic.japanese-ipafont=IPAPGothic
 sansserif.italic.korean-nanum=NanumGothic
 
 sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
 #sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique
-sansserif.bolditalic.japanese-kochi=Kochi Gothic
 sansserif.bolditalic.japanese-sazanami=Sazanami Gothic
 sansserif.bolditalic.japanese-vlgothic=VL PGothic
+sansserif.bolditalic.japanese-ipafont=IPAPGothic
 sansserif.bolditalic.korean-nanum=NanumGothic Bold
 
 monospaced.plain.latin-1=DejaVu Sans Mono
 #monospaced.plain.latin-1.motif=LuxiMono-Regular
-monospaced.plain.japanese-kochi=Kochi Gothic
 monospaced.plain.japanese-sazanami=Sazanami Gothic
 monospaced.plain.japanese-vlgothic=VL Gothic
+monospaced.plain.japanese-ipafont=IPAGothic
 monospaced.plain.korean-nanum=NanumGothicCoding
 
 monospaced.bold.latin-1=DejaVu Sans Mono Bold
 #monospaced.bold.latin-1.motif=LuxiMono-Bold
-monospaced.bold.japanese-kochi=Kochi Gothic
 monospaced.bold.japanese-sazanami=Sazanami Gothic
 monospaced.bold.japanese-vlgothic=VL Gothic
+monospaced.bold.japanese-ipafont=IPAGothic
 monospaced.bold.korean-nanum=NanumGothicCoding Bold
 
 monospaced.italic.latin-1=DejaVu Sans Mono Oblique
 #monospaced.italic.latin-1.motif=LuxiMono-Oblique
-monospaced.italic.japanese-kochi=Kochi Gothic
 monospaced.italic.japanese-sazanami=Sazanami Gothic
 monospaced.italic.japanese-vlgothic=VL Gothic
+monospaced.italic.japanese-ipafont=IPAGothic
 monospaced.italic.korean-nanum=NanumGothicCoding
 
 monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
 #monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique
-monospaced.bolditalic.japanese-kochi=Kochi Gothic
 monospaced.bolditalic.japanese-sazanami=Sazanami Gothic
 monospaced.bolditalic.japanese-vlgothic=VL Gothic
+monospaced.bolditalic.japanese-ipafont=IPAGothic
 monospaced.bolditalic.korean-nanum=NanumGothicCoding Bold
 
 dialog.plain.latin-1=DejaVu Sans
 #dialog.plain.latin-1.motif=LuxiSans-Regular
-dialog.plain.japanese-kochi=Kochi Gothic
 dialog.plain.japanese-sazanami=Sazanami Gothic
 dialog.plain.japanese-vlgothic=VL PGothic
+dialog.plain.japanese-ipafont=IPAPGothic
 dialog.plain.korean-nanum=NanumGothic
 
 dialog.bold.latin-1=DejaVu Sans Bold
 #dialog.bold.latin-1.motif=LuxiSans-Bold
-dialog.bold.japanese-kochi=Kochi Gothic
 dialog.bold.japanese-sazanami=Sazanami Gothic
 dialog.bold.japanese-vlgothic=VL PGothic
+dialog.bold.japanese-ipafont=IPAPGothic
 dialog.bold.korean-nanum=NanumGothic Bold
 
 dialog.italic.latin-1=DejaVu Sans Oblique
 #dialog.italic.latin-1.motif=LuxiSans-Oblique
-dialog.italic.japanese-kochi=Kochi Gothic
 dialog.italic.japanese-sazanami=Sazanami Gothic
 dialog.italic.japanese-vlgothic=VL PGothic
+dialog.italic.japanese-ipafont=IPAPGothic
 dialog.italic.korean-nanum=NanumGothic
 
 dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
 #dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique
-dialog.bolditalic.japanese-kochi=Kochi Gothic
 dialog.bolditalic.japanese-sazanami=Sazanami Gothic
 dialog.bolditalic.japanese-vlgothic=VL PGothic
+dialog.bolditalic.japanese-ipafont=IPAPGothic
 dialog.bolditalic.korean-nanum=NanumGothic Bold
 
 dialoginput.plain.latin-1=DejaVu Sans Mono
 #dialoginput.plain.latin-1.motif=LuxiMono-Regular
-dialoginput.plain.japanese-kochi=Kochi Gothic
 dialoginput.plain.japanese-sazanami=Sazanami Gothic
 dialoginput.plain.japanese-vlgothic=VL Gothic
+dialoginput.plain.japanese-ipafont=IPAGothic
 dialoginput.plain.korean-nanum=NanumGothic
 
 dialoginput.bold.latin-1=DejaVu Sans Mono Bold
 #dialoginput.bold.latin-1.motif=LuxiMono-Bold
-dialoginput.bold.japanese-kochi=Kochi Gothic
 dialoginput.bold.japanese-sazanami=Sazanami Gothic
 dialoginput.bold.japanese-vlgothic=VL Gothic
+dialoginput.bold.japanese-ipafont=IPAGothic
 dialoginput.bold.korean-nanum=NanumGothic Bold
 
 dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
 #dialoginput.italic.latin-1.motif=LuxiMono-Oblique
-dialoginput.italic.japanese-kochi=Kochi Gothic
 dialoginput.italic.japanese-sazanami=Sazanami Gothic
 dialoginput.italic.japanese-vlgothic=VL Gothic
+dialoginput.italic.japanese-ipafont=IPAGothic
 dialoginput.italic.korean-nanum=NanumGothic
 
 dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
 #dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique
-dialoginput.bolditalic.japanese-kochi=Kochi Gothic
 dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic
 dialoginput.bolditalic.japanese-vlgothic=VL Gothic
+dialoginput.bolditalic.japanese-ipafont=IPAGothic
 dialoginput.bolditalic.korean-nanum=NanumGothic Bold
 
 # Search Sequences
@@ -201,18 +201,20 @@
 sequence.allfonts.GB18030=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei
 sequence.allfonts.GB2312=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei
 sequence.allfonts.GBK=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-sazanami,japanese-kochi
+sequence.allfonts.x-euc-jp-linux=latin-1,japanese-ipafont,japanese-vlgothic,japanese-sazanami
 sequence.allfonts.EUC-KR=latin-1,korean-nanum
 sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-microhei,wqy-zenhei
 sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-microhei,wqy-zenhei
-#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala
-sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-nanum,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu
+#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-ipafont,japanese-vlgothic,japanese-sazanami,korean-un,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala
+sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-ipafont,japanese-vlgothic,japanese-sazanami,korean-nanum,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu
+
+sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-ipafont,japanese-vlgothic,japanese-sazanami,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu
 
 # Exclusion Ranges
 
-exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be
 exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be
 exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be
+exclusion.japanese-ipafont=0390-03d6,2200-22ef,2701-27be
 
 # Font File Names
 
@@ -244,12 +246,16 @@
 filename.NanumGothic_Bold=/usr/share/fonts/truetype/nanum/NanumGothicBold.ttf
 filename.NanumGothicCoding=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding.ttf
 filename.NanumGothicCoding_Bold=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding_Bold.ttf
-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
+
+#Japanese fonts
 filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
 filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
 filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
 filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
+filename.IPAGothic=/usr/share/fonts/opentype/ipafont-gothic/ipag.ttf
+filename.IPAPGothic=/usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf
+filename.IPAMincho=/usr/share/fonts/opentype/ipafont-mincho/ipam.ttf
+filename.IPAPMincho=/usr/share/fonts/opentype/ipafont-mincho/ipamp.ttf
 
 filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
 filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
@@ -283,7 +289,6 @@
 awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
 awtfontpath.wqy-microhei=/usr/share/fonts/truetype/wqy
 awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
 awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
 awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
 awtfontpath.korean-nanum=/usr/share/fonts/truetype/nanum