Permalink
Commits on Oct 29, 2011
  1. Standardize whitespace on tabs

    98% of the project was already using tabs. Fix the lines that were
    indented with spaces and set the project setting to tabs.
    kballard committed Oct 29, 2011
  2. Add support for ZStrikethroughStyleAttributeName

    ZStrikethroughStyleAttributeName takes the same values as
    ZUnderlineStyleAttributeName but controls the presence and appearance of
    a strikethrough.
    Arvind Kunday committed with kballard Apr 25, 2011
  3. Merge remote-tracking branch 'kballard/master'

    * kballard/master:
      Remove target-specific compiler setting
      Fix a couple of warnings in ZAttributedString.m
      Fix sign warnings triggered by Clang
      Upgrade compiler to Clang
      Treat apostrophes as word characters when doing word wrapping
      Handle -[FontLabel sizeToFit] correctly with attributed strings
    kballard committed Oct 29, 2011
  4. Remove target-specific compiler setting

    Let all targets default to the system compiler, which is now LLVM 3.0.
    kballard committed Oct 29, 2011
  5. Fix a couple of warnings in ZAttributedString.m

    The compiler is assuming the wrong receiver type for the -attributes
    method and warning about an NSArray where an NSDictionary was expected.
    Add an explicit cast so the compiler knows the correct type.
    kballard committed Oct 29, 2011
Commits on Jul 1, 2011
  1. Merge pull request #22 from fluff/libstatic-category-missing-fix

    Missing category at runtime for static lib
    kballard committed Jul 1, 2011
  2. Missing category at runtime for static lib

    There's a bug (misfeature?) in the iOS development kit that causes object files containing only categories to be skipped, when the file in question is built as a static library. This results in runtime errors, of course.
    
    This quick fix defines an empty class, which is enough to force the linker to include the category when building the final executable.
    fluff committed Jul 1, 2011
Commits on May 25, 2011
  1. Fix sign warnings triggered by Clang

    Clang rightfully points out that if runIndex is an NSUInteger, the
    (runIndex >= 0) conditional can never fail. Once we convert it to
    NSInteger, we then need to fix a sign comparison warning when
    calculating endRun.
    kballard committed May 25, 2011
  2. Upgrade compiler to Clang

    kballard committed May 25, 2011
Commits on Mar 1, 2011
Commits on Jan 24, 2011
  1. Handle -[FontLabel sizeToFit] correctly with attributed strings

    When FontLabel had a .zAttributedString, the -sizeToFit and
    -sizeThatFits: calls were not being handled correctly. Teach the
    -textRectForBounds:limitedToNumberOfLines: method to correctly handle
    both attributed strings and plain text. (fixes #2)
    kballard committed Jan 24, 2011
Commits on Jan 17, 2011
  1. Fix remaining compiler warning about -initWithAttributedString:

    Fix the one compiler warning about -initWithAttributedString: in the
    unit tests.
    kballard committed Jan 17, 2011
  2. Update SDKROOT to Latest iOS

    kballard committed Jan 17, 2011
  3. Mark a wrap point before processing the glyph instead of after

    When we encounter the need to wrap, we backtrack to the last wrap point and
    insert a line break. If we find the need to wrap while processing a space,
    we end up backtracking to the previous space instead. By inserting a wrap
    point before checking the line length, we can wrap right at the current
    space instead.
    kballard committed Jan 17, 2011
Commits on Aug 7, 2010
  1. Fix compiler warnings about -initWithAttributedString:

    I don't know why the compiler is warning about -initWithAttributedString:.
    For some reason it is assuming that the result of +allocWithZone: is an
    NSAttributedString instead of a ZAttributedString. Casting it squelches
    the warning.
    kballard committed Aug 7, 2010
Commits on Oct 5, 2009
  1. Make -[ZAttributedString copy] perform a -retain instead

    ZAttributedStrings are immutable, so copying is unnecessary. Only do a
    real copy when calling -copy on ZMutableAttributedString.
    kballard committed Oct 5, 2009
  2. 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.
    kballard committed Oct 5, 2009
  3. Implement support for highlighted/highlightedTextColor

    The highlighted property is not yet observed for attributed string drawing
    kballard committed Oct 5, 2009
  4. Update the README

    kballard committed Oct 5, 2009
  5. 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.
    kballard committed Oct 5, 2009
  6. 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
    kballard committed Oct 5, 2009
  7. Rename the attributedText property to zAttributedText

    This should prevent any potential collisions if UIKit introduces attributed strings.
    kballard committed Oct 5, 2009
  8. Add drawing methods that allow for numberOfLines

    Standardize newline-to-space conversion to happen when numberOfLines
    is given and is equal to 1.
    kballard committed Oct 5, 2009