337f379e787f1f1975301d83674bd53cb399ad77 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/fa02fe6d597cfd9e175a26460116858799f23428 fa02fe6d597cfd9e175a26460116858799f23428 2009-10-05T16:07:05-07:00 2009-10-05T16:07:05-07:00 Add missing #import <CoreGraphics/CoreGraphics.h> b21aa0489d9b8aee65d466bc4403f01d1b210133 Kevin Ballard kevin@sb.org 61cbd2721a49046b7bba06acbfff8df85a4f08de Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/337f379e787f1f1975301d83674bd53cb399ad77 337f379e787f1f1975301d83674bd53cb399ad77 2009-10-05T14:28:45-07:00 2009-10-05T14:28:45-07:00 Fix handling of CRLF sequences when rendering strings with numberOfLines == 1 c7c3fc4111a1a26b344592e47db3db3e66e74846 Kevin Ballard kevin@sb.org 11807fcecfa73f7939b04dd9cd2f08117fe310c3 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/61cbd2721a49046b7bba06acbfff8df85a4f08de 61cbd2721a49046b7bba06acbfff8df85a4f08de 2009-10-05T14:02:08-07:00 2009-10-05T14:02:08-07:00 Make -[ZAttributedString copy] perform a -retain instead ZAttributedStrings are immutable, so copying is unnecessary. Only do a real copy when calling -copy on ZMutableAttributedString. c2b17207be76e409379534c96a0a0cc01b65d7fc Kevin Ballard kevin@sb.org 7a3159f49933932acad6f1eaa339037133f29ff0 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/11807fcecfa73f7939b04dd9cd2f08117fe310c3 11807fcecfa73f7939b04dd9cd2f08117fe310c3 2009-10-05T13:24:23-07:00 2009-10-05T13:24:23-07:00 Turn on new warning flags and fix the resulting warnings Turn on warning flags that cocos2d-iphone appears to be using. This helps us prevent warnings when FontLabel is used within cocos2d. Also add a couple of missing UIKit #imports. 5c3ad2b54daa4e351a4dab7d16a3f76e3cdf6f51 Kevin Ballard kevin@sb.org 6f0673389d892e880d66a61e74478984291c8bcd Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/7a3159f49933932acad6f1eaa339037133f29ff0 7a3159f49933932acad6f1eaa339037133f29ff0 2009-10-05T01:44:50-07:00 2009-10-05T01:44:50-07:00 Implement support for FontLabel.highlighted with attributed string drawing b9c6c75f59e6fb460cfa67b6509bc4d5129d9ef2 Kevin Ballard kevin@sb.org 7727cfb2d445ef7872226f031e2d394ffc27df55 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/6f0673389d892e880d66a61e74478984291c8bcd 6f0673389d892e880d66a61e74478984291c8bcd 2009-10-05T01:38:49-07:00 2009-10-05T01:38:49-07:00 Implement support for highlighted/highlightedTextColor The highlighted property is not yet observed for attributed string drawing 6f6253a8f01c282f398cf13d6b5da3aab2b22eb0 Kevin Ballard kevin@sb.org 7ddaf7d40e79ebf556d6a30db177d50e152d3501 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/7727cfb2d445ef7872226f031e2d394ffc27df55 7727cfb2d445ef7872226f031e2d394ffc27df55 2009-10-05T01:30:08-07:00 2009-10-05T01:30:08-07:00 Implement more intelligent word-wrapping behavior 9f40153f1dbd9b3893d23b7662df75bf53260406 Kevin Ballard kevin@sb.org 61621aab06cb5bf270b779aa1052452bd4270895 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/7ddaf7d40e79ebf556d6a30db177d50e152d3501 7ddaf7d40e79ebf556d6a30db177d50e152d3501 2009-10-05T01:21:28-07:00 2009-10-05T01:21:17-07:00 Skip spaces properly when word-wrapping 9662c851a887797c141fff1b31d9215a735968d7 Kevin Ballard kevin@sb.org 99d11c6f20b8bf835a87ea72339b155d0d4817cc Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/61621aab06cb5bf270b779aa1052452bd4270895 61621aab06cb5bf270b779aa1052452bd4270895 2009-10-05T01:17:36-07:00 2009-10-05T01:17:36-07:00 Fix a bug with wrapping of a single word too long to fit on a line a84f88ec8de9a190466270bb56e9bf77cc89370a Kevin Ballard kevin@sb.org be0d8e4bb1e36ae3794e6fb830ed603fb7ad5ec5 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/99d11c6f20b8bf835a87ea72339b155d0d4817cc 99d11c6f20b8bf835a87ea72339b155d0d4817cc 2009-10-05T00:42:40-07:00 2009-10-05T00:42:40-07:00 Update the README ed9c1fedfcd73f6ebbfe00b85bcb202db173401b Kevin Ballard kevin@sb.org 66d77e130545726e9c3c7f361373f2b067a3eded Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/be0d8e4bb1e36ae3794e6fb830ed603fb7ad5ec5 be0d8e4bb1e36ae3794e6fb830ed603fb7ad5ec5 2009-10-05T00:37:01-07:00 2009-10-05T00:34:00-07:00 When calculating the ellipsis position, adjust font accordingly If we move past a font change when calculating the position of the ellipsis, recalculate the glyph/width for the ellipsis. bd937b094dcee36d2c05382cae398b9eb5a4acae Kevin Ballard kevin@sb.org 74c4115a6fbd1c69d3479dd4696f27da2fb80d3e 5885ff771bf0d6f921768f41a5dea8400fffba07 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/66d77e130545726e9c3c7f361373f2b067a3eded 66d77e130545726e9c3c7f361373f2b067a3eded 2009-10-05T00:28:11-07:00 2009-10-05T00:28:11-07:00 Merge branch 'attributed' * attributed: Rename the attributedText property to zAttributedText Clean up the sample labels a bit and demo the new attributed string support Add the attributedText property to FontLabel Fix some bugs with drawing multiple-run attributed strings Fix an issue with truncation at a space character Obey the numberOfLines property again Add drawing methods that allow for numberOfLines Rewrite the text layout algorithm to take attribute runs into account Add +[ZFont fontWithUIFont:] Add test for -removeAttribute:range: Implement a couple more tests Add more tests and fix a few more bugs Fix -attributedSubstringFromRange: Start adding unit tests Start implementing attributed string drawing Implement a new class ZAttributedString Conflicts: FontLabel/Classes/FontLabel/FontLabelStringDrawing.m 12a515cc36badfadfbc6e776f417ee250dcb676c Kevin Ballard kevin@sb.org 5171d831b4c3a8c50cbfd279f0d76eafd604b24a Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/5885ff771bf0d6f921768f41a5dea8400fffba07 5885ff771bf0d6f921768f41a5dea8400fffba07 2009-10-05T00:27:01-07:00 2009-10-05T00:27:01-07:00 Rename the attributedText property to zAttributedText This should prevent any potential collisions if UIKit introduces attributed strings. fb60b603b0c16ee55716b75ca8290fa1835ddebd Kevin Ballard kevin@sb.org aff7012bed36e1951708ac8ad8d83e3b662cf37f Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/5171d831b4c3a8c50cbfd279f0d76eafd604b24a 5171d831b4c3a8c50cbfd279f0d76eafd604b24a 2009-10-05T00:25:52-07:00 2009-10-05T00:25:52-07:00 Clean up the sample labels a bit and demo the new attributed string support 101b735a05ea58a4aa753e74a871c57cd5c81feb Kevin Ballard kevin@sb.org 5f044586d20a089df3474cf2f3f3cc3fbff1c99c Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/aff7012bed36e1951708ac8ad8d83e3b662cf37f aff7012bed36e1951708ac8ad8d83e3b662cf37f 2009-10-05T00:25:28-07:00 2009-10-05T00:25:28-07:00 Add the attributedText property to FontLabel 015e463261d4205476d6e753d0c18907050a228c Kevin Ballard kevin@sb.org 789fe6a9e1742f748c90822c6958a638e91d8d85 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/5f044586d20a089df3474cf2f3f3cc3fbff1c99c 5f044586d20a089df3474cf2f3f3cc3fbff1c99c 2009-10-05T00:25:03-07:00 2009-10-05T00:06:06-07:00 Fix some bugs with drawing multiple-run attributed strings 4ff86e19e24526befdffc4a511862eeaad0cf1db Kevin Ballard kevin@sb.org 8f7f222d7a8759372acb267eb65f61d5be0ee0be Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/789fe6a9e1742f748c90822c6958a638e91d8d85 789fe6a9e1742f748c90822c6958a638e91d8d85 2009-10-04T23:38:16-07:00 2009-10-04T23:38:16-07:00 Fix an issue with truncation at a space character 54c2a7e981526feaae59b45808fbea2286df783a Kevin Ballard kevin@sb.org e780cfe05f2909d3d50d45a776fb0fac5e96e3e5 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/8f7f222d7a8759372acb267eb65f61d5be0ee0be 8f7f222d7a8759372acb267eb65f61d5be0ee0be 2009-10-04T23:38:00-07:00 2009-10-04T23:38:00-07:00 Obey the numberOfLines property again f4f0c9fa98616e73167839bef9b055689f982ffb Kevin Ballard kevin@sb.org 448345437fbd84f3dbcb8a6ab1efff73ba22858e Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/e780cfe05f2909d3d50d45a776fb0fac5e96e3e5 e780cfe05f2909d3d50d45a776fb0fac5e96e3e5 2009-10-04T23:29:18-07:00 2009-10-04T23:29:18-07:00 Add drawing methods that allow for numberOfLines Standardize newline-to-space conversion to happen when numberOfLines is given and is equal to 1. de711afcc0778897fea37db6eb2d5d26d61fd1ec Kevin Ballard kevin@sb.org c2fdaefec7c17c36a7f45f8cddf1062e5589ffd6 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/448345437fbd84f3dbcb8a6ab1efff73ba22858e 448345437fbd84f3dbcb8a6ab1efff73ba22858e 2009-10-04T20:51:34-07:00 2009-10-04T13:20:46-07:00 Rewrite the text layout algorithm to take attribute runs into account d1fc08b32f4d4d839328053fd679e66d114a2a04 Kevin Ballard kevin@sb.org 059b55e23bf0a7b86f779bbd5cea8d48a2b0e8ed Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/74c4115a6fbd1c69d3479dd4696f27da2fb80d3e 74c4115a6fbd1c69d3479dd4696f27da2fb80d3e 2009-10-04T17:15:28-07:00 2009-10-04T17:15:28-07:00 Speed up mapping of format 12 glyphs by 22000% percent (fixes #6) Use a hinted binary search heuristic to locate the glyph segments in the format 12 cmap table instead of a linear search. 3ea24f0e2cea63c043e53f86626a4d740af1d50d Kevin Ballard kevin@sb.org 0b7c4f9464bab9a4b1adeccc5b0ff6eb6b8840ab Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/059b55e23bf0a7b86f779bbd5cea8d48a2b0e8ed 059b55e23bf0a7b86f779bbd5cea8d48a2b0e8ed 2009-10-04T13:41:51-07:00 2009-10-04T13:41:51-07:00 Add URL-based font loading methods (fixes #7) FontManager can now load ZFont objects from any arbitrary file URL. The old name-based methods still work, but are translated to URLs internally. e5e34ccfcdde499398f62f759e45f83dfcb3823c Kevin Ballard kevin@sb.org 202a9e07b877e58e2cb67dae7d1718edc043e623 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/c2fdaefec7c17c36a7f45f8cddf1062e5589ffd6 c2fdaefec7c17c36a7f45f8cddf1062e5589ffd6 2009-10-01T01:03:21-07:00 2009-10-01T01:03:21-07:00 Add +[ZFont fontWithUIFont:] 6087a863f96d448cfc0a7713a160073f6ab356b6 Kevin Ballard kevin@sb.org 19ed3878540350ffb4e2967194ecd6cf6f5d3d7e Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/202a9e07b877e58e2cb67dae7d1718edc043e623 202a9e07b877e58e2cb67dae7d1718edc043e623 2009-09-30T23:44:39-07:00 2009-09-30T23:44:39-07:00 Add test for -removeAttribute:range: f55b560abd0603b4341032cc430a64ee65a2d272 Kevin Ballard kevin@sb.org ba3250f59e54622ba83710377bdffa487cf5a1d3 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/19ed3878540350ffb4e2967194ecd6cf6f5d3d7e 19ed3878540350ffb4e2967194ecd6cf6f5d3d7e 2009-09-30T23:39:11-07:00 2009-09-30T23:39:11-07:00 Implement a couple more tests ebef486e54dcdd1c3dedba2548a69aa045480213 Kevin Ballard kevin@sb.org dbc9ae12265b593a682709569843744921588509 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/ba3250f59e54622ba83710377bdffa487cf5a1d3 ba3250f59e54622ba83710377bdffa487cf5a1d3 2009-09-30T23:21:49-07:00 2009-09-30T23:21:49-07:00 Add more tests and fix a few more bugs 525881181fccc7bbe106c67fc7df9786acff4378 Kevin Ballard kevin@sb.org 52b3b8b0709e6188565ca00db235a4b65056ab85 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/dbc9ae12265b593a682709569843744921588509 dbc9ae12265b593a682709569843744921588509 2009-09-30T21:46:51-07:00 2009-09-30T21:46:51-07:00 Fix -attributedSubstringFromRange: 81e56ced39c785d888057652fd240429e6dcee92 Kevin Ballard kevin@sb.org 7ad1433a52f88867c29c1682ec77a1aa8cfe4d0a Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/52b3b8b0709e6188565ca00db235a4b65056ab85 52b3b8b0709e6188565ca00db235a4b65056ab85 2009-09-26T22:17:42-07:00 2009-09-26T10:22:54-07:00 Start adding unit tests Fix a few bugs found by these unit tests already. 0a95c1df2a3a39590de4bbdef856a317ae6e9fc6 Kevin Ballard kevin@sb.org 317a7f251f26cb6aa04da2cccbd05337e3f15123 Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/7ad1433a52f88867c29c1682ec77a1aa8cfe4d0a 7ad1433a52f88867c29c1682ec77a1aa8cfe4d0a 2009-09-23T15:50:19-07:00 2009-09-23T15:50:15-07:00 Start implementing attributed string drawing 90cf55db2d35832dd238cc5e9af03fe0db4b8f6f Kevin Ballard kevin@sb.org 0b7c4f9464bab9a4b1adeccc5b0ff6eb6b8840ab Kevin Ballard kevin@sb.org http://github.com/zynga/FontLabel/commit/317a7f251f26cb6aa04da2cccbd05337e3f15123 317a7f251f26cb6aa04da2cccbd05337e3f15123 2009-09-23T15:14:23-07:00 2009-09-23T13:59:40-07:00 Implement a new class ZAttributedString 17d8b5268acc7df9151f2f94476adf3d4abe623b Kevin Ballard kevin@sb.org