From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?6buE5bu65b+g?= Newsgroups: gmane.emacs.devel Subject: Re: A patch for enforcing double-width CJK character display Date: Tue, 17 Apr 2012 10:16:20 +0800 Message-ID: <4F8CD274.2030904@i-soft.com.cn> References: <4F85A138.6090900@i-soft.com.cn> <87vcl646c7.fsf@isil.kanru.info> <4F85AE69.9050002@i-soft.com.cn> <4F8698B0.2030703@i-soft.com.cn> <83hawp46p7.fsf@gnu.org> <4F86BA0F.4080301@i-soft.com.cn> <83ehrt3u0p.fsf@gnu.org> <4F87173F.3070801@i-soft.com.cn> <4F8782C8.2030005@i-soft.com.cn> <87d379h971.fsf@catnip.gol.com> <877gxghc3d.fsf@catnip.gol.com> <4F8B6D0F.2050700@i-soft.com.cn> <4F8BB0D3.6060202@i-soft.com.cn> <4F8BBE1F.9080701@i-soft.com.cn> <4F8BE4B0.7020303@i-soft.com.cn> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060907040906060304000701" X-Trace: dough.gmane.org 1334629008 5231 80.91.229.3 (17 Apr 2012 02:16:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 17 Apr 2012 02:16:48 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 17 04:16:44 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SJxyG-0001Hv-5U for ged-emacs-devel@m.gmane.org; Tue, 17 Apr 2012 04:16:44 +0200 Original-Received: from localhost ([::1]:34707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJxyF-0003Kc-DV for ged-emacs-devel@m.gmane.org; Mon, 16 Apr 2012 22:16:43 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJxy9-0003KX-UO for emacs-devel@gnu.org; Mon, 16 Apr 2012 22:16:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJxy5-0007KG-D7 for emacs-devel@gnu.org; Mon, 16 Apr 2012 22:16:37 -0400 Original-Received: from mta319.sina.net ([202.108.3.197]:34867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJxy3-0007JY-GS for emacs-devel@gnu.org; Mon, 16 Apr 2012 22:16:33 -0400 X-Originating-IP: [218.240.45.242] Original-Received: from unknown (HELO mta319.sina.net) ([10.54.5.51]) by irxd5-206.sina.net with ESMTP; 17 Apr 2012 10:16:27 +0800 Original-Received: by smtp-5-51.sina.net (SINAMAIL, from userid 1074) id 796FBDCA8C8; Tue, 17 Apr 2012 10:16:21 +0800 (CST) Original-Received: from piggy.pure64.org (unknown [218.240.45.242]) by smtp-5-51.sina.net (SINAMAIL) with ESMTPA id D58AEDCA8B8 for ; Tue, 17 Apr 2012 10:16:20 +0800 (CST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.2) Gecko/20120327 Thunderbird/10.0.2 In-Reply-To: <4F8BE4B0.7020303@i-soft.com.cn> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.108.3.197 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149712 Archived-At: This is a multi-part message in MIME format. --------------060907040906060304000701 Content-Type: multipart/alternative; boundary="------------080705070007030107010101" --------------080705070007030107010101 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Patch update, fix CJK offset calculation in minibuffer after font rescaling happened. Font in some buffers will not rescale when "text-scale-increase/decrease". we need use original FONT_WIDTH as reference value. Eli already gives me a hint, it's my fault. 于 2012年04月16日 17:21, 黄建忠 写道: > Hi, All, > Patch updated, add support for CJK half-width letters. > > 1, There are some forms in Japanese: > Full-width Hirakana/katakana > Half-width katakana > The width of Half-Width katakana equals to 1/2 of Full-width Katakana > letters. > > 2, There are also some forms for Korean basic letters. Full-Width > letters and Half-Width letters. > > The half-width letters for J/K is ignored in previous patch, since the > width is even smaller than English letters from monospace font. > > The updated patch add support for such half-width letters and align it > according to single English glyph width, > Normal CJK glyphs still use 2 * English glyph width as reference. > > NOTE the second line in attachments, It shows the result of half-width > katakana before/after the patch applied. > > The link below provides a full list of such half-width letters. > http://svn.jacekowski.org/chromium/trunk/third_party/icu/source/data/translit/Fullwidth_Halfwidth.txt > > 于 2012年04月16日 14:37, 黄建忠 写道: >> [mail rejected again and again , resend to list] >> >> Hi, Miles. >> >> I had downloaded the font and try it with such settings: >> >> 1, LANG=ja_JP.utf8 >> 2, remove all zh/ja fonts existed on my Linux, and just let it match >> "kiloji" font. >> 3, set emacs font size 10 or 13. >> >> And got the result as attachments, It is readable and just looks like >> before, but the alignment issue is fixed. (NOTE the alignment of >> VERTICAL BAR) >> >> I think you have some misunderstanding about the fix and character >> width and font width. >> >> 1, although the "kiloji" character width looks as small as monospace >> font width, but the real pixel width of the glyph is already wide >> enough, >> It's the font choose to leave too much space left and right of the >> character. >> >> 2, for Monospace 10, the pixelsize is 14, then it matches a "koliji >> 10" with pixelsize 12. that's to say, >> *the fix only added ONE pixel left and ONE pixel right.* Can anybody >> feel such a little alignment change? >> >> The patch should be good enough for you and I am sure you will never >> fell the change of the alignment after the fix. >> >> Do not guess the result and just have a try :-D >> >> >> 于 2012年04月16日 13:40, 黄建忠 写道: >>> Got it, I will try this font. >>> >>> by the way, You can add a line to your .emacs. >>> (set-fontset-font "fontset-default" 'han "FONTFAMILY FONTSIZE" ) >>> replace "FONTFAMILY" and FONTSIZE according to your environment. >>> And FONTSIZE can be ignored if you had no need to specify a size for >>> this font. >>> >>> 于 2012年04月16日 13:27, Miles Bader 写道: >>>> 黄建忠 writes: >>>>> Would you please provide some example characters and such a font to >>>>> help us make it better? >>>> Here's an example from my (Debian) system; the font I chose in Emacs >>>> is "Droid Sans Mono"; the "x11 size" is 13 [which isn't exactly the >>>> size chosen in the UI; fontconfig sizes and X font sizes seem to be >>>> only loosely related... :( ] >>>> >>>> I set the font to "Droid Sans Mono", and the Japanese font Emacs >>>> automatically chose was "きろ字". I don't know _why_ Emacs chose that >>>> font, as other apps don't seem to -- If I select Droid S M in GTK >>>> apps, for instance, they use something much better looking, probably >>>> "Droid Fallback" (which is a matching font for Droid S M). >>>> >>>> I've attached an image file showing what this looks like on my >>>> computer. >>>> >>>> The things I notice: >>>> >>>> (1) The font chosen by Emacs for Japanese might be a bit odd, and >>>> doesn't seem to match what other apps choose. >>>> >>>> (2) The "きろ字" font is already pretty widely spaced, maybe near >>>> the limit of readability IMO. >>>> >>>> (3) It looks like forcing CJK alignment to 2*ASCII will increase the >>>> width of characters in this font by about 30%. Given the already >>>> very wide spacing, I think the result might look funny. >>>> >>>> [ (4) If I grow or shrink the font-size, the ASCII and Japanese grow >>>> by different, and varying amounts (that is, there are obvious >>>> "jumps" in the size increases, and the jumps occur at different >>>> places for the ASCII font and the Japanese font); my guess is that >>>> this is probably due to rounding by the font renderer. So there >>>> will be. ] >>>> >>>> Now that I think about it, I'd say that the problem seems to lie more >>>> with Emacs' choice of fonts for Japanese (both the funny automatic >>>> choice, and the lack of good methods for users to tweak it). >>>> >>>> Thanks, >>>> >>>> -Miles >>>> >>>> >>>> >>> >>> >>> -- >>> Huang JianZhong >> >> >> -- >> Huang JianZhong > > > -- > Huang JianZhong -- Huang JianZhong --------------080705070007030107010101 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch update, fix CJK offset calculation in minibuffer after font rescaling happened.

