38758 2010-05-07 09:37:21 -0700 [gtk] web fonts not loaded properly in scribd html5 reader 2010-06-23 11:55:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://www.scribd.com/documents/30964170/Scribd-in-HTML5 Gtk P2 Normal --- 0 jonathon webkit-unassigned gustavo krit webkit.review.bot oldest_to_newest 222431 0 jonathon 2010-05-07 09:37:21 -0700 visit http://www.scribd.com/documents/30964170/Scribd-in-HTML5, and read the document in the html5 reader. the fonts are all mis-placed and not being displayed correctly due to not loading the web fonts appropriately 224000 1 55715 gustavo 2010-05-11 10:34:58 -0700 Created attachment 55715 a small test case I am tyring to use to reproduce the problem 229075 2 gustavo 2010-05-21 13:47:57 -0700 There are two issues here. First, WebKitGTK+ does not even try to download the fonts - it always thinks it has the 'â' font that is specified by scribd as the prefferred local font. I have a fix for this. Even after getting WebKitGTK+ to actually download the fonts, they are not being applied, though. 229077 3 56741 gustavo 2010-05-21 13:51:26 -0700 Created attachment 56741 proposed fix 229081 4 webkit.review.bot 2010-05-21 13:54:08 -0700 Attachment 56741 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/graphics/cairo/FontCacheCairo.cpp:106: Use 0 instead of NULL. [readability/null] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 229247 5 56741 xan.lopez 2010-05-22 01:49:30 -0700 Comment on attachment 56741 proposed fix I suppose this is very difficult to test without pixel tests? Looks good to me in any case, assuming we don't regress somewhere else :) r=me with the style nit fixed. 229854 6 56913 gustavo 2010-05-24 12:42:08 -0700 Created attachment 56913 second try After running all the tests I found a number of cases where we would have to regenerate results, and even a few failures caused by changes in the sizes of fonts (the new code would fallback all the way to Times New Roman, instead of matching with FC immediately, as was done before). What this means is essentially adding more special cases, for well-known font names the tests expect. I decided to not do that for the japanese font names, though, since the test result is a passing result, I decided to just generate a new result. 232686 7 56913 xan.lopez 2010-06-01 05:05:51 -0700 Comment on attachment 56913 second try >+ // Handle generic family types specially, because fontconfig does not know them, but we have >+ // code to fallback correctly in our platform data implementation. Times New Roman is treated >+ // specially, as it is used as last fallback. >+ if (!family.length() || family.startsWith("-webkit-") >+ || (fontDescription.genericFamily() != FontDescription::NoFamily) >+ || isWellKnownFontName(family) || (family == "Times New Roman")) >+ return new FontPlatformData(fontDescription, family); Not sure if it makes sense to not have Time News Roman in the well known list at this point. >+ >+ // First check the font exists. >+ CString familyNameString = family.string().utf8(); >+ const char* fcfamily = familyNameString.data(); >+ >+ FcPattern* pattern = FcPatternCreate(); >+ if (!FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast<const FcChar8*>(fcfamily))) { >+ FcPatternDestroy(pattern); >+ return 0; >+ } >+ >+ FcConfigSubstitute(0, pattern, FcMatchPattern); >+ FcDefaultSubstitute(pattern); >+ >+ FcObjectSet* objectSet = FcObjectSetCreate(); >+ if (!FcObjectSetAdd(objectSet, FC_FAMILY)) { >+ FcPatternDestroy(pattern); >+ FcObjectSetDestroy(objectSet); >+ return 0; >+ } >+ >+ FcFontSet* fontSet = FcFontList(0, pattern, objectSet); >+ FcPatternDestroy(pattern); >+ FcObjectSetDestroy(objectSet); >+ >+ if (!fontSet) >+ return 0; >+ >+ if (!fontSet->fonts) { >+ FcFontSetDestroy(fontSet); >+ return 0; >+ } >+ >+ FcFontSetDestroy(fontSet); >+ > return new FontPlatformData(fontDescription, family); Most of the code here is just freeing a couple of data structures all the time, guess we should just use GOwnPtr. Looks good other than that. 232741 8 57542 gustavo 2010-06-01 07:36:18 -0700 Created attachment 57542 third time is the charm Address Xan's comments - added GOwnPtr infrastructure for Fc types, and moved Times New Roman to the well known font name handling. 233152 9 56741 eric 2010-06-02 02:25:33 -0700 Comment on attachment 56741 proposed fix Cleared Xan Lopez's review+ from obsolete attachment 56741 so that this bug does not appear in http://webkit.org/pending-commit. 235030 10 gustavo 2010-06-07 14:15:12 -0700 Landed as r60793. 235253 11 gustavo 2010-06-08 07:55:19 -0700 Oops, this bug should remain open - we only fixed the first problem. 235254 12 57542 gustavo 2010-06-08 07:56:06 -0700 Comment on attachment 57542 third time is the charm Clearing review flag. 238115 13 58720 gustavo 2010-06-14 15:57:13 -0700 Created attachment 58720 special-case mono and sans as well Shaun complained that yelp started using a serif font even though he was specifying 'sans'. The problem is this alias is not being special-cased. 238116 14 58720 gustavo 2010-06-14 15:57:31 -0700 Comment on attachment 58720 special-case mono and sans as well doh 238379 15 58776 gustavo 2010-06-15 07:43:14 -0700 Created attachment 58776 remove restrictions from font matching Trying the new code with a few new fonts, I noticed it was not matching them. Playing around with a test program I found that the default substitutions end up being too restrictive, and are not required to exclude fonts that do not exist, so this patch removes those. 241825 16 58720 xan.lopez 2010-06-23 06:45:59 -0700 Comment on attachment 58720 special-case mono and sans as well OK. 241830 17 58776 xan.lopez 2010-06-23 06:53:33 -0700 Comment on attachment 58776 remove restrictions from font matching OK, fc is weird. 241965 18 58720 gustavo 2010-06-23 11:25:57 -0700 Comment on attachment 58720 special-case mono and sans as well Landed as r61701. 241988 19 58776 gustavo 2010-06-23 11:42:30 -0700 Comment on attachment 58776 remove restrictions from font matching Clearing flags on attachment: 58776 Committed r61703: <http://trac.webkit.org/changeset/61703> 241989 20 gustavo 2010-06-23 11:42:41 -0700 All reviewed patches have been landed. Closing bug. 241993 21 gustavo 2010-06-23 11:47:26 -0700 I'll open a different bug to track the other problem, I'll post the URL here. 242003 22 gustavo 2010-06-23 11:55:31 -0700 https://bugs.webkit.org/show_bug.cgi?id=41091 55715 2010-05-11 10:34:58 -0700 2010-05-11 10:34:58 -0700 a small test case I am tyring to use to reproduce the problem test.html text/html 445 gustavo PGh0bWw+CjxoZWFkPgo8L2hlYWQ+CjxzdHlsZT4KQGZvbnQtZmFjZSB7IHNyYzogdXJsKGh0dHA6 Ly9mb250czIuc2NyaWJkYXNzZXRzLmNvbS9qd3NvODIwamF0NHZ0ZHMvZm9udHMvMDAwNy5lb3Qp OyBzcmM6IHVybChodHRwOi8vZm9udHMzLnNjcmliZGFzc2V0cy5jb20vandzbzgyMGphdDR2dGRz L2ZvbnRzLzAwMDcudHRmKSBmb3JtYXQodHJ1ZXR5cGUpLCB1cmwoaHR0cDovL2ZvbnRzNC5zY3Jp YmRhc3NldHMuY29tL2p3c284MjBqYXQ0dnRkcy9mb250cy8wMDA3LnN2ZyNmb250KSBmb3JtYXQo c3ZnKTsgZm9udC1mYW1pbHk6IGZmNzsgfQpkaXYuZmY3IHsKcG9zaXRpb246IGFic29sdXRlOwp0 b3A6IDIwMHB4Owpmb250LWZhbWlseTogZmY3Owp9Cjwvc3R5bGU+Cjxib2R5Pgo8ZGl2IGNsYXNz PSJmZjciPlRpdGxlIGNvbWVzIGhlcmU8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg== 56741 2010-05-21 13:51:26 -0700 2010-06-02 02:25:33 -0700 proposed fix 0001-Make-WebKitGTK-actually-download-fonts-when-the-loca.patch text/plain 3515 gustavo RnJvbSA0ODUzNjA4Y2M0YjM0YTNmNzJhNzVmZjBhNTMwMDE0MjQ2MmUwNmU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgMjEgTWF5IDIwMTAgMTc6NTA6MzYgLTAzMDAKU3ViamVjdDogW1BBVENIXSBN YWtlIFdlYktpdEdUSysgYWN0dWFsbHkgZG93bmxvYWQgZm9udHMsIHdoZW4gdGhlIGxvY2FsIGZv bnQgaXMgbm90IGZvdW5kCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcCB8ICAgNDQgKysrKysrKysrKysrKysrKysrKysKIDIg ZmlsZXMgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAzNzJlYmIu LjM1OTU5N2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDUtMjEgIEd1c3Rhdm8gTm9yb25oYSBTaWx2 YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2d0a10gd2ViIGZvbnRzIG5vdCBsb2FkZWQg cHJvcGVybHkgaW4gc2NyaWJkIGh0bWw1IHJlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg3NTgKKworICAgICAgICBBdm9pZCBhbHdheXMgZ2l2 aW5nIGEgcG9zaXRpdmUgcmVwbHkgaW4gY3JlYXRlRm9udFBsYXRmb3JtRGF0YS4gV2UKKyAgICAg ICAgZG8gbm90IHdhbnQgZXZlcnkgbm9uLWV4aXN0aW5nIGZhbWlseSBuYW1lIHRvIGJlIGNvbnNp ZGVyZWQgYSBoaXQsCisgICAgICAgIG9yIHdlaXJkIHVzYWdlIG9mIGxvY2FsIHNvdXJjZXMgaW4g QGZvbnQtZmFjZSBydWxlcyB3aWxsIG1ha2UKKyAgICAgICAgV2ViS2l0R1RLKyBuZXZlciBjb25z aWRlciB0aGUgb25saW5lIGZvbnRzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vRm9udENhY2hlQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpjcmVh dGVGb250UGxhdGZvcm1EYXRhKToKKwogMjAxMC0wNS0xNSAgQWRhbSBSb2JlbiAgPGFyb2JlbkBh cHBsZS5jb20+CiAKICAgICAgICAgUGVyaW9kaWNhbGx5IHRyeSB0byByZXNldCBhIGxvc3QgSURp cmVjdDNERGV2aWNlOSB1bnRpbCB3ZSBzdWNjZWVkCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwCmluZGV4IDc5YjMyYjQuLmY4MGM1YTUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fp cm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fp cm8uY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi Rm9udENhY2hlLmgiCiAKKyNpbmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiRm9udC5oIgog I2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4K QEAgLTgzLDYgKzg0LDQ5IEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWlseShjb25z dCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUsIFZlY3Rvcjx1bnNpZ25lCiAKIEZvbnRQbGF0Zm9y bURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCiB7Cisg ICAgLy8gSGFuZGxlIGdlbmVyaWMgZmFtaWx5IHR5cGVzIHNwZWNpYWxseSwgYmVjYXVzZSBmb250 Y29uZmlnIGRvZXMgbm90IGtub3cgdGhlbSwgYnV0IHdlIGhhdmUKKyAgICAvLyBjb2RlIHRvIGZh bGxiYWNrIGNvcnJlY3RseSBpbiBvdXIgcGxhdGZvcm0gZGF0YSBpbXBsZW1lbnRhdGlvbi4gVGlt ZXMgTmV3IFJvbWFuIGlzIHRyZWF0ZWQKKyAgICAvLyBzcGVjaWFsbHksIGFzIGl0IGlzIHVzZWQg YXMgbGFzdCBmYWxsYmFjay4KKyAgICBpZiAoIWZhbWlseS5sZW5ndGgoKSB8fCBmYW1pbHkuc3Rh cnRzV2l0aCgiLXdlYmtpdC0iKQorICAgICAgICB8fCAoZm9udERlc2NyaXB0aW9uLmdlbmVyaWNG YW1pbHkoKSAhPSBGb250RGVzY3JpcHRpb246Ok5vRmFtaWx5KQorICAgICAgICB8fCAoZmFtaWx5 ID09ICJUaW1lcyBOZXcgUm9tYW4iKSkgeworICAgICAgICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9y bURhdGEoZm9udERlc2NyaXB0aW9uLCBmYW1pbHkpOworICAgIH0KKworICAgIC8vIEZpcnN0IGNo ZWNrIHRoZSBmb250IGV4aXN0cy4KKyAgICBDU3RyaW5nIGZhbWlseU5hbWVTdHJpbmcgPSBmYW1p bHkuc3RyaW5nKCkudXRmOCgpOworICAgIGNvbnN0IGNoYXIqIGZjZmFtaWx5ID0gZmFtaWx5TmFt ZVN0cmluZy5kYXRhKCk7CisKKyAgICBGY1BhdHRlcm4qIHBhdHRlcm4gPSBGY1BhdHRlcm5DcmVh dGUoKTsKKyAgICBpZiAoIUZjUGF0dGVybkFkZFN0cmluZyhwYXR0ZXJuLCBGQ19GQU1JTFksIHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZjZmFtaWx5KSkpIHsKKyAgICAgICAgRmNQ YXR0ZXJuRGVzdHJveShwYXR0ZXJuKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAg RmNDb25maWdTdWJzdGl0dXRlKE5VTEwsIHBhdHRlcm4sIEZjTWF0Y2hQYXR0ZXJuKTsKKyAgICBG Y0RlZmF1bHRTdWJzdGl0dXRlKHBhdHRlcm4pOworCisgICAgRmNPYmplY3RTZXQqIG9iamVjdFNl dCA9IEZjT2JqZWN0U2V0Q3JlYXRlKCk7CisgICAgaWYgKCFGY09iamVjdFNldEFkZChvYmplY3RT ZXQsIEZDX0ZBTUlMWSkpIHsKKyAgICAgICAgRmNQYXR0ZXJuRGVzdHJveShwYXR0ZXJuKTsKKyAg ICAgICAgRmNPYmplY3RTZXREZXN0cm95KG9iamVjdFNldCk7CisgICAgICAgIHJldHVybiAwOwor ICAgIH0KKworICAgIEZjRm9udFNldCogZm9udFNldCA9IEZjRm9udExpc3QoMCwgcGF0dGVybiwg b2JqZWN0U2V0KTsKKyAgICBGY1BhdHRlcm5EZXN0cm95KHBhdHRlcm4pOworICAgIEZjT2JqZWN0 U2V0RGVzdHJveShvYmplY3RTZXQpOworCisgICAgaWYgKCFmb250U2V0KQorICAgICAgICByZXR1 cm4gMDsKKworICAgIGlmICghZm9udFNldC0+Zm9udHMpIHsKKyAgICAgICAgRmNGb250U2V0RGVz dHJveShmb250U2V0KTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAgRmNGb250U2V0 RGVzdHJveShmb250U2V0KTsKKwogICAgIHJldHVybiBuZXcgRm9udFBsYXRmb3JtRGF0YShmb250 RGVzY3JpcHRpb24sIGZhbWlseSk7CiB9CiAKLS0gCjEuNy4xCgo= 56913 2010-05-24 12:42:08 -0700 2010-06-01 07:36:18 -0700 second try 0001-Make-WebKitGTK-actually-download-fonts-when-the-loca.patch text/plain 11430 gustavo RnJvbSBlNGFmYjYyODVhNzVmZTYzMDQzMzVkZWMxNDNlNjY5MmU4MjkwYjUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgMjEgTWF5IDIwMTAgMTc6NTA6MzYgLTAzMDAKU3ViamVjdDogW1BBVENIXSBN YWtlIFdlYktpdEdUSysgYWN0dWFsbHkgZG93bmxvYWQgZm9udHMsIHdoZW4gdGhlIGxvY2FsIGZv bnQgaXMgbm90IGZvdW5kCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxMiArKysKIC4uLi9mYXN0L3RleHQvYmFja3NsYXNoLXRvLXll bi1zaWduLWV4cGVjdGVkLnR4dCAgIHwgICA4MyArKysrKysrKystLS0tLS0tLS0tLQogV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysK IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwIHwgICA1 OSArKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxMjQgaW5zZXJ0aW9ucygrKSwgNDYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRjNjgwZTIuLjczMzhlN2UgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMC0wNS0yNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3Jvbmhh QGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbZ3RrXSB3ZWIgZm9udHMgbm90IGxvYWRlZCBwcm9wZXJseSBpbiBzY3JpYmQg aHRtbDUgcmVhZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zODc1OAorCisgICAgICAgIFJlc2V0IGV4cGVjdGVkIHJlc3VsdCBmb3IgdGVzdCB0aGF0 IHVzZXMgZm9udHMgd2UgZG8gbm90IHJlYWxseQorICAgICAgICBzdXBwb3J0LCBhbmQgYXJlIG5v dCAid2ViIGZvbnRzIi4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9mYXN0L3RleHQvYmFja3Ns YXNoLXRvLXllbi1zaWduLWV4cGVjdGVkLnR4dDoKKwogMjAxMC0wNS0yNCAgSmVyZW15IE9ybG93 ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiAgRm9yZ290IHRv IHJlZG8gdGhlIGV4cGVjdGF0aW9uIGFmdGVyIGFkZGluZyB0aGUgY29udGFpbnMKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L3RleHQvYmFja3NsYXNoLXRvLXllbi1z aWduLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L3RleHQvYmFj a3NsYXNoLXRvLXllbi1zaWduLWV4cGVjdGVkLnR4dAppbmRleCAzMDJkYzAzLi45OTQ4ZjU1IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC90ZXh0L2JhY2tzbGFzaC10 by15ZW4tc2lnbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zh c3QvdGV4dC9iYWNrc2xhc2gtdG8teWVuLXNpZ24tZXhwZWN0ZWQudHh0CkBAIC0xLDUzICsxLDQ0 IEBACiBsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKICAgUmVuZGVyVmlldyBhdCAoMCwwKSBz aXplIDgwMHg2MDAKLWxheWVyIGF0ICgwLDApIHNpemUgODAweDM5NgotICBSZW5kZXJCbG9jayB7 SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4Mzk2Ci0gICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgs OCkgc2l6ZSA3ODR4MzgwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHgyNzYKKyAgUmVuZGVyQmxv Y2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDI3NgorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0 ICg4LDgpIHNpemUgNzg0eDI2MAogICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6 ZSA3ODR4MjAKICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzEzeDIw CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzEzOiAiTm8gZm9udCBpcyBzcGVj aWZpZWQuIGV4cGVjdGVkOiBiYWNrc2xhc2gsIGFjdHVhbDogXFwiCi0gICAgICBSZW5kZXJCbG9j ayB7RElWfSBhdCAoMCwyMCkgc2l6ZSA3ODR4MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9 IGF0ICgwLDApIHNpemUgNzA0eDM0Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg NzA0OiAiVXNpbmcgZm9udCBcIk1TIFBHb3RoaWNcIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCIKLSAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggMTQ0OiAiYWN0dWFsOiBceHtBNX0iCi0g ICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw1NCkgc2l6ZSA3ODR4MzQKLSAgICAgICAgUmVu ZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNjg4eDM0Ci0gICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggNjg4OiAiVXNpbmcgZm9udCBcIk1TIEdvdGhpY1wiLiBleHBlY3RlZDog eWVuIHNpZ24sIgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNDQ6ICJhY3R1 YWw6IFx4e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDg4KSBzaXplIDc4NHgz NAotICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA3MDR4MzQKLSAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA3MDQ6ICJVc2luZyBmb250IFwiTVMgUE1pbmNo b1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3 aWR0aCAxNDQ6ICJhY3R1YWw6IFx4e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDEyMikgc2l6ZSA3ODR4MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNp emUgNjg4eDM0Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNjg4OiAiVXNpbmcg Zm9udCBcIk1TIE1pbmNob1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIgotICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDE3KSB3aWR0aCAxNDQ6ICJhY3R1YWw6IFx4e0E1fSIKLSAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgwLDE1Nikgc2l6ZSA3ODR4MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLDApIHNpemUgNzY4eDM0Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lk dGggNzY4OiAiVXNpbmcgZm9udCBcIk1laXJ5b1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVh bDoiCi0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDE2OiAiXHh7QTV9IgotICAg ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMTkwKSBzaXplIDc4NHgzNAotICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA2NzJ4MzQKLSAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCA2NzI6ICJVc2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHtGRjMw fVx4ezMwQjR9XHh7MzBCN31ceHszMEMzfVx4ezMwQUZ9XCIuIGV4cGVjdGVkOiB5ZW4gc2lnbiwi Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDE0NDogImFjdHVhbDogXHh7QTV9 IgotICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjI0KSBzaXplIDc4NHgzNAotICAgICAg ICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA3ODR4MzQKLSAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMCwwKSB3aWR0aCA3ODQ6ICJVc2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBc eHszMEI0fVx4ezMwQjd9XHh7MzBDM31ceHszMEFGfVwiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFj dHVhbDoiCi0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDE2OiAiXHh7QTV9Igot ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjU4KSBzaXplIDc4NHgzNAotICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA3Njh4MzQKLSAgICAgICAgICB0ZXh0IHJ1 biBhdCAoMCwwKSB3aWR0aCA3Njg6ICJVc2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHtG RjMwfVx4ezY2MEV9XHh7NjcxRH1cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IgotICAg ICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNjogIlx4e0E1fSIKLSAgICAgIFJlbmRl ckJsb2NrIHtESVZ9IGF0ICgwLDI5Mikgc2l6ZSA3ODR4MTcKLSAgICAgICAgUmVuZGVyVGV4dCB7 I3RleHR9IGF0ICgwLDApIHNpemUgNzg0eDE3Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkg d2lkdGggNzg0OiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9XHh7RkYzM30gXHh7NjYwRX1ceHs2NzFE fVwiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgotICAgICAgUmVuZGVyQmxv Y2sge0RJVn0gYXQgKDAsMzA5KSBzaXplIDc4NHgxNwotICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDAsMCkgc2l6ZSA3Njh4MTcKLSAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0 aCA3Njg6ICJVc2luZyBmb250IFwiXHh7MzBFMX1ceHszMEE0fVx4ezMwRUF9XHh7MzBBQX1cIi4g ZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtE SVZ9IGF0ICgwLDMyNikgc2l6ZSA3ODR4MjAKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDIwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6 ZSAzNTB4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNTA6ICJVc2luZyBm b250IFwiTVMgUEdvdGhpY1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9Igor ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNDApIHNpemUgNzg0eDIwCisgICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM0MXgyMAorICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDM0MTogIlVzaW5nIGZvbnQgXCJNUyBHb3RoaWNcIi4gZXhwZWN0ZWQ6 IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDYwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6 ZSAzNTZ4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNTY6ICJVc2luZyBm b250IFwiTVMgUE1pbmNob1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9Igor ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsODApIHNpemUgNzg0eDIwCisgICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM0N3gyMAorICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDM0NzogIlVzaW5nIGZvbnQgXCJNUyBNaW5jaG9cIi4gZXhwZWN0ZWQ6 IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDEwMCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNp emUgMzE3eDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzE3OiAiVXNpbmcg Zm9udCBcIk1laXJ5b1wiLiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAg ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMTIwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzMDN4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCAzMDM6ICJVc2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHtGRjMw fVx4ezMwQjR9XHh7MzBCN31ceHszMEMzfVx4ezMwQUZ9XCIuIGV4cGVjdGVkOiB5ZW4gc2lnbiwg YWN0dWFsOiBceHtBNX0iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwxNDApIHNpemUg Nzg0eDIwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDI5OXgyMAor ICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI5OTogIlVzaW5nIGZvbnQgXCJceHtG RjJEfVx4e0ZGMzN9IFx4ezMwQjR9XHh7MzBCN31ceHszMEMzfVx4ezMwQUZ9XCIuIGV4cGVjdGVk OiB5ZW4gc2lnbiwgYWN0dWFsOiBceHtBNX0iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAo MCwxNjApIHNpemUgNzg0eDIwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBz aXplIDI5NXgyMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI5NTogIlVzaW5n IGZvbnQgXCJceHtGRjJEfVx4e0ZGMzN9IFx4e0ZGMzB9XHh7NjYwRX1ceHs2NzFEfVwiLiBleHBl Y3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAgICAgUmVuZGVyQmxvY2sge0RJVn0g YXQgKDAsMTgwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAs MCkgc2l6ZSAyOTF4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyOTE6ICJV c2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHs2NjBFfVx4ezY3MUR9XCIuIGV4cGVjdGVk OiB5ZW4gc2lnbiwgYWN0dWFsOiBceHtBNX0iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAo MCwyMDApIHNpemUgNzg0eDIwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBz aXplIDI4N3gyMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI4NzogIlVzaW5n IGZvbnQgXCJceHszMEUxfVx4ezMwQTR9XHh7MzBFQX1ceHszMEFBfVwiLiBleHBlY3RlZDogeWVu IHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjIw KSBzaXplIDc4NHgyMAogICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAz MTR4MjAKICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMTQ6ICJVc2luZyBmb250 IFwiVGltZXNcIi4gZXhwZWN0ZWQ6IGJhY2tzbGFzaCwgYWN0dWFsOiBcXCIKLSAgICAgIFJlbmRl ckJsb2NrIHtESVZ9IGF0ICgwLDM0Nikgc2l6ZSA3ODR4MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7 I3RleHR9IGF0ICgwLDApIHNpemUgNzg0eDM0Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkg d2lkdGggNzg0OiAiVXNpbmcgZm9udCBcImZvb2JhclwiLiBleHBlY3RlZDogYmFja3NsYXNoLCBh Y3R1YWw6IgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNjogIlxcIgorICAg ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjQwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzMTZ4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCAzMTY6ICJVc2luZyBmb250IFwiZm9vYmFyXCIuIGV4cGVjdGVkOiBiYWNr c2xhc2gsIGFjdHVhbDogXFwiCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDM2MjliNTcuLmIwOThiNTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAt MDUtMjQgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEu Y28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W2d0a10gd2ViIGZvbnRzIG5vdCBsb2FkZWQgcHJvcGVybHkgaW4gc2NyaWJkIGh0bWw1IHJlYWRl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg3NTgK KworICAgICAgICBBdm9pZCBhbHdheXMgZ2l2aW5nIGEgcG9zaXRpdmUgcmVwbHkgaW4gY3JlYXRl Rm9udFBsYXRmb3JtRGF0YS4gV2UKKyAgICAgICAgZG8gbm90IHdhbnQgZXZlcnkgbm9uLWV4aXN0 aW5nIGZhbWlseSBuYW1lIHRvIGJlIGNvbnNpZGVyZWQgYSBoaXQsCisgICAgICAgIG9yIHdlaXJk IHVzYWdlIG9mIGxvY2FsIHNvdXJjZXMgaW4gQGZvbnQtZmFjZSBydWxlcyB3aWxsIG1ha2UKKyAg ICAgICAgV2ViS2l0R1RLKyBuZXZlciBjb25zaWRlciB0aGUgb25saW5lIGZvbnRzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6aXNXZWxsS25vd25Gb250TmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpGb250 Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDEwLTA1LTI0ICBKZXJlbXkgT3Js b3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuICBDaGVja2Vk IGluIG1lcmdlIGVycm9yLiAgOi0oCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwCmluZGV4IDc5YjMyYjQuLjM5YTIwZmMgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwCkBA IC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRm9udENhY2hl LmgiCiAKKyNpbmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiRm9udC5oIgogI2luY2x1ZGUg IlNpbXBsZUZvbnREYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KQEAgLTgxLDgg KzgyLDY2IEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWlseShjb25zdCBBdG9taWNT dHJpbmcmIGZhbWlseU5hbWUsIFZlY3Rvcjx1bnNpZ25lCiB7CiB9CiAKK3N0YXRpYyBib29sIGlz V2VsbEtub3duRm9udE5hbWUoY29uc3QgQXRvbWljU3RyaW5nIGZhbWlseSkKK3sKKyAgICAvLyBG b250cyB0aGF0IGFyZSB1c2VkIGJ5IGxheW91dCB0ZXN0cyBpbmNsdWRlZC4gVGhlIGZhY3QgdGhh dAorICAgIC8vIHRoZXkgYXJlIHVzZWQgaW4gTGF5b3V0IFRlc3RzIGluZGljYXRlIHdlYiBjb21w YXRpYmlsaXR5IGlzc3VlcworICAgIC8vIGlmIHdlIGRvIG5vdCBoYW5kbGUgdGhlbSBjb3JyZWN0 bHkuCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgInNhbnMtc2VyaWYiKSB8fCBl cXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJzZXJpZiIpCisgICAgICAgIHx8IGVxdWFsSWdub3Jp bmdDYXNlKGZhbWlseSwgIm1vbm9zcGFjZSIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwg ImN1cnNpdmUiKQorICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJmYW50YXN5 IikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAiVGltZXMiKQorICAgICAgICB8fCBlcXVh bElnbm9yaW5nQ2FzZShmYW1pbHksICJDb3VyaWVyIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFt aWx5LCAiSGVsdmV0aWNhIikKKyAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAi QXJpYWwiKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJMdWNpZGEgR3JhbmRlIikKKyAg ICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAiQWhlbSIpIHx8IGVxdWFsSWdub3Jp bmdDYXNlKGZhbWlseSwgIkdlb3JnaWEiKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBy ZXR1cm4gZmFsc2U7Cit9CisKIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9u dFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29u c3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCiB7CisgICAgLy8gSGFuZGxlIGdlbmVyaWMgZmFtaWx5 IHR5cGVzIHNwZWNpYWxseSwgYmVjYXVzZSBmb250Y29uZmlnIGRvZXMgbm90IGtub3cgdGhlbSwg YnV0IHdlIGhhdmUKKyAgICAvLyBjb2RlIHRvIGZhbGxiYWNrIGNvcnJlY3RseSBpbiBvdXIgcGxh dGZvcm0gZGF0YSBpbXBsZW1lbnRhdGlvbi4gVGltZXMgTmV3IFJvbWFuIGlzIHRyZWF0ZWQKKyAg ICAvLyBzcGVjaWFsbHksIGFzIGl0IGlzIHVzZWQgYXMgbGFzdCBmYWxsYmFjay4KKyAgICBpZiAo IWZhbWlseS5sZW5ndGgoKSB8fCBmYW1pbHkuc3RhcnRzV2l0aCgiLXdlYmtpdC0iKQorICAgICAg ICB8fCAoZm9udERlc2NyaXB0aW9uLmdlbmVyaWNGYW1pbHkoKSAhPSBGb250RGVzY3JpcHRpb246 Ok5vRmFtaWx5KQorICAgICAgICB8fCBpc1dlbGxLbm93bkZvbnROYW1lKGZhbWlseSkgfHwgKGZh bWlseSA9PSAiVGltZXMgTmV3IFJvbWFuIikpCisgICAgICAgIHJldHVybiBuZXcgRm9udFBsYXRm b3JtRGF0YShmb250RGVzY3JpcHRpb24sIGZhbWlseSk7CisKKyAgICAvLyBGaXJzdCBjaGVjayB0 aGUgZm9udCBleGlzdHMuCisgICAgQ1N0cmluZyBmYW1pbHlOYW1lU3RyaW5nID0gZmFtaWx5LnN0 cmluZygpLnV0ZjgoKTsKKyAgICBjb25zdCBjaGFyKiBmY2ZhbWlseSA9IGZhbWlseU5hbWVTdHJp bmcuZGF0YSgpOworCisgICAgRmNQYXR0ZXJuKiBwYXR0ZXJuID0gRmNQYXR0ZXJuQ3JlYXRlKCk7 CisgICAgaWYgKCFGY1BhdHRlcm5BZGRTdHJpbmcocGF0dGVybiwgRkNfRkFNSUxZLCByZWludGVy cHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgqPihmY2ZhbWlseSkpKSB7CisgICAgICAgIEZjUGF0dGVy bkRlc3Ryb3kocGF0dGVybik7CisgICAgICAgIHJldHVybiAwOworICAgIH0KKworICAgIEZjQ29u ZmlnU3Vic3RpdHV0ZSgwLCBwYXR0ZXJuLCBGY01hdGNoUGF0dGVybik7CisgICAgRmNEZWZhdWx0 U3Vic3RpdHV0ZShwYXR0ZXJuKTsKKworICAgIEZjT2JqZWN0U2V0KiBvYmplY3RTZXQgPSBGY09i amVjdFNldENyZWF0ZSgpOworICAgIGlmICghRmNPYmplY3RTZXRBZGQob2JqZWN0U2V0LCBGQ19G QU1JTFkpKSB7CisgICAgICAgIEZjUGF0dGVybkRlc3Ryb3kocGF0dGVybik7CisgICAgICAgIEZj T2JqZWN0U2V0RGVzdHJveShvYmplY3RTZXQpOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisK KyAgICBGY0ZvbnRTZXQqIGZvbnRTZXQgPSBGY0ZvbnRMaXN0KDAsIHBhdHRlcm4sIG9iamVjdFNl dCk7CisgICAgRmNQYXR0ZXJuRGVzdHJveShwYXR0ZXJuKTsKKyAgICBGY09iamVjdFNldERlc3Ry b3kob2JqZWN0U2V0KTsKKworICAgIGlmICghZm9udFNldCkKKyAgICAgICAgcmV0dXJuIDA7CisK KyAgICBpZiAoIWZvbnRTZXQtPmZvbnRzKSB7CisgICAgICAgIEZjRm9udFNldERlc3Ryb3koZm9u dFNldCk7CisgICAgICAgIHJldHVybiAwOworICAgIH0KKworICAgIEZjRm9udFNldERlc3Ryb3ko Zm9udFNldCk7CisKICAgICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0 aW9uLCBmYW1pbHkpOwogfQogCi0tIAoxLjcuMQoK 57542 2010-06-01 07:36:18 -0700 2010-06-15 07:43:35 -0700 third time is the charm 0001-Make-WebKitGTK-actually-download-fonts-when-the-loca.patch text/plain 15545 gustavo RnJvbSA5N2E4MTgwZjliNWZjNDg5ZGJlNmQ2YzExNzU4ZjYxZWE4Y2YzMTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgMjEgTWF5IDIwMTAgMTc6NTA6MzYgLTAzMDAKU3ViamVjdDogW1BBVENIXSBN YWtlIFdlYktpdEdUSysgYWN0dWFsbHkgZG93bmxvYWQgZm9udHMsIHdoZW4gdGhlIGxvY2FsIGZv bnQgaXMgbm90IGZvdW5kCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxMiArKysKIC4uLi9mYXN0L3RleHQvYmFja3NsYXNoLXRvLXll bi1zaWduLWV4cGVjdGVkLnR4dCAgIHwgICA4MyArKysrKysrKystLS0tLS0tLS0tLQogV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIyICsrKysr CiBXZWJDb3JlL0dOVW1ha2VmaWxlLmFtICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg IDIgKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2FjaGVDYWlyby5jcHAg fCAgIDUxICsrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3du UHRyQ2Fpcm8uY3BwICAgfCAgIDUwICsrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uaCAgICAgfCAgIDQxICsrKysrKysrKysKIDcgZmlsZXMg Y2hhbmdlZCwgMjE1IGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmNwcAog Y3JlYXRlIG1vZGUgMTAwNjQ0IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0 ckNhaXJvLmgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYjAwOTVmNi4uM2I2MDJmYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDEwLTA2LTAxICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29s bGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtndGtdIHdlYiBmb250cyBub3QgbG9hZGVkIHByb3Blcmx5IGluIHNjcmliZCBodG1s NSByZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM4NzU4CisKKyAgICAgICAgUmVzZXQgZXhwZWN0ZWQgcmVzdWx0IGZvciB0ZXN0IHRoYXQgdXNl cyBmb250cyB3ZSBkbyBub3QgcmVhbGx5CisgICAgICAgIHN1cHBvcnQsIGFuZCBhcmUgbm90ICJ3 ZWIgZm9udHMiLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvdGV4dC9iYWNrc2xhc2gt dG8teWVuLXNpZ24tZXhwZWN0ZWQudHh0OgorCiAyMDEwLTA2LTAxICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXou CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC90ZXh0L2JhY2tzbGFz aC10by15ZW4tc2lnbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFz dC90ZXh0L2JhY2tzbGFzaC10by15ZW4tc2lnbi1leHBlY3RlZC50eHQKaW5kZXggMzAyZGMwMy4u OTk0OGY1NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvdGV4dC9i YWNrc2xhc2gtdG8teWVuLXNpZ24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9mYXN0L3RleHQvYmFja3NsYXNoLXRvLXllbi1zaWduLWV4cGVjdGVkLnR4dApAQCAt MSw1MyArMSw0NCBAQAogbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgIFJlbmRlclZpZXcg YXQgKDAsMCkgc2l6ZSA4MDB4NjAwCi1sYXllciBhdCAoMCwwKSBzaXplIDgwMHgzOTYKLSAgUmVu ZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDM5NgotICAgIFJlbmRlckJvZHkge0JP RFl9IGF0ICg4LDgpIHNpemUgNzg0eDM4MAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4Mjc2Cisg IFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHgyNzYKKyAgICBSZW5kZXJCb2R5 IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHgyNjAKICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0 ICgwLDApIHNpemUgNzg0eDIwCiAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBz aXplIDMxM3gyMAogICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDMxMzogIk5vIGZv bnQgaXMgc3BlY2lmaWVkLiBleHBlY3RlZDogYmFja3NsYXNoLCBhY3R1YWw6IFxcIgotICAgICAg UmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjApIHNpemUgNzg0eDM0Ci0gICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDcwNHgzNAotICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDApIHdpZHRoIDcwNDogIlVzaW5nIGZvbnQgXCJNUyBQR290aGljXCIuIGV4cGVjdGVkOiB5ZW4g c2lnbiwiCi0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDE0NDogImFjdHVhbDog XHh7QTV9IgotICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNTQpIHNpemUgNzg0eDM0Ci0g ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDY4OHgzNAotICAgICAgICAg IHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDY4ODogIlVzaW5nIGZvbnQgXCJNUyBHb3RoaWNcIi4g ZXhwZWN0ZWQ6IHllbiBzaWduLCIKLSAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGgg MTQ0OiAiYWN0dWFsOiBceHtBNX0iCi0gICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw4OCkg c2l6ZSA3ODR4MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzA0 eDM0Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzA0OiAiVXNpbmcgZm9udCBc Ik1TIFBNaW5jaG9cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCIKLSAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwxNykgd2lkdGggMTQ0OiAiYWN0dWFsOiBceHtBNX0iCi0gICAgICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMCwxMjIpIHNpemUgNzg0eDM0Ci0gICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDY4OHgzNAotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDY4 ODogIlVzaW5nIGZvbnQgXCJNUyBNaW5jaG9cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCIKLSAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggMTQ0OiAiYWN0dWFsOiBceHtBNX0iCi0gICAg ICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwxNTYpIHNpemUgNzg0eDM0Ci0gICAgICAgIFJlbmRl clRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDc2OHgzNAotICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDApIHdpZHRoIDc2ODogIlVzaW5nIGZvbnQgXCJNZWlyeW9cIi4gZXhwZWN0ZWQ6IHllbiBz aWduLCBhY3R1YWw6IgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNjogIlx4 e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDE5MCkgc2l6ZSA3ODR4MzQKLSAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNjcyeDM0Ci0gICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNjcyOiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9XHh7RkYz M30gXHh7RkYzMH1ceHszMEI0fVx4ezMwQjd9XHh7MzBDM31ceHszMEFGfVwiLiBleHBlY3RlZDog eWVuIHNpZ24sIgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNDQ6ICJhY3R1 YWw6IFx4e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDIyNCkgc2l6ZSA3ODR4 MzQKLSAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzg0eDM0Ci0gICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzg0OiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9 XHh7RkYzM30gXHh7MzBCNH1ceHszMEI3fVx4ezMwQzN9XHh7MzBBRn1cIi4gZXhwZWN0ZWQ6IHll biBzaWduLCBhY3R1YWw6IgotICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE3KSB3aWR0aCAxNjog Ilx4e0E1fSIKLSAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDI1OCkgc2l6ZSA3ODR4MzQK LSAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzY4eDM0Ci0gICAgICAg ICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzY4OiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9XHh7 RkYzM30gXHh7RkYzMH1ceHs2NjBFfVx4ezY3MUR9XCIuIGV4cGVjdGVkOiB5ZW4gc2lnbiwgYWN0 dWFsOiIKLSAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggMTY6ICJceHtBNX0iCi0g ICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwyOTIpIHNpemUgNzg0eDE3Ci0gICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDc4NHgxNwotICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDc4NDogIlVzaW5nIGZvbnQgXCJceHtGRjJEfVx4e0ZGMzN9IFx4ezY2 MEV9XHh7NjcxRH1cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKLSAgICAg IFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDMwOSkgc2l6ZSA3ODR4MTcKLSAgICAgICAgUmVuZGVy VGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzY4eDE3Ci0gICAgICAgICAgdGV4dCBydW4gYXQg KDAsMCkgd2lkdGggNzY4OiAiVXNpbmcgZm9udCBcIlx4ezMwRTF9XHh7MzBBNH1ceHszMEVBfVx4 ezMwQUF9XCIuIGV4cGVjdGVkOiB5ZW4gc2lnbiwgYWN0dWFsOiBceHtBNX0iCi0gICAgICBSZW5k ZXJCbG9jayB7RElWfSBhdCAoMCwzMjYpIHNpemUgNzg0eDIwCisgICAgICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMCwyMCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgwLDApIHNpemUgMzUweDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzUw OiAiVXNpbmcgZm9udCBcIk1TIFBHb3RoaWNcIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6 IFx4e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDQwKSBzaXplIDc4NHgyMAor ICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzNDF4MjAKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNDE6ICJVc2luZyBmb250IFwiTVMgR290aGljXCIu IGV4cGVjdGVkOiB5ZW4gc2lnbiwgYWN0dWFsOiBceHtBNX0iCisgICAgICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMCw2MCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgwLDApIHNpemUgMzU2eDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzU2 OiAiVXNpbmcgZm9udCBcIk1TIFBNaW5jaG9cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6 IFx4e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDgwKSBzaXplIDc4NHgyMAor ICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzNDd4MjAKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNDc6ICJVc2luZyBmb250IFwiTVMgTWluY2hvXCIu IGV4cGVjdGVkOiB5ZW4gc2lnbiwgYWN0dWFsOiBceHtBNX0iCisgICAgICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMCwxMDApIHNpemUgNzg0eDIwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDMxN3gyMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDMx NzogIlVzaW5nIGZvbnQgXCJNZWlyeW9cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IFx4 e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDEyMCkgc2l6ZSA3ODR4MjAKKyAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzAzeDIwCisgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzAzOiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9XHh7RkYz M30gXHh7RkYzMH1ceHszMEI0fVx4ezMwQjd9XHh7MzBDM31ceHszMEFGfVwiLiBleHBlY3RlZDog eWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAs MTQwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6 ZSAyOTl4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyOTk6ICJVc2luZyBm b250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHszMEI0fVx4ezMwQjd9XHh7MzBDM31ceHszMEFGfVwi LiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAgICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDAsMTYwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAyOTV4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAy OTU6ICJVc2luZyBmb250IFwiXHh7RkYyRH1ceHtGRjMzfSBceHtGRjMwfVx4ezY2MEV9XHh7Njcx RH1cIi4gZXhwZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKKyAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgwLDE4MCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLDApIHNpemUgMjkxeDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lk dGggMjkxOiAiVXNpbmcgZm9udCBcIlx4e0ZGMkR9XHh7RkYzM30gXHh7NjYwRX1ceHs2NzFEfVwi LiBleHBlY3RlZDogeWVuIHNpZ24sIGFjdHVhbDogXHh7QTV9IgorICAgICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDAsMjAwKSBzaXplIDc4NHgyMAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAyODd4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAy ODc6ICJVc2luZyBmb250IFwiXHh7MzBFMX1ceHszMEE0fVx4ezMwRUF9XHh7MzBBQX1cIi4gZXhw ZWN0ZWQ6IHllbiBzaWduLCBhY3R1YWw6IFx4e0E1fSIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9 IGF0ICgwLDIyMCkgc2l6ZSA3ODR4MjAKICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMzE0eDIwCiAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzE0OiAi VXNpbmcgZm9udCBcIlRpbWVzXCIuIGV4cGVjdGVkOiBiYWNrc2xhc2gsIGFjdHVhbDogXFwiCi0g ICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwzNDYpIHNpemUgNzg0eDM0Ci0gICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDc4NHgzNAotICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDc4NDogIlVzaW5nIGZvbnQgXCJmb29iYXJcIi4gZXhwZWN0ZWQ6IGJh Y2tzbGFzaCwgYWN0dWFsOiIKLSAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggMTY6 ICJcXCIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDI0MCkgc2l6ZSA3ODR4MjAKKyAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzE2eDIwCisgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzE2OiAiVXNpbmcgZm9udCBcImZvb2JhclwiLiBleHBl Y3RlZDogYmFja3NsYXNoLCBhY3R1YWw6IFxcIgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VM b2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMDA5YWJhLi4zNjdlZjEwIDEwMDY0NAotLS0g YS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEwLTA2LTAxICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFA Y29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtndGtdIHdlYiBmb250cyBub3QgbG9hZGVkIHByb3Blcmx5IGluIHNjcmliZCBo dG1sNSByZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM4NzU4CisKKyAgICAgICAgQXZvaWQgYWx3YXlzIGdpdmluZyBhIHBvc2l0aXZlIHJlcGx5 IGluIGNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEuIFdlCisgICAgICAgIGRvIG5vdCB3YW50IGV2ZXJ5 IG5vbi1leGlzdGluZyBmYW1pbHkgbmFtZSB0byBiZSBjb25zaWRlcmVkIGEgaGl0LAorICAgICAg ICBvciB3ZWlyZCB1c2FnZSBvZiBsb2NhbCBzb3VyY2VzIGluIEBmb250LWZhY2UgcnVsZXMgd2ls bCBtYWtlCisgICAgICAgIFdlYktpdEdUSysgbmV2ZXIgY29uc2lkZXIgdGhlIG9ubGluZSBmb250 cy4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzV2VsbEtu b3duRm9udE5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxh dGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRyQ2Fp cm8uY3BwOiBBZGRlZC4KKyAgICAgICAgKFdURjo6RmNQYXR0ZXJuKToKKyAgICAgICAgKFdURjo6 RmNPYmplY3RTZXQpOgorICAgICAgICAoV1RGOjpGY0ZvbnRTZXQpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5oOiBBZGRlZC4KKwogMjAxMC0wNi0wMSAg QW50b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE5hdGUgQ2hhcGluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSBiL1dlYkNv cmUvR05VbWFrZWZpbGUuYW0KaW5kZXggZmM2YjgxOC4uMWY4ODM2YSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9HTlVtYWtlZmlsZS5hbQorKysgYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCkBAIC0yMTE0 LDYgKzIxMTQsOCBAQCB3ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhZGllbnRDYWlyby5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNhaXJvLmggXAor CVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmNwcCBcCisJV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uaCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNwcCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckRhdGEuaCBcCiAJV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUNhaXJvLmNwcCBcCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwCmluZGV4IDc5YjMyYjQuLmZj ZWVlYTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENh Y2hlQ2Fpcm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENh Y2hlQ2Fpcm8uY3BwCkBAIC0yMSw3ICsyMSw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5j bHVkZSAiRm9udENhY2hlLmgiCiAKKyNpbmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiRm9u dC5oIgorI2luY2x1ZGUgIkdPd25QdHJDYWlyby5oIgogI2luY2x1ZGUgIlNpbXBsZUZvbnREYXRh LmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIApAQCAtODEsOCArODMsNTcgQEAgdm9p ZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5 TmFtZSwgVmVjdG9yPHVuc2lnbmUKIHsKIH0KIAorc3RhdGljIGJvb2wgaXNXZWxsS25vd25Gb250 TmFtZShjb25zdCBBdG9taWNTdHJpbmcgZmFtaWx5KQoreworICAgIC8vIEZvbnRzIHRoYXQgYXJl IHVzZWQgYnkgbGF5b3V0IHRlc3RzIGluY2x1ZGVkLiBUaGUgZmFjdCB0aGF0CisgICAgLy8gdGhl eSBhcmUgdXNlZCBpbiBMYXlvdXQgVGVzdHMgaW5kaWNhdGUgd2ViIGNvbXBhdGliaWxpdHkgaXNz dWVzCisgICAgLy8gaWYgd2UgZG8gbm90IGhhbmRsZSB0aGVtIGNvcnJlY3RseS4KKyAgICBpZiAo ZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAic2Fucy1zZXJpZiIpIHx8IGVxdWFsSWdub3JpbmdD YXNlKGZhbWlseSwgInNlcmlmIikKKyAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5 LCAibW9ub3NwYWNlIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAiY3Vyc2l2ZSIpCisg ICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgImZhbnRhc3kiKSB8fCBlcXVhbEln bm9yaW5nQ2FzZShmYW1pbHksICJUaW1lcyIpCisgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNl KGZhbWlseSwgIkNvdXJpZXIiKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJIZWx2ZXRp Y2EiKQorICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJBcmlhbCIpIHx8IGVx dWFsSWdub3JpbmdDYXNlKGZhbWlseSwgIkx1Y2lkYSBHcmFuZGUiKQorICAgICAgICB8fCBlcXVh bElnbm9yaW5nQ2FzZShmYW1pbHksICJBaGVtIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5 LCAiR2VvcmdpYSIpCisgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgIlRpbWVz IE5ldyBSb21hbiIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsK K30KKwogRm9udFBsYXRmb3JtRGF0YSogRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJp bmcmIGZhbWlseSkKIHsKKyNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKKyAgICAvLyBIYW5kbGUg Z2VuZXJpYyBmYW1pbHkgdHlwZXMgc3BlY2lhbGx5LCBiZWNhdXNlIGZvbnRjb25maWcgZG9lcyBu b3Qga25vdyB0aGVtLCBidXQgd2UgaGF2ZQorICAgIC8vIGNvZGUgdG8gZmFsbGJhY2sgY29ycmVj dGx5IGluIG91ciBwbGF0Zm9ybSBkYXRhIGltcGxlbWVudGF0aW9uLgorICAgIGlmICghZmFtaWx5 Lmxlbmd0aCgpIHx8IGZhbWlseS5zdGFydHNXaXRoKCItd2Via2l0LSIpCisgICAgICAgIHx8IChm b250RGVzY3JpcHRpb24uZ2VuZXJpY0ZhbWlseSgpICE9IEZvbnREZXNjcmlwdGlvbjo6Tm9GYW1p bHkpCisgICAgICAgIHx8IGlzV2VsbEtub3duRm9udE5hbWUoZmFtaWx5KSkKKyAgICAgICAgcmV0 dXJuIG5ldyBGb250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbiwgZmFtaWx5KTsKKworICAg IC8vIEZpcnN0IGNoZWNrIHRoZSBmb250IGV4aXN0cy4KKyAgICBDU3RyaW5nIGZhbWlseU5hbWVT dHJpbmcgPSBmYW1pbHkuc3RyaW5nKCkudXRmOCgpOworICAgIGNvbnN0IGNoYXIqIGZjZmFtaWx5 ID0gZmFtaWx5TmFtZVN0cmluZy5kYXRhKCk7CisKKyAgICBHT3duUHRyPEZjUGF0dGVybj4gcGF0 dGVybihGY1BhdHRlcm5DcmVhdGUoKSk7CisgICAgaWYgKCFGY1BhdHRlcm5BZGRTdHJpbmcocGF0 dGVybi5nZXQoKSwgRkNfRkFNSUxZLCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgqPihm Y2ZhbWlseSkpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIEZjQ29uZmlnU3Vic3RpdHV0ZSgw LCBwYXR0ZXJuLmdldCgpLCBGY01hdGNoUGF0dGVybik7CisgICAgRmNEZWZhdWx0U3Vic3RpdHV0 ZShwYXR0ZXJuLmdldCgpKTsKKworICAgIEdPd25QdHI8RmNPYmplY3RTZXQ+IG9iamVjdFNldChG Y09iamVjdFNldENyZWF0ZSgpKTsKKyAgICBpZiAoIUZjT2JqZWN0U2V0QWRkKG9iamVjdFNldC5n ZXQoKSwgRkNfRkFNSUxZKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBHT3duUHRyPEZjRm9u dFNldD4gZm9udFNldChGY0ZvbnRMaXN0KDAsIHBhdHRlcm4uZ2V0KCksIG9iamVjdFNldC5nZXQo KSkpOworCisgICAgaWYgKCFmb250U2V0KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmICgh Zm9udFNldC0+Zm9udHMpCisgICAgICAgIHJldHVybiAwOworI2VuZGlmCisKICAgICByZXR1cm4g bmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBmYW1pbHkpOwogfQogCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5jcHAKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTJkZjNjZgotLS0gL2Rldi9udWxsCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmNwcApAQCAtMCww ICsxLDUwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIENvbGxhYm9yYSBMdGQuCisgKgor ICogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IKKyAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2Vy IEdlbmVyYWwgUHVibGljCisgKiAgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiAgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBv ciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqICBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq ICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJy YW50eSBvZgorICogIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIg UFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiAgTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug Zm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiAgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29w eSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogIExpY2Vuc2UgYWxvbmcgd2l0 aCB0aGlzIGxpYnJhcnk7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUKKyAqICBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogIEJv c3RvbiwgTUEgMDIxMTAtMTMwMSBVU0EKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5j bHVkZSAiR093blB0ckNhaXJvLmgiCisKKyNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKKyNpbmNs dWRlIDxjYWlyby1mdC5oPgorI2luY2x1ZGUgPGZvbnRjb25maWcvZmNmcmVldHlwZS5oPgorI2Vu ZGlmCisKK25hbWVzcGFjZSBXVEYgeworCisjaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUpCit0ZW1w bGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8RmNQYXR0ZXJuPihGY1BhdHRlcm4qIHB0cikKK3sK KyAgICBpZiAocHRyKQorICAgICAgICBGY1BhdHRlcm5EZXN0cm95KHB0cik7Cit9CisKK3RlbXBs YXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxGY09iamVjdFNldD4oRmNPYmplY3RTZXQqIHB0cikK K3sKKyAgICBpZiAocHRyKQorICAgICAgICBGY09iamVjdFNldERlc3Ryb3kocHRyKTsKK30KKwor dGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEZjRm9udFNldD4oRmNGb250U2V0KiBwdHIp Cit7CisgICAgaWYgKHB0cikKKyAgICAgICAgRmNGb250U2V0RGVzdHJveShwdHIpOworfQorI2Vu ZGlmCisKK30gLy8gbmFtZXNwYWNlIFdURgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vR093blB0ckNhaXJvLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4u YjA5OTcwNwotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vR093blB0ckNhaXJvLmgKQEAgLTAsMCArMSw0MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMCBDb2xsYWJvcmEgTHRkLgorICoKKyAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiAgbW9kaWZ5IGl0IHVuZGVyIHRo ZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogIExpY2Vuc2UgYXMg cHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogIHZl cnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVy c2lvbi4KKyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRo YXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqICBNRVJDSEFOVEFCSUxJVFkgb3Ig RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogIExlc3Nl ciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogIFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJs aWMKKyAqICBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRv IHRoZSBGcmVlCisgKiAgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3Ry ZWV0LCBGaWZ0aCBGbG9vciwKKyAqICBCb3N0b24sIE1BIDAyMTEwLTEzMDEgVVNBCisgKi8KKwor I2lmbmRlZiBHT3duUHRyQ2Fpcm9faAorI2RlZmluZSBHT3duUHRyQ2Fpcm9faAorCisjaW5jbHVk ZSAiR093blB0ci5oIgorCisjaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUpCit0eXBlZGVmIHN0cnVj dCBfRmNQYXR0ZXJuIEZjUGF0dGVybjsKK3R5cGVkZWYgc3RydWN0IF9GY09iamVjdFNldCBGY09i amVjdFNldDsKK3R5cGVkZWYgc3RydWN0IF9GY0ZvbnRTZXQgRmNGb250U2V0OworI2VuZGlmCisK K25hbWVzcGFjZSBXVEYgeworCisjaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUpCit0ZW1wbGF0ZSA8 PiB2b2lkIGZyZWVPd25lZEdQdHI8RmNQYXR0ZXJuPihGY1BhdHRlcm4qKTsKK3RlbXBsYXRlIDw+ IHZvaWQgZnJlZU93bmVkR1B0cjxGY09iamVjdFNldD4oRmNPYmplY3RTZXQqKTsKK3RlbXBsYXRl IDw+IHZvaWQgZnJlZU93bmVkR1B0cjxGY0ZvbnRTZXQ+KEZjRm9udFNldCopOworI2VuZGlmCisK K30gLy8gbmFtZXNwYWNlIFdURgorCisjZW5kaWYKLS0gCjEuNy4xCgo= 58720 2010-06-14 15:57:13 -0700 2010-06-23 11:25:57 -0700 special-case mono and sans as well 0001-Also-special-case-mono-and-sans-commonly-used-in-GTK.patch text/plain 2159 gustavo RnJvbSA4Y2Q3OWE0MmI1YjgzYTU1NjRhMThkMGY5ZDg1MGM2MTc1NTQ2ODNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IE1vbiwgMTQgSnVuIDIwMTAgMTk6NTU6MTggLTAzMDAKU3ViamVjdDogW1BBVENIXSBB bHNvIHNwZWNpYWwtY2FzZSBtb25vIGFuZCBzYW5zLCBjb21tb25seSB1c2VkIGluIEdUSysgYXBw cwoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMTMgKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9G b250Q2FjaGVDYWlyby5jcHAgfCAgICAzICsrLQogMiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI5OWQwNy4uOWRiNzMwYSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxMC0wNi0xNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxh Ym9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbZ3RrXSB3ZWIgZm9udHMgbm90IGxvYWRlZCBwcm9wZXJseSBpbiBzY3JpYmQgaHRtbDUg cmVhZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODc1OAorCisgICAgICAgIEFsc28gc3BlY2lhbC1jYXNlIGBzYW5zJyBhbWQgYG1vbm8nLCB3aGlj aCBhcmUgYWxpYXNlcyBjb21tb25seQorICAgICAgICB1c2VkIGluIEdUSysgYXBwbGljYXRpb25z LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aXNXZWxsS25vd25Gb250TmFtZSk6CisKIDIwMTAtMDYtMTQg IER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9Gb250Q2FjaGVDYWlyby5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ZvbnRDYWNoZUNhaXJvLmNwcAppbmRleCBmY2VlZWExLi5iMDI2OGQ2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcApAQCAtODgs NyArODgsOCBAQCBzdGF0aWMgYm9vbCBpc1dlbGxLbm93bkZvbnROYW1lKGNvbnN0IEF0b21pY1N0 cmluZyBmYW1pbHkpCiAgICAgLy8gRm9udHMgdGhhdCBhcmUgdXNlZCBieSBsYXlvdXQgdGVzdHMg aW5jbHVkZWQuIFRoZSBmYWN0IHRoYXQKICAgICAvLyB0aGV5IGFyZSB1c2VkIGluIExheW91dCBU ZXN0cyBpbmRpY2F0ZSB3ZWIgY29tcGF0aWJpbGl0eSBpc3N1ZXMKICAgICAvLyBpZiB3ZSBkbyBu b3QgaGFuZGxlIHRoZW0gY29ycmVjdGx5LgotICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1p bHksICJzYW5zLXNlcmlmIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAic2VyaWYiKQor ICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJzYW5zLXNlcmlmIikgfHwgZXF1YWxJ Z25vcmluZ0Nhc2UoZmFtaWx5LCAic2FucyIpCisgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNl KGZhbWlseSwgInNlcmlmIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAibW9ubyIpCiAg ICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseSwgIm1vbm9zcGFjZSIpIHx8IGVxdWFs SWdub3JpbmdDYXNlKGZhbWlseSwgImN1cnNpdmUiKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5n Q2FzZShmYW1pbHksICJmYW50YXN5IikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAiVGlt ZXMiKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHksICJDb3VyaWVyIikgfHwg ZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5LCAiSGVsdmV0aWNhIikKLS0gCjEuNy4xCgo= 58776 2010-06-15 07:43:14 -0700 2010-06-23 11:42:30 -0700 remove restrictions from font matching 0001-Make-the-matching-less-restrictive.patch text/plain 1849 gustavo RnJvbSA4MDkzZTJlYzcwYWRkNGJkMjE4NTc0NGRhZDc2MzkzMjY1ZWJhOTVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFR1ZSwgMTUgSnVuIDIwMTAgMTE6MzQ6MjcgLTAzMDAKU3ViamVjdDogW1BBVENIXSBN YWtlIHRoZSBtYXRjaGluZyBsZXNzIHJlc3RyaWN0aXZlCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9n ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrKysrCiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcCB8ICAgIDMg LS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTI1NGIxLi43YWE3NGU3IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA2LTE1ICBHdXN0YXZvIE5vcm9u aGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtndGtdIHdlYiBmb250cyBub3Qg bG9hZGVkIHByb3Blcmx5IGluIHNjcmliZCBodG1sNSByZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NzU4CisKKyAgICAgICAgRHJvcCBmaWxs aW5nIHRoZSBwYXR0ZXJuIHdpdGggZGVmYXVsdCB2YWx1ZXMsIGJlY2F1c2UgdGhpcworICAgICAg ICByZXN0cmljdHMgdGhlIG1hdGNoaW5nIG1vcmUgdGhhbiB3ZSB3YW50LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKwogMjAxMC0wNi0xNCAg R3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4K IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3BwIGIvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2FjaGVDYWlyby5jcHAKaW5kZXggYjAyNjhkNi4u Y2I1NDU0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250 Q2FjaGVDYWlyby5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250 Q2FjaGVDYWlyby5jcHAKQEAgLTExOSw5ICsxMTksNiBAQCBGb250UGxhdGZvcm1EYXRhKiBGb250 Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250 RAogICAgIGlmICghRmNQYXR0ZXJuQWRkU3RyaW5nKHBhdHRlcm4uZ2V0KCksIEZDX0ZBTUlMWSwg cmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZmNmYW1pbHkpKSkKICAgICAgICAgcmV0 dXJuIDA7CiAKLSAgICBGY0NvbmZpZ1N1YnN0aXR1dGUoMCwgcGF0dGVybi5nZXQoKSwgRmNNYXRj aFBhdHRlcm4pOwotICAgIEZjRGVmYXVsdFN1YnN0aXR1dGUocGF0dGVybi5nZXQoKSk7Ci0KICAg ICBHT3duUHRyPEZjT2JqZWN0U2V0PiBvYmplY3RTZXQoRmNPYmplY3RTZXRDcmVhdGUoKSk7CiAg ICAgaWYgKCFGY09iamVjdFNldEFkZChvYmplY3RTZXQuZ2V0KCksIEZDX0ZBTUlMWSkpCiAgICAg ICAgIHJldHVybiAwOwotLSAKMS43LjEKCg==