lib/cocoa/sugarcube-attributedstring/nsattributedstring.rb in sugarcube-2.11.0 vs lib/cocoa/sugarcube-attributedstring/nsattributedstring.rb in sugarcube-2.11.1

@@ -1,27 +1,7 @@
 class NSString
 
-  def bold(size=nil)
-    font = :bold.uifont(size)
-    nsattributedstring({NSFontAttributeName => font})
-  end
-
-  def italic(size=nil)
-    font = :italic.uifont(size)
-    nsattributedstring({NSFontAttributeName => font})
-  end
-
-  def monospace(size=nil)
-    font = :monospace.uifont(size)
-    nsattributedstring({NSFontAttributeName => font})
-  end
-
-  def underline(underline_style=nil)
-    underline_style ||= NSUnderlineStyleSingle
-    nsattributedstring({NSUnderlineStyleAttributeName => underline_style})
-  end
-
   def nsattributedstring(attributes={})
     NSAttributedString.alloc.initWithString(self, attributes: attributes)
   end
 
   def attrd(attributes={})
@@ -42,106 +22,66 @@
 
 class NSAttributedString
 
   def sugarcube_nsattributedstring_dummy_method
     # make sure NSAttributedString constants get compiled
-    foo = NSFontAttributeName
-    foo = NSParagraphStyleAttributeName
-    foo = NSForegroundColorAttributeName
-    foo = NSBackgroundColorAttributeName
-    foo = NSLigatureAttributeName
-    foo = NSKernAttributeName
-    foo = NSStrikethroughStyleAttributeName
-    foo = NSUnderlineStyleAttributeName
-    foo = NSStrokeColorAttributeName
-    foo = NSStrokeWidthAttributeName
-    foo = NSShadowAttributeName
-    foo = NSVerticalGlyphFormAttributeName
+    NSFontAttributeName
+    NSParagraphStyleAttributeName
+    NSForegroundColorAttributeName
+    NSBackgroundColorAttributeName
+    NSLigatureAttributeName
+    NSKernAttributeName
+    NSStrikethroughStyleAttributeName
+    NSUnderlineStyleAttributeName
+    NSStrokeColorAttributeName
+    NSStrokeWidthAttributeName
+    NSShadowAttributeName
+    NSVerticalGlyphFormAttributeName
     # new iOS 7 text effects
-    foo = NSTextEffectAttributeName
-    foo = NSTextEffectLetterpressStyle
+    NSTextEffectAttributeName
+    NSTextEffectLetterpressStyle
     # make sure alignments get compiled
-    foo = NSLeftTextAlignment
-    foo = NSRightTextAlignment
-    foo = NSCenterTextAlignment
-    foo = NSJustifiedTextAlignment
-    foo = NSNaturalTextAlignment
+    NSLeftTextAlignment
+    NSRightTextAlignment
+    NSCenterTextAlignment
+    NSJustifiedTextAlignment
+    NSNaturalTextAlignment
     nil
   end
 
   def to_s
     string  # this is the name of the Cocoa method to return an NSString
   end
 
-  def bold(size=nil)
-    font = :bold.uifont(size)
-    self.font(font)
-  end
-
-  def italic(size=nil)
-    font = :italic.uifont(size)
-    self.font(font)
-  end
-
-  def underline
-    underline_style(NSUnderlineStyleSingle)
-  end
-
-  def font(value)
-    with_attributes({NSFontAttributeName => value.uifont})
-  end
-
   def paragraph_style(value)
-    with_attributes({NSParagraphStyleAttributeName => value})
+    with_attributes({ NSParagraphStyleAttributeName => value })
   end
 
-  def foreground_color(value)
-    with_attributes({NSForegroundColorAttributeName => value.uicolor})
-  end
-  alias color foreground_color
-
-  def underline_style(value)
-    with_attributes({NSUnderlineStyleAttributeName => value})
-  end
-
-  def background_color(value)
-    with_attributes({NSBackgroundColorAttributeName => value.uicolor})
-  end
-  alias bg_color background_color
-
   def ligature(value)
-    with_attributes({NSLigatureAttributeName => value})
+    with_attributes({ NSLigatureAttributeName => value })
   end
 
   def kern(value)
-    with_attributes({NSKernAttributeName => value})
+    with_attributes({ NSKernAttributeName => value })
   end
 
   def stroke_width(value)
-    with_attributes({NSStrokeWidthAttributeName => value})
+    with_attributes({ NSStrokeWidthAttributeName => value })
   end
 
-  def stroke_color(value)
-    with_attributes({NSStrokeColorAttributeName => value.uicolor})
-  end
-
   def strikethrough_style(value)
-    with_attributes({NSStrikethroughStyleAttributeName => value})
+    with_attributes({ NSStrikethroughStyleAttributeName => value })
   end
 
   def shadow(value)
-    with_attributes({NSShadowAttributeName => value})
+    with_attributes({ NSShadowAttributeName => value })
   end
 
   def vertical_glyph_form(value)
-    with_attributes({NSVerticalGlyphFormAttributeName => value})
+    with_attributes({ NSVerticalGlyphFormAttributeName => value })
   end
 
-  def letterpress
-    with_attributes({NSTextEffectAttributeName => NSTextEffectLetterpressStyle})
-  end
-
   def with_attributes(attributes)
     retval = NSMutableAttributedString.alloc.initWithAttributedString(self)
     retval.addAttributes(attributes, range:[0, self.length])
     retval
   end
@@ -157,11 +97,13 @@
   def attrd(attributes=nil)
     self.nsattributedstring(attributes=nil)
   end
 
   def +(attributedstring)
-    NSMutableAttributedString.alloc.initWithAttributedString(self) + attributedstring.nsattributedstring
+    string = NSMutableAttributedString.alloc.initWithAttributedString(self)
+    string.appendAttributedString(attributedstring.nsattributedstring)
+    string
   end
 
 end
 
 
@@ -170,10 +112,10 @@
   def with_attributes(attributes)
     self.addAttributes(attributes, range:[0, self.length])
     self
   end
 
-  def +(attributedstring)
+  def <<(attributedstring)
     self.appendAttributedString(attributedstring.nsattributedstring)
   end
 
 end