Font in some buffers will not rescale when "text-scale-increase/decrease".  we need use original FONT_WIDTH as reference value.

Eli already gives me a hint, it's my fault.

于 2012年04月16日 17:21, 黄建忠 写道:
Hi, All,
Patch updated, add support for CJK half-width letters.

1, There are some forms in Japanese:
Full-width Hirakana/katakana
Half-width katakana
The width of Half-Width katakana equals to 1/2 of Full-width Katakana letters.

2, There are also some forms for Korean basic letters. Full-Width letters and Half-Width letters.

The half-width letters for J/K is ignored in previous patch, since the width is even smaller than English letters from monospace font.

The updated patch add support for such half-width letters and align it according to single English glyph width,
Normal CJK glyphs still use 2 * English glyph width as reference.

NOTE the second line in attachments, It shows the result of half-width katakana before/after the patch applied.

The link below provides a full list of such half-width letters.
http://svn.jacekowski.org/chromium/trunk/third_party/icu/source/data/translit/Fullwidth_Halfwidth.txt

于 2012年04月16日 14:37, 黄建忠 写道:
[mail rejected again and again , resend to list]

Hi, Miles.

I had downloaded the font and try it with such settings:

1, LANG=ja_JP.utf8
2, remove all zh/ja fonts existed on my Linux, and just let it match "kiloji" font.
3, set emacs font size 10 or 13.

