IRCMeeting/20100424の添付ファイル:language-selector.diff


添付ファイル 'language-selector.diff'

ダウンロード

   1 === modified file 'debian/changelog'
   2 --- debian/changelog	2010-04-16 14:39:58 +0000
   3 +++ debian/changelog	2010-04-24 14:12:44 +0000
   4 @@ -1,3 +1,17 @@
   5 +language-selector (0.5.7) lucid; urgency=low
   6 +
   7 +  * Change fontconfig settings:
   8 +    - zh-*: reorder font priority lists, put DejaVu and Bitstream Vera in front
   9 +    (LP: #149944)
  10 +    - zh-*: add WenQuanYi Microhei, Droid Sans Fallback and HYSong
  11 +    - ja: add entries for Takao and IPA fonts, reorder and merge
  12 +    required rendering options from the 29-language-selector-ja-jp.conf file
  13 +    (LP: #535582)
  14 +    - update 30-cjk-aliases.conf to include localized font names and fonts used
  15 +    in Windows 7.
  16 +
  17 + -- Arne Goetje <[email protected]>  Wed, 21 Apr 2010 17:49:18 +0200
  18 +
  19  language-selector (0.5.6) lucid; urgency=low
  20  
  21    * bugfix: use os.R_OK and os.W_OK to check file permissions.
  22 
  23 === removed file 'fontconfig/29-language-selector-ja-jp.conf'
  24 --- fontconfig/29-language-selector-ja-jp.conf	2010-03-11 21:47:00 +0000
  25 +++ fontconfig/29-language-selector-ja-jp.conf	1970-01-01 00:00:00 +0000
  26 @@ -1,66 +0,0 @@
  27 -<?xml version="1.0"?>
  28 -<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  29 -<fontconfig>
  30 -
  31 -	<match target="font">
  32 -		<edit name="embeddedbitmap" mode="assign">
  33 -			<bool>false</bool>
  34 -		</edit>
  35 -		<edit name="hinting" mode="assign">
  36 -			<bool>true</bool>
  37 -		</edit>
  38 -		<edit name="hintstyle" mode="assign">
  39 -			<const>hintslight</const>
  40 -		</edit>
  41 -		<edit name="antialias" mode="assign">
  42 -			<bool>true</bool>
  43 -		</edit>
  44 -	</match>
  45 -
  46 -	<match target="font">
  47 -		<test name="lang" compare="contains">
  48 -			<string>ja</string>
  49 -		</test>
  50 -		<test name="pixelsize" compare="less_eq">
  51 -			<double>18</double>
  52 -		</test>
  53 -		<edit name="hintstyle" mode="assign">
  54 -			<const>hintnone</const>
  55 -		</edit>
  56 -	</match>
  57 -
  58 -	<match target="font">
  59 -		<test name="lang" compare="contains">
  60 -			<string>ja</string>
  61 -		</test>
  62 -		<test name="spacing" compare="eq">
  63 -			<const>dual</const>
  64 -		</test>
  65 -		<edit name="spacing">
  66 -			<const>proportional</const>
  67 -		</edit>
  68 -		<edit name="globaladvance" binding="strong">
  69 -			<bool>false</bool>
  70 -		</edit>
  71 -	</match>
  72 -
  73 -	<match target="font">
  74 -		<test name="lang" compare="contains">
  75 -			<string>ja</string>
  76 -		</test>
  77 -		<test name="outline" compare="eq">
  78 -			<bool>false</bool>
  79 -		</test>
  80 -		<test name="spacing" compare="eq">
  81 -			<const>mono</const>
  82 -			<const>charcell</const>
  83 -		</test>
  84 -		<edit name="spacing">
  85 -			<const>proportional</const>
  86 -		</edit>
  87 -		<edit name="globaladvance" binding="strong">
  88 -			<bool>false</bool>
  89 -		</edit>
  90 -	</match>
  91 -
  92 -</fontconfig>
  93 
  94 === modified file 'fontconfig/30-cjk-aliases.conf'
  95 --- fontconfig/30-cjk-aliases.conf	2010-03-11 21:47:00 +0000
  96 +++ fontconfig/30-cjk-aliases.conf	2010-04-24 14:12:44 +0000
  97 @@ -2,189 +2,166 @@
  98  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  99  <fontconfig>
 100  <!-- Aliases for Korean Windows fonts -->
 101 -	<alias>
 102 -		<family>Batang</family>
 103 -		<accept>
 104 -		    <family>UnBatang</family>
 105 -		    <family>Baekmuk Batang</family>
 106 -		</accept>
 107 -	</alias>
 108 -	<alias>
 109 -		<family>BatangChe</family>
 110 -		<accept>
 111 -		    <family>UnBatang</family>
 112 -		    <family>Baekmuk Batang</family>
 113 -		</accept>
 114 -	</alias>
 115 -	<alias>
 116 -		<family>AR MingtiM KSC</family>
 117 -		<accept>
 118 -		    <family>UnBatang</family>
 119 -		    <family>Baekmuk Batang</family>
 120 -		</accept>
 121 -	</alias>
 122 -	<alias>
 123 -		<family>Dotum</family>
 124 -		<accept>
 125 -		    <family>UnDotum</family>
 126 -		</accept>
 127 -	</alias>
 128 -	<alias>
 129 -		<family>DotumChe</family>
 130 -		<accept>
 131 -		    <family>UnDotum</family>
 132 -		</accept>
 133 -	</alias>
 134 -	<alias>
 135 -		<family>Gulim</family>
 136 -		<accept>
 137 -		    <family>Guseul</family>
 138 -		</accept>
 139 -	</alias>
 140 -	<alias>
 141 -		<family>GulimChe</family>
 142 -		<accept>
 143 -		    <family>Guseul</family>
 144 -		</accept>
 145 -	</alias>
 146 +    <alias>
 147 +        <family>Batang</family>
 148 +        <family>바탕</family>
 149 +        <family>BatangChe</family>
 150 +        <family>바탕체</family>
 151 +        <family>Gungsuh</family>
 152 +        <family>궁서</family>
 153 +        <family>GungsuhChe</family>
 154 +        <family>궁서체</family>
 155 +        <family>AR MingtiM KSC</family>
 156 +        <accept>
 157 +            <family>UnBatang</family>
 158 +            <family>Baekmuk Batang</family>
 159 +        </accept>
 160 +    </alias>
 161 +    <alias>
 162 +        <family>Dotum</family>
 163 +        <family>돋움</family>
 164 +        <family>DotumChe</family>
 165 +        <family>돋움체</family>
 166 +        <family>Malgun Gothic</family>
 167 +        <family>맑은 고딕</family>
 168 +        <accept>
 169 +            <family>UnDotum</family>
 170 +        </accept>
 171 +    </alias>
 172 +    <alias>
 173 +        <family>Gulim</family>
 174 +        <family>굴림</family>
 175 +        <family>GulimChe</family>
 176 +        <family>굴림체</family>
 177 +        <accept>
 178 +            <family>UnDotum</family>
 179 +            <family>Guseul</family>
 180 +        </accept>
 181 +    </alias>
 182  <!-- Aliases for Japanese Windows fonts -->
 183 -	<alias>
 184 -		<family>MS Gothic</family>
 185 -		<accept>
 186 -		    <family>IPAMonaPGothic</family>
 187 -    		<family>IPAPGothic</family>
 188 -		    <family>Sazanami Gothic</family>
 189 -		    <family>Kochi Gothic</family>
 190 -		</accept>
 191 -	</alias>
 192 -	<alias>
 193 -		<family>MS UIGothic</family>
 194 -		<accept>
 195 -		    <family>IPAMonaPGothic</family>
 196 -    		<family>IPAPGothic</family>
 197 -		    <family>Sazanami Gothic</family>
 198 -		    <family>Kochi Gothic</family>
 199 -		</accept>
 200 -	</alias>
 201 -	<alias>
 202 -		<family>MS Mincho</family>
 203 -		<accept>
 204 -		    <family>IPAMonaPMincho</family>
 205 -		    <family>IPAPMincho</family>
 206 -		    <family>Sazanami Mincho</family>
 207 -		    <family>Kochi Mincho</family>
 208 -		</accept>
 209 -	</alias>
 210 -	<alias>
 211 -		<family>MS PMincho</family>
 212 -		<accept>
 213 -		    <family>IPAMonaPMincho</family>
 214 -		    <family>IPAPMincho</family>
 215 -		    <family>Sazanami Mincho</family>
 216 -		    <family>Kochi Mincho</family>
 217 -		</accept>
 218 -	</alias>
 219 -	<alias>
 220 -		<family>AR MinchoL JIS</family>
 221 -		<accept>
 222 -		    <family>IPAMonaPMincho</family>
 223 -		    <family>IPAPMincho</family>
 224 -		    <family>Sazanami Mincho</family>
 225 -		    <family>Kochi Mincho</family>
 226 -		</accept>
 227 -	</alias>
 228 +    <alias>
 229 +        <family>MS Gothic</family>
 230 +        <family>MS ゴシック</family>
 231 +        <accept>
 232 +            <family>TakaoGothic</family>
 233 +            <family>IPAGothic</family>
 234 +            <family>IPAMonaGothic</family>
 235 +            <family>VL Gothic</family>
 236 +            <family>Sazanami Gothic</family>
 237 +            <family>Kochi Gothic</family>
 238 +        </accept>
 239 +    </alias>
 240 +    <alias>
 241 +        <family>MS PGothic</family>
 242 +        <family>MS Pゴシック</family>
 243 +        <family>MS UIGothic</family>
 244 +        <family>Meiryo UI</family>
 245 +        <accept>
 246 +            <family>IPAMonaPGothic</family>
 247 +            <family>TakaoPGothic</family>
 248 +            <family>IPAPGothic</family>
 249 +            <family>VL PGothic</family>
 250 +            <family>Sazanami Gothic</family>
 251 +            <family>Kochi Gothic</family>
 252 +        </accept>
 253 +    </alias>
 254 +    <alias>
 255 +        <family>MS Mincho</family>
 256 +        <family>MS 明朝</family>
 257 +        <family>AR MinchoL JIS</family>
 258 +        <accept>
 259 +            <family>TakaoMincho</family>
 260 +            <family>IPAMincho</family>
 261 +            <family>IPAMonaMincho</family>
 262 +            <family>Sazanami Mincho</family>
 263 +            <family>Kochi Mincho</family>
 264 +        </accept>
 265 +    </alias>
 266 +    <alias>
 267 +        <family>MS PMincho</family>
 268 +        <family>MS P明朝</family>
 269 +        <accept>
 270 +            <family>IPAMonaPMincho</family>
 271 +            <family>TakaoPMincho</family>
 272 +            <family>IPAPMincho</family>
 273 +            <family>Sazanami Mincho</family>
 274 +            <family>Kochi Mincho</family>
 275 +        </accept>
 276 +    </alias>
 277 +    <alias>
 278 +        <family>Meiryo</family>
 279 +        <family>メイリオ</family>
 280 +        <accept>
 281 +            <family>IPAexGothic</family>
 282 +        </accept>
 283 +    </alias>
 284  <!-- Aliases for Simplified Chinese Windows fonts -->
 285 -	<alias>
 286 -		<family>SimSun</family>
 287 -		<accept>
 288 -		    <family>AR PL UMing CN</family>
 289 -		    <family>AR PL ShanHeiSun Uni</family>
 290 -		</accept>
 291 -	</alias>
 292 -	<alias>
 293 -		<family>NSimSun</family>
 294 -		<accept>
 295 -		    <family>AR PL UMing CN</family>
 296 -		    <family>AR PL ShanHeiSun Uni</family>
 297 -		</accept>
 298 -	</alias>
 299 -	<alias>
 300 -		<family>SimSun-18030</family>
 301 -		<accept>
 302 -		    <family>AR PL UMing CN</family>
 303 -		    <family>AR PL ShanHeiSun Uni</family>
 304 -		</accept>
 305 -	</alias>
 306 -	<alias>
 307 -		<family>NSimSun-18030</family>
 308 -		<accept>
 309 -		    <family>AR PL UMing CN</family>
 310 -		    <family>AR PL ShanHeiSun Uni</family>
 311 -		</accept>
 312 -	</alias>
 313 -	<alias>
 314 -		<family>宋体</family>
 315 -		<accept>
 316 -		    <family>AR PL UMing CN</family>
 317 -		    <family>AR PL ShanHeiSun Uni</family>
 318 -		</accept>
 319 -	</alias>
 320 -	<alias>
 321 -		<family>AR MingtiM GB</family>
 322 -		<accept>
 323 -		    <family>AR PL UMing CN</family>
 324 -		    <family>AR PL ShanHeiSun Uni</family>
 325 -		</accept>
 326 -	</alias>
 327 +    <alias>
 328 +        <family>SimSun</family>
 329 +        <family>NSimSun</family>
 330 +        <family>SimSun-18030</family>
 331 +        <family>NSimSun-18030</family>
 332 +        <family>宋体</family>
 333 +        <family>新宋体</family>
 334 +        <family>AR MingtiM GB</family>
 335 +        <accept>
 336 +            <family>HYSong</family>
 337 +            <family>AR PL UMing CN</family>
 338 +            <family>AR PL ShanHeiSun Uni</family>
 339 +        </accept>
 340 +    </alias>
 341 +    <alias>
 342 +        <family>KaiTi</family>
 343 +        <family>楷体</family>
 344 +        <accept>
 345 +            <family>AR PL UKai CN</family>
 346 +            <family>AR PL ZenKai Uni</family>
 347 +        </accept>
 348 +    </alias>
 349 +    <alias>
 350 +        <family>Microsoft YaHei</family>
 351 +        <family>微软雅黑</family>
 352 +        <accept>
 353 +            <family>WenQuanYi Micro Hei</family>
 354 +            <family>WenQuanYi Zen Hei</family>
 355 +        </accept>
 356 +    </alias>
 357  <!-- Aliases for Traditional Chinese Windows fonts -->
 358 -	<alias>
 359 -		<family>MingLiU</family>
 360 -		<accept>
 361 -		    <family>AR PL UMing TW</family>
 362 -		    <family>AR PL ShanHeiSun Uni</family>
 363 -		</accept>
 364 -	</alias>
 365 -	<alias>
 366 -		<family>細明體</family>
 367 -		<accept>
 368 -		    <family>AR PL UMing TW</family>
 369 -		    <family>AR PL ShanHeiSun Uni</family>
 370 -		</accept>
 371 -	</alias>
 372 -	<alias>
 373 -		<family>PMingLiU</family>
 374 -		<accept>
 375 -		    <family>AR PL UMing TW</family>
 376 -		    <family>AR PL ShanHeiSun Uni</family>
 377 -		</accept>
 378 -	</alias>
 379 -	<alias>
 380 -		<family>新細明體</family>
 381 -		<accept>
 382 -		    <family>AR PL UMing TW</family>
 383 -		    <family>AR PL ShanHeiSun Uni</family>
 384 -		</accept>
 385 -	</alias>
 386 -	<alias>
 387 -		<family>AR MingtiM BIG-5</family>
 388 -		<accept>
 389 -		    <family>AR PL UMing TW</family>
 390 -		    <family>AR PL ShanHeiSun Uni</family>
 391 -		</accept>
 392 -	</alias>
 393 -	<alias>
 394 -		<family>標楷體</family>
 395 -		<accept>
 396 -		    <family>AR PL UKai TW</family>
 397 -		    <family>AR PL ZenKai Uni</family>
 398 -		</accept>
 399 -	</alias>
 400 +    <alias>
 401 +        <family>MingLiU</family>
 402 +        <family>細明體</family>
 403 +        <family>PMingLiU</family>
 404 +        <family>新細明體</family>
 405 +        <family>AR MingtiM BIG-5</family>
 406 +        <accept>
 407 +            <family>AR PL UMing TW</family>
 408 +            <family>AR PL ShanHeiSun Uni</family>
 409 +        </accept>
 410 +    </alias>
 411 +    <alias>
 412 +        <family>DFKai\-SB</family>
 413 +        <family>標楷體</family>
 414 +        <accept>
 415 +            <family>AR PL UKai TW</family>
 416 +            <family>AR PL ZenKai Uni</family>
 417 +        </accept>
 418 +    </alias>
 419 +    <alias>
 420 +        <family>Microsoft JhengHei</family>
 421 +        <family>微軟正黑體</family>
 422 +        <accept>
 423 +            <family>WenQuanYi Micro Hei</family>
 424 +            <family>WenQuanYi Zen Hei</family>
 425 +        </accept>
 426 +    </alias>
 427  <!-- Alias for HKSCS -->
 428 -	<alias>
 429 -		<family>Ming (for ISO10646)</family>
 430 -		<accept>
 431 -		    <family>AR PL UMing HK</family>
 432 -		    <family>AR PL ShanHeiSun Uni</family>
 433 -		</accept>
 434 -	</alias>
 435 +    <alias>
 436 +        <family>Ming (for ISO10646)</family>
 437 +        <family>MingLiU_HKSCS</family>
 438 +        <family>細明體_HKSCS</family>
 439 +        <accept>
 440 +            <family>AR PL UMing HK</family>
 441 +            <family>AR PL ShanHeiSun Uni</family>
 442 +        </accept>
 443 +    </alias>
 444  </fontconfig>
 445 
 446 === modified file 'fontconfig/69-language-selector-ja-jp.conf'
 447 --- fontconfig/69-language-selector-ja-jp.conf	2010-03-11 21:47:00 +0000
 448 +++ fontconfig/69-language-selector-ja-jp.conf	2010-04-24 14:12:44 +0000
 449 @@ -1,40 +1,149 @@
 450  <?xml version="1.0"?>
 451  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 452  <fontconfig>
 453 -
 454 -	<match target="pattern">
 455 -		<test qual="any" name="family">
 456 -			<string>sans-serif</string>
 457 -		</test>
 458 -		<edit name="family" mode="prepend" binding="strong">
 459 -			<string>IPAMonaPGothic</string>
 460 -			<string>IPAPGothic</string>
 461 -			<string>VL PGothic</string>
 462 -			<string>Sazanami Gothic</string>
 463 -			<string>Kochi Gothic</string>
 464 -		</edit>
 465 -	</match> 
 466 -	<match target="pattern">
 467 -		<test qual="any" name="family">
 468 -			<string>serif</string>
 469 -		</test>
 470 -		<edit name="family" mode="prepend" binding="strong">
 471 -			<string>IPAMonaPMincho</string>
 472 -			<string>IPAPMincho</string>
 473 -			<string>Sazanami Mincho</string>
 474 -			<string>Kochi Mincho</string>
 475 -		</edit>
 476 -	</match> 
 477 -	<match target="pattern">
 478 -		<test qual="any" name="family">
 479 -			<string>monospace</string>
 480 -		</test>
 481 -		<edit name="family" mode="prepend" binding="strong">
 482 -			<string>IPAMonaGothic</string>
 483 -			<string>IPAGothic</string>
 484 -			<string>VL Gothic</string>
 485 -			<string>Sazanami Gothic</string>
 486 -			<string>Kochi Gothic</string>
 487 -		</edit>
 488 -	</match> 
 489 +    <!-- Japanese (ja) -->
 490 +    <match target="pattern">
 491 +        <test name="lang" compare="contains">
 492 +            <string>ja</string>
 493 +        </test>
 494 +        <test qual="any" name="family">
 495 +            <string>serif</string>
 496 +        </test>
 497 +        <edit name="family" mode="prepend" binding="same">
 498 +            <string>DejaVu Serif</string>
 499 +            <string>Takao P明朝</string>
 500 +            <string>IPA P明朝</string>
 501 +            <string>IPA モナー P明朝</string>
 502 +            <string>梅P明朝</string>
 503 +            <string>さざなみ明朝</string>
 504 +            <string>東風明朝</string>
 505 +        </edit>
 506 +    </match>
 507 +
 508 +    <match target="pattern">
 509 +        <test name="lang" compare="contains">
 510 +            <string>ja</string>
 511 +        </test>
 512 +        <test qual="any" name="family">
 513 +            <string>sans-serif</string>
 514 +        </test>
 515 +        <edit name="family" mode="prepend" binding="same">
 516 +            <string>DejaVu Sans</string>
 517 +            <string>Takao Pゴシック</string>
 518 +            <string>IPA Pゴシック</string>
 519 +            <string>IPA モナー Pゴシック</string>
 520 +            <string>UmePlus P Gothic</string>
 521 +            <string>梅Pゴシック</string>
 522 +            <string>VL Pゴシック</string>
 523 +            <string>さざなみゴシック</string>
 524 +            <string>東風ゴシック</string>
 525 +        </edit>
 526 +    </match>
 527 +
 528 +    <match target="pattern">
 529 +        <test name="lang" compare="contains">
 530 +            <string>ja</string>
 531 +        </test>
 532 +        <test qual="any" name="family">
 533 +            <string>monospace</string>
 534 +        </test>
 535 +        <edit name="family" mode="prepend" binding="same">
 536 +            <string>Takaoゴシック</string>
 537 +            <string>IPAゴシック</string>
 538 +            <string>IPA モナー ゴシック</string>
 539 +            <string>UmePlus Gothic</string>
 540 +            <string>梅ゴシック</string>
 541 +            <string>VL ゴシック</string>
 542 +            <string>さざなみゴシック</string>
 543 +            <string>東風ゴシック</string>
 544 +        </edit>
 545 +    </match>
 546 +
 547 +    <match target="pattern">
 548 +        <test qual="any" name="family">
 549 +            <string>Ryumin</string>
 550 +        </test>
 551 +        <edit name="family" mode="prepend" binding="same">
 552 +            <string>Takao P明朝</string>
 553 +            <string>IPA P明朝</string>
 554 +            <string>IPA モナー P明朝</string>
 555 +            <string>梅P明朝</string>
 556 +            <string>さざなみ明朝</string>
 557 +            <string>東風明朝</string>
 558 +        </edit>
 559 +    </match>
 560 +
 561 +    <match target="pattern">
 562 +        <test qual="any" name="family">
 563 +            <string>GothicBBB</string>
 564 +        </test>
 565 +        <edit name="family" mode="prepend" binding="same">
 566 +            <string>Takao Pゴシック</string>
 567 +            <string>IPA Pゴシック</string>
 568 +            <string>IPA モナー Pゴシック</string>
 569 +            <string>UmePlus P Gothic</string>
 570 +            <string>梅Pゴシック</string>
 571 +            <string>VL Pゴシック</string>
 572 +            <string>さざなみ ゴシック</string>
 573 +            <string>東風ゴシック</string>
 574 +        </edit>
 575 +    </match>
 576 +
 577 +    <match target="font">
 578 +        <test name="family" compare="contains">
 579 +            <string>IPA Pゴシック</string>
 580 +            <string>IPA P明朝</string>
 581 +            <string>IPA モナー Pゴシック</string>
 582 +            <string>IPA モナー P明朝</string>
 583 +            <string>IPA モナー UIゴシック</string>
 584 +            <string>IPA モナー ゴシック</string>
 585 +            <string>IPA モナー 明朝</string>
 586 +            <string>IPAexゴシック</string>
 587 +            <string>IPAex明朝</string>
 588 +            <string>IPAゴシック</string>
 589 +            <string>IPA明朝</string>
 590 +            <string>Takao Pゴシック</string>
 591 +            <string>Takao P明朝</string>
 592 +            <string>TakaoExゴシック</string>
 593 +            <string>TakaoEx明朝</string>
 594 +            <string>Takaoゴシック</string>
 595 +            <string>Takao明朝</string>
 596 +            <string>UmePlus Gothic</string>
 597 +            <string>UmePlus P Gothic</string>
 598 +            <string>VL Pゴシック</string>
 599 +            <string>VL ゴシック</string>
 600 +            <string>さざなみゴシック</string>
 601 +            <string>さざなみ明朝</string>
 602 +            <string>東風ゴシック</string>
 603 +            <string>東風明朝</string>
 604 +            <string>梅Pゴシック</string>
 605 +            <string>梅PゴシックC4</string>
 606 +            <string>梅PゴシックC5</string>
 607 +            <string>梅PゴシックO5</string>
 608 +            <string>梅PゴシックS4</string>
 609 +            <string>梅PゴシックS5</string>
 610 +            <string>梅P明朝</string>
 611 +            <string>梅P明朝S3</string>
 612 +            <string>梅UIゴシック</string>
 613 +            <string>梅UIゴシックO5</string>
 614 +            <string>梅ゴシック</string>
 615 +            <string>梅ゴシックC4</string>
 616 +            <string>梅ゴシックC5</string>
 617 +            <string>梅ゴシックO5</string>
 618 +            <string>梅ゴシックS4</string>
 619 +            <string>梅ゴシックS5</string>
 620 +            <string>梅明朝</string>
 621 +            <string>梅明朝S3</string>
 622 +        </test>
 623 +        <test name="pixelsize" compare="less_eq">
 624 +            <double>18</double>
 625 +        </test>
 626 +        <edit name="hintstyle" mode="assign">
 627 +            <const>hintnone</const>
 628 +        </edit>
 629 +        <edit name="embeddedbitmap">
 630 +             <bool>false</bool>
 631 +        </edit>
 632 +    </match>
 633 +    <!-- Japanese (ja) ends -->
 634  </fontconfig>
 635 
 636 === modified file 'fontconfig/69-language-selector-zh-cn.conf'
 637 --- fontconfig/69-language-selector-zh-cn.conf	2010-03-11 21:47:00 +0000
 638 +++ fontconfig/69-language-selector-zh-cn.conf	2010-04-24 14:12:44 +0000
 639 @@ -7,11 +7,14 @@
 640  			<string>serif</string>
 641  		</test>
 642  		<edit name="family" mode="prepend" binding="strong">
 643 -			<string>AR PL UMing CN</string>
 644 -			<string>AR PL ShanHeiSun Uni</string>
 645 -			<string>WenQuanYi Bitmap Song</string>
 646 +			<string>DejaVu Serif</string>
 647  			<string>Bitstream Vera Serif</string>
 648 -			<string>DejaVu Serif</string>
 649 +			<string>HYSong</string>
 650 +			<string>AR PL UMing CN</string>
 651 +			<string>AR PL UMing HK</string>
 652 +			<string>AR PL ShanHeiSun Uni</string>
 653 +			<string>AR PL New Sung</string>
 654 +			<string>WenQuanYi Bitmap Song</string>
 655  			<string>AR PL UKai CN</string>
 656  			<string>AR PL ZenKai Uni</string>
 657  		</edit>
 658 @@ -21,12 +24,16 @@
 659  			<string>sans-serif</string>
 660  		</test>
 661  		<edit name="family" mode="prepend" binding="strong">
 662 +			<string>DejaVu Sans</string>
 663  			<string>Bitstream Vera Sans</string>
 664 -			<string>DejaVu Sans</string>
 665 +			<string>WenQuanYi Micro Hei</string>
 666  			<string>WenQuanYi Zen Hei</string>
 667 +			<string>Droid Sans Fallback</string>
 668 +			<string>HYSong</string>
 669  			<string>AR PL UMing CN</string>
 670 +			<string>AR PL UMing HK</string>
 671  			<string>AR PL ShanHeiSun Uni</string>
 672 -			<string>WenQuanYi Bitmap Song</string>
 673 +			<string>AR PL New Sung</string>
 674  			<string>AR PL UKai CN</string>
 675  			<string>AR PL ZenKai Uni</string>
 676  		</edit>
 677 @@ -36,12 +43,16 @@
 678  			<string>monospace</string>
 679  		</test>
 680  		<edit name="family" mode="prepend" binding="strong">
 681 +			<string>DejaVu Sans Mono</string>
 682  			<string>Bitstream Vera Sans Mono</string>
 683 -			<string>DejaVu Sans Mono</string>
 684 -			<string>WenQuanYi Zen Hei</string>
 685 +			<string>WenQuanYi Micro Hei Mono</string>
 686 +			<string>WenQuanYi Zen Hei Mono</string>
 687 +			<string>Droid Sans Fallback</string>
 688 +			<string>HYSong</string>
 689  			<string>AR PL UMing CN</string>
 690 +			<string>AR PL UMing HK</string>
 691  			<string>AR PL ShanHeiSun Uni</string>
 692 -			<string>WenQuanYi Bitmap Song</string>
 693 +			<string>AR PL New Sung</string>
 694  			<string>AR PL UKai CN</string>
 695  			<string>AR PL ZenKai Uni</string>
 696  		</edit>
 697 
 698 === modified file 'fontconfig/69-language-selector-zh-hk.conf'
 699 --- fontconfig/69-language-selector-zh-hk.conf	2010-03-11 21:47:00 +0000
 700 +++ fontconfig/69-language-selector-zh-hk.conf	2010-04-24 14:12:44 +0000
 701 @@ -7,11 +7,13 @@
 702  			<string>serif</string>
 703  		</test>
 704  		<edit name="family" mode="prepend" binding="strong">
 705 -			<string>AR PL UMing HK</string>
 706 -			<string>AR PL ShanHeiSun Uni</string>
 707 -			<string>WenQuanYi Bitmap Song</string>
 708 +			<string>DejaVu Serif</string>
 709  			<string>Bitstream Vera Serif</string>
 710 -			<string>DejaVu Serif</string>
 711 +			<string>AR PL UMing HK</string>
 712 +			<string>AR PL ShanHeiSun Uni</string>
 713 +			<string>AR PL New Sung</string>
 714 +			<string>HYSong</string>
 715 +			<string>WenQuanYi Bitmap Song</string>
 716  			<string>AR PL UKai HK</string>
 717  			<string>AR PL ZenKai Uni</string>
 718  		</edit>
 719 @@ -21,12 +23,15 @@
 720  			<string>sans-serif</string>
 721  		</test>
 722  		<edit name="family" mode="prepend" binding="strong">
 723 +			<string>DejaVu Sans</string>
 724  			<string>Bitstream Vera Sans</string>
 725 -			<string>DejaVu Sans</string>
 726 +			<string>WenQuanYi Micro Hei</string>
 727  			<string>WenQuanYi Zen Hei</string>
 728 +			<string>Droid Sans Fallback</string>
 729  			<string>AR PL UMing HK</string>
 730  			<string>AR PL ShanHeiSun Uni</string>
 731 -			<string>WenQuanYi Bitmap Song</string>
 732 +			<string>AR PL New Sung</string>
 733 +			<string>HYSong</string>
 734  			<string>AR PL UKai HK</string>
 735  			<string>AR PL ZenKai Uni</string>
 736  		</edit>
 737 @@ -36,12 +41,15 @@
 738  			<string>monospace</string>
 739  		</test>
 740  		<edit name="family" mode="prepend" binding="strong">
 741 +			<string>DejaVu Sans Mono</string>
 742  			<string>Bitstream Vera Sans Mono</string>
 743 -			<string>DejaVu Sans Mono</string>
 744 -			<string>WenQuanYi Zen Hei</string>
 745 +			<string>WenQuanYi Micro Hei Mono</string>
 746 +			<string>WenQuanYi Zen Hei Mono</string>
 747 +			<string>Droid Sans Fallback</string>
 748  			<string>AR PL UMing HK</string>
 749  			<string>AR PL ShanHeiSun Uni</string>
 750 -			<string>WenQuanYi Bitmap Song</string>
 751 +			<string>AR PL New Sung</string>
 752 +			<string>HYSong</string>
 753  			<string>AR PL UKai HK</string>
 754  			<string>AR PL ZenKai Uni</string>
 755  		</edit>
 756 
 757 === modified file 'fontconfig/69-language-selector-zh-mo.conf'
 758 --- fontconfig/69-language-selector-zh-mo.conf	2010-03-11 21:47:00 +0000
 759 +++ fontconfig/69-language-selector-zh-mo.conf	2010-04-24 14:12:44 +0000
 760 @@ -7,11 +7,13 @@
 761  			<string>serif</string>
 762  		</test>
 763  		<edit name="family" mode="prepend" binding="strong">
 764 -			<string>AR PL UMing HK</string>
 765 -			<string>AR PL ShanHeiSun Uni</string>
 766 -			<string>WenQuanYi Bitmap Song</string>
 767 +			<string>DejaVu Serif</string>
 768  			<string>Bitstream Vera Serif</string>
 769 -			<string>DejaVu Serif</string>
 770 +			<string>AR PL UMing HK</string>
 771 +			<string>AR PL ShanHeiSun Uni</string>
 772 +			<string>AR PL New Sung</string>
 773 +			<string>HYSong</string>
 774 +			<string>WenQuanYi Bitmap Song</string>
 775  			<string>AR PL UKai HK</string>
 776  			<string>AR PL ZenKai Uni</string>
 777  		</edit>
 778 @@ -21,12 +23,15 @@
 779  			<string>sans-serif</string>
 780  		</test>
 781  		<edit name="family" mode="prepend" binding="strong">
 782 +			<string>DejaVu Sans</string>
 783  			<string>Bitstream Vera Sans</string>
 784 -			<string>DejaVu Sans</string>
 785 +			<string>WenQuanYi Micro Hei</string>
 786  			<string>WenQuanYi Zen Hei</string>
 787 +			<string>Droid Sans Fallback</string>
 788  			<string>AR PL UMing HK</string>
 789  			<string>AR PL ShanHeiSun Uni</string>
 790 -			<string>WenQuanYi Bitmap Song</string>
 791 +			<string>AR PL New Sung</string>
 792 +			<string>HYSong</string>
 793  			<string>AR PL UKai HK</string>
 794  			<string>AR PL ZenKai Uni</string>
 795  		</edit>
 796 @@ -36,12 +41,15 @@
 797  			<string>monospace</string>
 798  		</test>
 799  		<edit name="family" mode="prepend" binding="strong">
 800 +			<string>DejaVu Sans Mono</string>
 801  			<string>Bitstream Vera Sans Mono</string>
 802 -			<string>DejaVu Sans Mono</string>
 803 -			<string>WenQuanYi Zen Hei</string>
 804 +			<string>WenQuanYi Micro Hei Mono</string>
 805 +			<string>WenQuanYi Zen Hei Mono</string>
 806 +			<string>Droid Sans Fallback</string>
 807  			<string>AR PL UMing HK</string>
 808  			<string>AR PL ShanHeiSun Uni</string>
 809 -			<string>WenQuanYi Bitmap Song</string>
 810 +			<string>AR PL New Sung</string>
 811 +			<string>HYSong</string>
 812  			<string>AR PL UKai HK</string>
 813  			<string>AR PL ZenKai Uni</string>
 814  		</edit>
 815 
 816 === modified file 'fontconfig/69-language-selector-zh-sg.conf'
 817 --- fontconfig/69-language-selector-zh-sg.conf	2010-03-11 21:47:00 +0000
 818 +++ fontconfig/69-language-selector-zh-sg.conf	2010-04-24 14:12:44 +0000
 819 @@ -7,11 +7,14 @@
 820  			<string>serif</string>
 821  		</test>
 822  		<edit name="family" mode="prepend" binding="strong">
 823 -			<string>AR PL UMing CN</string>
 824 -			<string>AR PL ShanHeiSun Uni</string>
 825 -			<string>WenQuanYi Bitmap Song</string>
 826 +			<string>DejaVu Serif</string>
 827  			<string>Bitstream Vera Serif</string>
 828 -			<string>DejaVu Serif</string>
 829 +			<string>HYSong</string>
 830 +			<string>AR PL UMing CN</string>
 831 +			<string>AR PL UMing HK</string>
 832 +			<string>AR PL ShanHeiSun Uni</string>
 833 +			<string>AR PL New Sung</string>
 834 +			<string>WenQuanYi Bitmap Song</string>
 835  			<string>AR PL UKai CN</string>
 836  			<string>AR PL ZenKai Uni</string>
 837  		</edit>
 838 @@ -21,12 +24,16 @@
 839  			<string>sans-serif</string>
 840  		</test>
 841  		<edit name="family" mode="prepend" binding="strong">
 842 +			<string>DejaVu Sans</string>
 843  			<string>Bitstream Vera Sans</string>
 844 -			<string>DejaVu Sans</string>
 845 +			<string>WenQuanYi Micro Hei</string>
 846  			<string>WenQuanYi Zen Hei</string>
 847 +			<string>Droid Sans Fallback</string>
 848 +			<string>HYSong</string>
 849  			<string>AR PL UMing CN</string>
 850 +			<string>AR PL UMing HK</string>
 851  			<string>AR PL ShanHeiSun Uni</string>
 852 -			<string>WenQuanYi Bitmap Song</string>
 853 +			<string>AR PL New Sung</string>
 854  			<string>AR PL UKai CN</string>
 855  			<string>AR PL ZenKai Uni</string>
 856  		</edit>
 857 @@ -36,12 +43,16 @@
 858  			<string>monospace</string>
 859  		</test>
 860  		<edit name="family" mode="prepend" binding="strong">
 861 +			<string>DejaVu Sans Mono</string>
 862  			<string>Bitstream Vera Sans Mono</string>
 863 -			<string>DejaVu Sans Mono</string>
 864 -			<string>WenQuanYi Zen Hei</string>
 865 +			<string>WenQuanYi Micro Hei Mono</string>
 866 +			<string>WenQuanYi Zen Hei Mono</string>
 867 +			<string>Droid Sans Fallback</string>
 868 +			<string>HYSong</string>
 869  			<string>AR PL UMing CN</string>
 870 +			<string>AR PL UMing HK</string>
 871  			<string>AR PL ShanHeiSun Uni</string>
 872 -			<string>WenQuanYi Bitmap Song</string>
 873 +			<string>AR PL New Sung</string>
 874  			<string>AR PL UKai CN</string>
 875  			<string>AR PL ZenKai Uni</string>
 876  		</edit>
 877 
 878 === modified file 'fontconfig/69-language-selector-zh-tw.conf'
 879 --- fontconfig/69-language-selector-zh-tw.conf	2010-03-11 21:47:00 +0000
 880 +++ fontconfig/69-language-selector-zh-tw.conf	2010-04-24 14:12:44 +0000
 881 @@ -7,12 +7,16 @@
 882  			<string>serif</string>
 883  		</test>
 884  		<edit name="family" mode="prepend" binding="strong">
 885 -			<string>AR PL UMing TW</string>
 886 -			<string>AR PL ShanHeiSun Uni</string>
 887 -			<string>WenQuanYi Bitmap Song</string>
 888 +			<string>DejaVu Serif</string>
 889  			<string>Bitstream Vera Serif</string>
 890 -			<string>DejaVu Serif</string>
 891 +			<string>AR PL UMing TW</string>
 892 +			<string>AR PL UMing HK</string>
 893 +			<string>AR PL ShanHeiSun Uni</string>
 894 +			<string>AR PL New Sung</string>
 895 +			<string>HYSong</string>
 896 +			<string>WenQuanYi Bitmap Song</string>
 897  			<string>AR PL UKai TW</string>
 898 +			<string>AR PL UKai HK</string>
 899  			<string>AR PL ZenKai Uni</string>
 900  		</edit>
 901  	</match> 
 902 @@ -21,13 +25,18 @@
 903  			<string>sans-serif</string>
 904  		</test>
 905  		<edit name="family" mode="prepend" binding="strong">
 906 +			<string>DejaVu Sans</string>
 907  			<string>Bitstream Vera Sans</string>
 908 -			<string>DejaVu Sans</string>
 909 +			<string>WenQuanYi Micro Hei</string>
 910  			<string>WenQuanYi Zen Hei</string>
 911 +			<string>Droid Sans Fallback</string>
 912  			<string>AR PL UMing TW</string>
 913 +			<string>AR PL UMing HK</string>
 914  			<string>AR PL ShanHeiSun Uni</string>
 915 -			<string>WenQuanYi Bitmap Song</string>
 916 +			<string>AR PL New Sung</string>
 917 +			<string>HYSong</string>
 918  			<string>AR PL UKai TW</string>
 919 +			<string>AR PL UKai HK</string>
 920  			<string>AR PL ZenKai Uni</string>
 921  		</edit>
 922  	</match> 
 923 @@ -36,13 +45,18 @@
 924  			<string>monospace</string>
 925  		</test>
 926  		<edit name="family" mode="prepend" binding="strong">
 927 +			<string>DejaVu Sans Mono</string>
 928  			<string>Bitstream Vera Sans Mono</string>
 929 -			<string>DejaVu Sans Mono</string>
 930 -			<string>WenQuanYi Zen Hei</string>
 931 +			<string>WenQuanYi Micro Hei Mono</string>
 932 +			<string>WenQuanYi Zen Hei Mono</string>
 933 +			<string>Droid Sans Fallback</string>
 934  			<string>AR PL UMing TW</string>
 935 +			<string>AR PL UMing HK</string>
 936  			<string>AR PL ShanHeiSun Uni</string>
 937 -			<string>WenQuanYi Bitmap Song</string>
 938 +			<string>AR PL New Sung</string>
 939 +			<string>HYSong</string>
 940  			<string>AR PL UKai TW</string>
 941 +			<string>AR PL UKai HK</string>
 942  			<string>AR PL ZenKai Uni</string>
 943  		</edit>
 944  	</match> 

添付ファイル

添付ファイルを参照するには、(下のファイル一覧にあるように)attachment:filenameと記述します。 [get]リンクのURLは変更される可能性が高いので、利用しないでください。
 All files | Selected Files: delete move to page copy to page

ファイルを添付する権限がありません。