And got the result as attachments, It is readable and just looks like before, but the alignment issue is fixed. (NOTE the alignment of VERTICAL BAR)

I think you have some misunderstanding about the fix and character width and font width.

1, although the "kiloji" character width looks as small as monospace font width, but the real pixel width of the glyph is already wide enough,
   It's the font choose to leave too much space left and right of the character.

2, for Monospace 10, the pixelsize is 14, then it matches a "koliji 10" with pixelsize 12. that's to say,
the fix only added ONE pixel left and ONE pixel right. Can  anybody feel such a little alignment change?

The patch should be good enough for you and I am sure you will never fell the change of the alignment after the fix.

Do not guess the result and just have a try :-D


于 2012年04月16日 13:40, 黄建忠 写道:
Got it, I will try this font.

by the way, You can add a line to your .emacs.
(set-fontset-font "fontset-default" 'han "FONTFAMILY FONTSIZE" )
replace "FONTFAMILY" and FONTSIZE according to your environment.
And FONTSIZE can be ignored if you had no need to specify a size for this font.

于 2012年04月16日 13:27, Miles Bader 写道: 
黄建忠 <jianzhong.huang@i-soft.com.cn> writes:

Would you please provide some example characters and such a font to
help us make it better?

Here's an example from my (Debian) system; the font I chose in Emacs
is "Droid Sans Mono"; the "x11 size" is 13 [which isn't exactly the
size chosen in the UI; fontconfig sizes and X font sizes seem to be
only loosely related... :( ]

I set the font to "Droid Sans Mono", and the Japanese font Emacs
automatically chose was "きろ字".  I don't know _why_ Emacs chose that
font, as other apps don't seem to -- If I select Droid S M in GTK
apps, for instance, they use something much better looking, probably
"Droid Fallback" (which is a matching font for Droid S M).

I've attached an image file showing what this looks like on my
computer.

The things I notice:

  (1) The font chosen by Emacs for Japanese might be a bit odd, and
  doesn't seem to match what other apps choose.

  (2) The "きろ字" font is already pretty widely spaced, maybe near
  the limit of readability IMO.

  (3) It looks like forcing CJK alignment to 2*ASCII will increase the
  width of characters in this font by about 30%.  Given the already
  very wide spacing, I think the result might look funny.

  [ (4) If I grow or shrink the font-size, the ASCII and Japanese grow
  by different, and varying amounts (that is, there are obvious
  "jumps" in the size increases, and the jumps occur at different
  places for the ASCII font and the Japanese font); my guess is that
  this is probably due to rounding by the font renderer.  So there
  will be. ]

Now that I think about it, I'd say that the problem seems to lie more
with Emacs' choice of fonts for Japanese (both the funny automatic
choice, and the lack of good methods for users to tweak it).

Thanks,

-Miles






-- 
Huang JianZhong


-- 
Huang JianZhong


-- 
Huang JianZhong


-- 
Huang JianZhong
--------------080705070007030107010101-- --------------060907040906060304000701 Content-Type: text/plain; name="emacs-cjk-monospace-v12.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="emacs-cjk-monospace-v12.patch" LS0tIGVtYWNzL3NyYy94ZnRmb250LmMJMjAxMi0wNC0xNiAxODozOTozMy41OTY3MzgwNzkg KzA4MDAKKysrIGVtYWNzLmNqay9zcmMveGZ0Zm9udC5jCTIwMTItMDQtMTYgMTg6NDA6MDUu OTk3NzQwNDQ5ICswODAwCkBAIC02MSw2ICs2MSw4IEBACiAgIERpc3BsYXkgKmRpc3BsYXk7 CiAgIGludCBzY3JlZW47CiAgIFhmdEZvbnQgKnhmdGZvbnQ7CisgIEZSQU1FX1BUUiBmcmFt ZTsgLyogaG9sZCBmcmFtZSBwdHIsIGNqayBkb3VibGUgd2lkdGggZml4IG5lZWQgaXQgKi8K KyAgaW50IGlzX2NqazsgLyogRmxhZyB0byB0ZWxsIGlmIGl0IGlzIENKSyBmb250IG9yIG5v dC4gKi8KIH07CiAKIC8qIFN0cnVjdHVyZSBwb2ludGVkIGJ5IChzdHJ1Y3QgZmFjZSAqKS0+ ZXh0cmEgICovCkBAIC0xMzcsNiArMTM5LDcyIEBACiB9CiAKIAorc3RhdGljIGludCB4ZnRm b250X2lzX2Nqa19mb250KHN0cnVjdCB4ZnRmb250X2luZm8gKik7CitzdGF0aWMgaW50IHhm dGZvbnRfZ2V0X2Nqa19wYWRkaW5nKGludCwgaW50LCBpbnQqKTsKK3N0YXRpYyBpbnQgeGZ0 Zm9udF9nZXRfZGVmYXVsdF93aWR0aChGUkFNRV9QVFIpOworCisvKiBDaGVjayB3aGV0aGVy IHRoZSBmb250IGNvbnRhaW5zIENKSyBJZGVvZ3JhcGggJ251bWJlciBvbmUnLCAweDRFMDAs CisgICBJdCBzaG91bGQgYmUgb2sgZm9yIENoaW5lc2UvSmFwYW5lc2UgZm9udC4KKyAgIE9y IGZvbnQgY29udGFpbnMgS29yZWFuIHNjcmlwdCBzeWxsYWJsZSAnS2EnLDB4QUMwMCwKKyAg IGJlY2F1c2UgS29yZWFuIGZvbnRzIG1heSBub3QgaGF2ZSBhbnkgQ2hpbmVzZSBjaGFyYWN0 ZXJzIGF0IGFsbC4KKyAgIGNvZGVzIGZyb20geHRlcm0uKi8KK3N0YXRpYyBpbnQKK3hmdGZv bnRfaXNfY2prX2ZvbnQoc3RydWN0IHhmdGZvbnRfaW5mbyAqeGZ0Zm9udF9pbmZvKQorewor ICBpZihYZnRDaGFyRXhpc3RzKHhmdGZvbnRfaW5mby0+ZGlzcGxheSwgeGZ0Zm9udF9pbmZv LT54ZnRmb250LCAweDRFMDApIHx8CisgICAgICBYZnRDaGFyRXhpc3RzKHhmdGZvbnRfaW5m by0+ZGlzcGxheSwgeGZ0Zm9udF9pbmZvLT54ZnRmb250LCAweEFDMDApKQorICAgIHJldHVy biAxOworICByZXR1cm4gMDsgCit9CisKKy8qIEdldCB0aGUgcGFkZGluZyBhY2NvcmRpbmcg dG8gZGVmYXVsdCBtb25vc3BhY2UgZm9udCB3aWR0aCAqLworc3RhdGljIGludAoreGZ0Zm9u dF9nZXRfY2prX3BhZGRpbmcoaW50IGRlZmF1bHRfd2lkdGgsIGludCBjaGFyX3dpZHRoLCBp bnQgKmhhbGZfd2lkdGhfY2prKQoreworICBpbnQgcGFkZGluZyA9IDA7CisgIGlmKGhhbGZf d2lkdGhfY2prKQorICAgICpoYWxmX3dpZHRoX2NqayA9IDA7CisKKyAgaWYoIGRlZmF1bHRf d2lkdGggPT0gMCB8fCAvKiBkZWZhdWx0IGZvbnQgaXMgbm90IG1vbm9zcGFjZSAqLworICAg ICAgY2hhcl93aWR0aCA9PSBkZWZhdWx0X3dpZHRoKSAvKiBhbHJlYWR5IGdvb2QgKi8KKyAg ICByZXR1cm4gMDsKKyAgaWYoIGNoYXJfd2lkdGggPCBkZWZhdWx0X3dpZHRoKSB7IC8qIGFs bW9zdCBpbXBvc3NpYmxlLCBidXQgd2UgY2FuIGhhbmRsZSBpdCAqLworICAgIHBhZGRpbmcg PSBkZWZhdWx0X3dpZHRoIC0gY2hhcl93aWR0aDsKKyAgICBpZihoYWxmX3dpZHRoX2NqaykK KyAgICAgICAgKmhhbGZfd2lkdGhfY2prID0gMTsKKyAgfSBlbHNlIC8qIGdldCB0aGUgcGFk ZGluZywgYWxsIGNqayBzeW1ib2xzIGlzIERPVUJMRSB3aWR0aCAqLworICAgIHBhZGRpbmcg PSBkZWZhdWx0X3dpZHRoICogMiAtIGNoYXJfd2lkdGg7CisgIC8qIDEsIFNvbWUgb2xkIENK SyBwY2YgZm9udHMgbWF5IGJpZ2dlciB0aGFuIDIqZGVmYXVsdF93aWR0aC4KKyAgICAgMiwg VXNlciBtYXkgc2V0IGEgdmVyeSBiaWcgZm9udCBzaXplIGZvciBzY3JpcHQgSEFOIG1hbnVh bGx5LgorICAgICBLZWVwIGl0IHVuY2hhbmdlZCwgTk9UIGFkanVzdCBkZWZhdWx0IGZvbnQg d2lkdGguICovCisgIHJldHVybiAocGFkZGluZyA+IDAgJiYgcGFkZGluZyA8IGRlZmF1bHRf d2lkdGgpID8gcGFkZGluZyA6IDA7ICAgICAgICAgICAgICAgICAgIAorfQorCisvKiAKKyAg IEdldCB0aGUgd2lkdGggb2YgZGVmYXVsdCBtb25vc3BhY2UgZm9udC4KKyAgIElmIGl0IGlz IG1vbm9zcGFjZSBmb250LCByZXR1cm4gdGhlIHNwYWNlX3dpZHRoKGFzIHNhbWUgYXMgZm9u dCB3aWR0aCkKKyAgIGVsc2UgcmV0dXJuIDAuCisgICBmb250IHJlbWFwIGNhbiBiZSBzdXBw b3J0ZWQgbm93LgorICAgVGhhbmtzIHRvIEVsaS4gKi8KK3N0YXRpYyBpbnQgCit4ZnRmb250 X2dldF9kZWZhdWx0X3dpZHRoKEZSQU1FX1BUUiBmKQoreworICBpbnQgaWQgPSBsb29rdXBf YmFzaWNfZmFjZSAoZiwgREVGQVVMVF9GQUNFX0lEKTsKKyAgc3RydWN0IGZhY2UgKmZhY2Ug PSBGQUNFX0ZST01fSUQgKGYsIGlkKTsKKyAgaWYoZmFjZSAmJiBmYWNlLT5mb250KSB7Cisg ICAgTGlzcF9PYmplY3QgZm9udF9vYmplY3Q7CisgICAgWFNFVEZPTlQgKGZvbnRfb2JqZWN0 LCBmYWNlLT5mb250KTsKKyAgICAvKiBub3QgbW9ub3NwYWNlIGZvbnQgKi8KKyAgICBpZiAo WElOVChBUkVGIChmb250X29iamVjdCwgRk9OVF9TUEFDSU5HX0lOREVYKSkgIT0gRk9OVF9T UEFDSU5HX01PTk8pCisgICAgICByZXR1cm4gMDsKKyAgICBpZihpZCA9PSBERUZBVUxUX0ZB Q0VfSUQpIC8qIG5vdCByZW1hcHBlZCAqLworICAgICAgcmV0dXJuIEZSQU1FX1NQQUNFX1dJ RFRIKGYpOworICAgIGVsc2UgLyogcmVtYXBwZWQsIHJldHVybiBuZXcgd2lkdGggKi8KKyAg ICAgIHJldHVybiBmYWNlLT5mb250LT5zcGFjZV93aWR0aDsgIAorICB9CisgIHJldHVybiAw OworfQorCiBzdGF0aWMgTGlzcF9PYmplY3QgeGZ0Zm9udF9saXN0IChMaXNwX09iamVjdCwg TGlzcF9PYmplY3QpOwogc3RhdGljIExpc3BfT2JqZWN0IHhmdGZvbnRfbWF0Y2ggKExpc3Bf T2JqZWN0LCBMaXNwX09iamVjdCk7CiBzdGF0aWMgTGlzcF9PYmplY3QgeGZ0Zm9udF9vcGVu IChGUkFNRV9QVFIsIExpc3BfT2JqZWN0LCBpbnQpOwpAQCAtNDM0LDYgKzUwMiwxNCBAQAog ICAgICAgWGZ0VGV4dEV4dGVudHM4IChkaXNwbGF5LCB4ZnRmb250LCBhc2NpaV9wcmludGFi bGUgKyAxLCA5NCwgJmV4dGVudHMpOwogICAgICAgZm9udC0+YXZlcmFnZV93aWR0aCA9IChm b250LT5zcGFjZV93aWR0aCArIGV4dGVudHMueE9mZikgLyA5NTsKICAgICB9CisKKyAgLyog dG8gZml4IENKSyBkb3VibGUgd2lkdGggYWxpZ25tZW50IGlzc3VlLgorICAgICBwYXNzIEZS QU1FX1BUUiB0byBldmVyeSB4ZnRmb250X2luZm8gc3RydWN0dXJlLAorICAgICB3ZSBjYW4g bm90IGdldCBpdCBpbiAieGZ0Zm9udF90ZXh0X2V4dGVudHMiLiAqLworICB4ZnRmb250X2lu Zm8tPmZyYW1lID0gZjsKKyAgLyogbWFyayBpdCBpcyBDSksgZm9udCBvciBub3Qgd2hlbiBm b250IG9wZW5lZCwKKyAgICAgYXZvaWQgY2FsbGluZyAieGZ0Zm9udF9pc19jamtfZm9udCIg bWFueSB0aW1lcy4gKi8KKyAgeGZ0Zm9udF9pbmZvLT5pc19jamsgPSB4ZnRmb250X2lzX2Nq a19mb250KHhmdGZvbnRfaW5mbyk7CiAgIFVOQkxPQ0tfSU5QVVQ7CiAKICAgZm9udC0+YXNj ZW50ID0geGZ0Zm9udC0+YXNjZW50OwpAQCAtNTkzLDIwICs2NjksMjcgQEAKIHsKICAgc3Ry dWN0IHhmdGZvbnRfaW5mbyAqeGZ0Zm9udF9pbmZvID0gKHN0cnVjdCB4ZnRmb250X2luZm8g KikgZm9udDsKICAgWEdseXBoSW5mbyBleHRlbnRzOwotCisgIGludCBjamtfcGFkZGluZyA9 IDA7CisgIGludCBsX3BhZGRpbmcgPSAwOworICBpbnQgcl9wYWRkaW5nID0gMDsKICAgQkxP Q0tfSU5QVVQ7CiAgIFhmdEdseXBoRXh0ZW50cyAoeGZ0Zm9udF9pbmZvLT5kaXNwbGF5LCB4 ZnRmb250X2luZm8tPnhmdGZvbnQsIGNvZGUsIG5nbHlwaHMsCiAJCSAgICZleHRlbnRzKTsK KyAgaWYoeGZ0Zm9udF9pbmZvLT5pc19jamspCisgICAgY2prX3BhZGRpbmcgPSB4ZnRmb250 X2dldF9jamtfcGFkZGluZyh4ZnRmb250X2dldF9kZWZhdWx0X3dpZHRoKHhmdGZvbnRfaW5m by0+ZnJhbWUpLCBleHRlbnRzLnhPZmYsIE5VTEwpOworICAvKiBjamtfcGFkZGluZyBtYXkg ZXF1YWxzIHRvIDAsIHRoZW4gYWxsIGlzIHplcm8sIHN0aWxsIG9rICovCisgIGxfcGFkZGlu ZyA9IGNqa19wYWRkaW5nID4+IDE7IC8qIGdldCBoYWxmICovCisgIHJfcGFkZGluZyA9IGNq a19wYWRkaW5nIC0gbF9wYWRkaW5nOyAvKiBtYXkgbm90IGRpdmlkZWQgYnkgMiBleGFjdGx5 ICovIAogICBVTkJMT0NLX0lOUFVUOwogICBpZiAobWV0cmljcykKICAgICB7Ci0gICAgICBt ZXRyaWNzLT5sYmVhcmluZyA9IC0gZXh0ZW50cy54OwotICAgICAgbWV0cmljcy0+cmJlYXJp bmcgPSAtIGV4dGVudHMueCArIGV4dGVudHMud2lkdGg7Ci0gICAgICBtZXRyaWNzLT53aWR0 aCA9IGV4dGVudHMueE9mZjsKKyAgICAgIG1ldHJpY3MtPmxiZWFyaW5nID0gLSBleHRlbnRz LnggLSBsX3BhZGRpbmc7CisgICAgICBtZXRyaWNzLT5yYmVhcmluZyA9IC0gZXh0ZW50cy54 ICsgZXh0ZW50cy53aWR0aCArIHJfcGFkZGluZzsKKyAgICAgIG1ldHJpY3MtPndpZHRoID0g ZXh0ZW50cy54T2ZmICsgY2prX3BhZGRpbmc7CiAgICAgICBtZXRyaWNzLT5hc2NlbnQgPSBl eHRlbnRzLnk7CiAgICAgICBtZXRyaWNzLT5kZXNjZW50ID0gZXh0ZW50cy5oZWlnaHQgLSBl eHRlbnRzLnk7CiAgICAgfQotICByZXR1cm4gZXh0ZW50cy54T2ZmOworICByZXR1cm4gZXh0 ZW50cy54T2ZmICsgY2prX3BhZGRpbmc7CiB9CiAKIHN0YXRpYyBYZnREcmF3ICoKQEAgLTY2 NCw5ICs3NDcsMjkgQEAKICAgICBmb3IgKGkgPSAwOyBpIDwgbGVuOyBpKyspCiAgICAgICBY ZnREcmF3R2x5cGhzICh4ZnRfZHJhdywgJmZnLCB4ZnRmb250X2luZm8tPnhmdGZvbnQsCiAJ CSAgICAgeCArIGksIHksIGNvZGUgKyBpLCAxKTsKLSAgZWxzZQotICAgIFhmdERyYXdHbHlw aHMgKHhmdF9kcmF3LCAmZmcsIHhmdGZvbnRfaW5mby0+eGZ0Zm9udCwKLQkJICAgeCwgeSwg Y29kZSwgbGVuKTsKKyAgZWxzZSB7CisgICAgICBpZigheGZ0Zm9udF9pbmZvLT5pc19jamsp CisgICAgICAgIFhmdERyYXdHbHlwaHMgKHhmdF9kcmF3LCAmZmcsIHhmdGZvbnRfaW5mby0+ eGZ0Zm9udCwgeCwgeSwgY29kZSwgbGVuKTsKKyAgICAgIGVsc2UgeyAKKyAgICAgICAgIC8q IGRyYXcgQ0pLIGdseXBocyBvbmUgYnkgb25lIGFuZCBhZGp1c3QgdGhlIG9mZnNldCAqLwor ICAgICAgICAgaW50IGRlZmF1bHRfd2lkdGggPSB4ZnRmb250X2dldF9kZWZhdWx0X3dpZHRo KHhmdGZvbnRfaW5mby0+ZnJhbWUpOworICAgICAgICAgZm9yIChpID0gMDsgaSA8IGxlbjsg aSsrKSB7CisgICAgICAgICAgIGludCBjamtfcGFkZGluZyA9IDA7CisgICAgICAgICAgIGlu dCBvZmZzZXQgPSAwOworICAgICAgICAgICBpbnQgaGFsZl93aWR0aF9jamsgPSAwOworICAg ICAgICAgICBYR2x5cGhJbmZvIGV4dGVudHM7CisgICAgICAgICAgIFhmdEdseXBoRXh0ZW50 cyAoeGZ0Zm9udF9pbmZvLT5kaXNwbGF5LCB4ZnRmb250X2luZm8tPnhmdGZvbnQsIGNvZGUr aSwgMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZXh0ZW50cyk7CisgICAgICAg ICAgIGNqa19wYWRkaW5nID0geGZ0Zm9udF9nZXRfY2prX3BhZGRpbmcoZGVmYXVsdF93aWR0 aCxleHRlbnRzLnhPZmYsICZoYWxmX3dpZHRoX2Nqayk7CisgICAgICAgICAgIGlmKGNqa19w YWRkaW5nKSAKKyAgICAgICAgICAgICBvZmZzZXQgPSBkZWZhdWx0X3dpZHRoICogaSAqICho YWxmX3dpZHRoX2NqayA/IDEgOiAyKSArIChjamtfcGFkZGluZz4+MSk7CisgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICBvZmZzZXQgPSBleHRlbnRzLnhPZmYgKiBpOyAKKyAgICAg ICAgICAgWGZ0RHJhd0dseXBocyAoeGZ0X2RyYXcsICZmZywgeGZ0Zm9udF9pbmZvLT54ZnRm b250LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHgrb2Zmc2V0LCB5LCBjb2RlK2ks IDEpOworICAgICAgICAgfQorICAgICAgfQorICB9CiAgIFVOQkxPQ0tfSU5QVVQ7CiAKICAg cmV0dXJuIGxlbjsK --------------060907040906060304000701--