removed "Stack" from baseline related layout names

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -217,16 +217,16 @@
 		509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; };
 		509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E201B376416007741D0 /* CGRect+ASConvenience.m */; };
 		6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C204A641B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C204A641B86349B00313849 /* ASBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselinePositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C204A651B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C204A651B86349B00313849 /* ASBaselinePositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselinePositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C204A661B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */; };
+		9C204A661B86349B00313849 /* ASBaselinePositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselinePositionedLayout.mm */; };
-		9C204A671B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */; };
+		9C204A671B86349B00313849 /* ASBaselinePositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselinePositionedLayout.mm */; };
-		9C204A6A1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C204A6A1B87803A00313849 /* ASBaselineLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C204A6B1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C204A6B1B87803A00313849 /* ASBaselineLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C3061061B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C3061061B857EC400D0530B /* ASBaselineLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C3061071B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9C3061071B857EC400D0530B /* ASBaselineLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C3061081B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */; };
+		9C3061081B857EC400D0530B /* ASBaselineLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineLayoutSpec.mm */; };
-		9C3061091B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */; };
+		9C3061091B857EC400D0530B /* ASBaselineLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineLayoutSpec.mm */; };
 		9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */; };
@@ -568,11 +568,11 @@
 		4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultidimensionalArrayUtils.h; sourceTree = "<group>"; };
 		4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMultidimensionalArrayUtils.mm; sourceTree = "<group>"; };
 		6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AsyncDisplayKit.h; sourceTree = "<group>"; };
-		9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBaselineStackPositionedLayout.h; sourceTree = "<group>"; };
+		9C204A621B86349B00313849 /* ASBaselinePositionedLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBaselinePositionedLayout.h; sourceTree = "<group>"; };
-		9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBaselineStackPositionedLayout.mm; sourceTree = "<group>"; };
+		9C204A631B86349B00313849 /* ASBaselinePositionedLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBaselinePositionedLayout.mm; sourceTree = "<group>"; };
-		9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineStackLayoutable.h; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutable.h; sourceTree = "<group>"; };
+		9C204A681B87803A00313849 /* ASBaselineLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineLayoutable.h; path = AsyncDisplayKit/Layout/ASBaselineLayoutable.h; sourceTree = "<group>"; };
-		9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineStackLayoutSpec.h; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.h; sourceTree = "<group>"; };
+		9C3061041B857EC400D0530B /* ASBaselineLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineLayoutSpec.h; path = AsyncDisplayKit/Layout/ASBaselineLayoutSpec.h; sourceTree = "<group>"; };
-		9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASBaselineStackLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.mm; sourceTree = "<group>"; };
+		9C3061051B857EC400D0530B /* ASBaselineLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASBaselineLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASBaselineLayoutSpec.mm; sourceTree = "<group>"; };
 		9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutable.h; path = AsyncDisplayKit/Layout/ASStackLayoutable.h; sourceTree = "<group>"; };
 		9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCollectionViewTests.m; sourceTree = "<group>"; };
 		AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutDefines.h; path = AsyncDisplayKit/Layout/ASStackLayoutDefines.h; sourceTree = "<group>"; };
@@ -939,8 +939,8 @@
 				ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */,
 				ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */,
 				ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */,
-				9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */,
+				9C204A621B86349B00313849 /* ASBaselinePositionedLayout.h */,
-				9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */,
+				9C204A631B86349B00313849 /* ASBaselinePositionedLayout.mm */,
 			);
 			path = Private;
 			sourceTree = "<group>";
@@ -963,7 +963,7 @@
 			children = (
 				ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */,
 				ACF6ED021B17843500DA7C62 /* ASBackgroundLayoutSpec.mm */,
-				9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */,
+				9C204A681B87803A00313849 /* ASBaselineLayoutable.h */,
 				ACF6ED031B17843500DA7C62 /* ASCenterLayoutSpec.h */,
 				ACF6ED041B17843500DA7C62 /* ASCenterLayoutSpec.mm */,
 				ACF6ED071B17843500DA7C62 /* ASDimension.h */,
@@ -987,8 +987,8 @@
 				ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */,
 				ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */,
 				ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */,
-				9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */,
+				9C3061041B857EC400D0530B /* ASBaselineLayoutSpec.h */,
-				9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */,
+				9C3061051B857EC400D0530B /* ASBaselineLayoutSpec.mm */,
 			);
 			name = Layout;
 			path = ..;
@@ -1049,7 +1049,7 @@
 				464052201A3F83C40061C0BA /* ASDataController.h in Headers */,
 				05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */,
 				0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */,
-				9C204A6A1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */,
+				9C204A6A1B87803A00313849 /* ASBaselineLayoutable.h in Headers */,
 				058D0A47195D05CB00B7D73C /* ASControlNode.h in Headers */,
 				058D0A48195D05CB00B7D73C /* ASControlNode.m in Headers */,
 				058D0A49195D05CB00B7D73C /* ASControlNode+Subclasses.h in Headers */,
@@ -1071,7 +1071,7 @@
 				0574D5E219C110940097DC25 /* ASTableViewProtocols.h in Headers */,
 				055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */,
 				058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */,
-				9C204A641B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */,
+				9C204A641B86349B00313849 /* ASBaselinePositionedLayout.h in Headers */,
 				058D0A54195D05DC00B7D73C /* _ASDisplayLayer.mm in Headers */,
 				058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */,
 				058D0A56195D05DC00B7D73C /* _ASDisplayView.mm in Headers */,
@@ -1098,7 +1098,7 @@
 				058D0A67195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Headers */,
 				058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */,
 				205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */,
-				9C3061061B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */,
+				9C3061061B857EC400D0530B /* ASBaselineLayoutSpec.h in Headers */,
 				058D0A69195D05EC00B7D73C /* _ASAsyncTransaction.m in Headers */,
 				058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */,
 				058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */,
@@ -1164,7 +1164,7 @@
 				B35061FA1B010EFD0018CF92 /* ASControlNode+Subclasses.h in Headers */,
 				B35062371B010EFD0018CF92 /* ASTextNodeWordKerner.h in Headers */,
 				B35062261B010EFD0018CF92 /* ASRangeController.h in Headers */,
-				9C204A651B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */,
+				9C204A651B86349B00313849 /* ASBaselinePositionedLayout.h in Headers */,
 				B35062111B010EFD0018CF92 /* _ASDisplayView.h in Headers */,
 				B35061F81B010EFD0018CF92 /* ASControlNode.h in Headers */,
 				430E7C901B4C23F100697A4C /* ASIndexPath.h in Headers */,
@@ -1174,7 +1174,7 @@
 				B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */,
 				34EFC76C1B701CED00AD841F /* ASOverlayLayoutSpec.h in Headers */,
 				B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */,
-				9C3061071B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */,
+				9C3061071B857EC400D0530B /* ASBaselineLayoutSpec.h in Headers */,
 				B35062571B010F070018CF92 /* ASAssert.h in Headers */,
 				B35062411B010EFD0018CF92 /* _ASAsyncTransactionGroup.h in Headers */,
 				B350623C1B010EFD0018CF92 /* _ASAsyncTransaction.h in Headers */,
@@ -1218,7 +1218,7 @@
 				34EFC7631B701CBF00AD841F /* ASCenterLayoutSpec.h in Headers */,
 				B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */,
 				34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */,
-				9C204A6B1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */,
+				9C204A6B1B87803A00313849 /* ASBaselineLayoutable.h in Headers */,
 				509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */,
 				B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */,
 				B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */,
@@ -1441,7 +1441,7 @@
 				058D0A26195D050800B7D73C /* _ASCoreAnimationExtras.mm in Sources */,
 				058D0A23195D050800B7D73C /* _ASAsyncTransactionContainer.m in Sources */,
 				058D0A1E195D050800B7D73C /* ASTextNodeShadower.m in Sources */,
-				9C204A661B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */,
+				9C204A661B86349B00313849 /* ASBaselinePositionedLayout.mm in Sources */,
 				ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */,
 				058D0A18195D050800B7D73C /* _ASDisplayLayer.mm in Sources */,
 				ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */,
@@ -1480,7 +1480,7 @@
 				0549634A1A1EA066000F8E56 /* ASBasicImageDownloader.mm in Sources */,
 				058D0A14195D050800B7D73C /* ASDisplayNode.mm in Sources */,
 				058D0A1B195D050800B7D73C /* ASMutableAttributedStringBuilder.m in Sources */,
-				9C3061081B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */,
+				9C3061081B857EC400D0530B /* ASBaselineLayoutSpec.mm in Sources */,
 				058D0A2B195D050800B7D73C /* ASImageNode+CGExtras.m in Sources */,
 				058D0A24195D050800B7D73C /* _ASAsyncTransactionGroup.m in Sources */,
 				058D0A1C195D050800B7D73C /* ASTextNodeCoreTextAdditions.m in Sources */,
@@ -1542,10 +1542,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9C3061091B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */,
+				9C3061091B857EC400D0530B /* ASBaselineLayoutSpec.mm in Sources */,
 				34EFC7641B701CC600AD841F /* ASCenterLayoutSpec.mm in Sources */,
 				B350623B1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.m in Sources */,
-				9C204A671B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */,
+				9C204A671B86349B00313849 /* ASBaselinePositionedLayout.mm in Sources */,
 				B35062401B010EFD0018CF92 /* _ASAsyncTransactionContainer.m in Sources */,
 				B35062311B010EFD0018CF92 /* ASTextNodeRenderer.mm in Sources */,
 				B35062051B010EFD0018CF92 /* ASMultiplexImageNode.mm in Sources */,

AsyncDisplayKit/ASTextNode.h

@@ -7,7 +7,7 @@
  */
 
 #import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASBaselineStackLayoutable.h>
+#import <AsyncDisplayKit/ASBaselineLayoutable.h>
 
 
 @protocol ASTextNodeDelegate;
@@ -31,7 +31,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) {
  @abstract Draws interactive rich text.
  @discussion Backed by TextKit.
  */
-@interface ASTextNode : ASControlNode <ASBaselineStackLayoutable>
+@interface ASTextNode : ASControlNode <ASBaselineLayoutable>
 
 /**
  @abstract The attributed string to show.

AsyncDisplayKit/Layout/ASBaselineLayoutSpec.h

@@ -9,16 +9,16 @@
  */
 
 #import <AsyncDisplayKit/ASStackLayoutSpec.h>
-#import <AsyncDisplayKit/ASBaselineStackLayoutable.h>
+#import <AsyncDisplayKit/ASBaselineLayoutable.h>
 
-typedef NS_ENUM(NSUInteger, ASBaselineStackLayoutBaselineAlignment) {
+typedef NS_ENUM(NSUInteger, ASBaselineLayoutBaselineAlignment) {
   /** No baseline alignment. This is only valid for a vertical stack */
-  ASBaselineStackLayoutBaselineAlignmentNone,
+  ASBaselineLayoutBaselineAlignmentNone,
   /** Align all children to the first baseline. This is only valid for a horizontal stack */
-  ASBaselineStackLayoutBaselineAlignmentFirst,
+  ASBaselineLayoutBaselineAlignmentFirst,
   /** Align all children to the last baseline. This is useful when a text node wraps and you want to align
    to the bottom baseline. This is only valid for a horizontal stack */
-  ASBaselineStackLayoutBaselineAlignmentLast,
+  ASBaselineLayoutBaselineAlignmentLast,
 };
 
 
@@ -27,23 +27,23 @@ typedef struct {
   ASStackLayoutSpecStyle stackLayoutStyle;
   
   /** The type of baseline alignment */
-  ASBaselineStackLayoutBaselineAlignment baselineAlignment;
+  ASBaselineLayoutBaselineAlignment baselineAlignment;
-} ASBaselineStackLayoutSpecStyle;
+} ASBaselineLayoutSpecStyle;
 
 /**
  A specialized version of a stack layout that aligns its children on a baseline. This spec only works with
- ASBaselineStackLayoutable children. 
+ ASBaselineLayoutable children. 
  
  If the spec is created with a horizontal direction, the children will be laid on a common baseline.
  If the spec is created with a vertical direction, a child's vertical spacing will be measured from its
  baseline instead of from the child's bounding box.
 */
-@interface ASBaselineStackLayoutSpec : ASLayoutSpec <ASBaselineStackLayoutable>
+@interface ASBaselineLayoutSpec : ASLayoutSpec <ASBaselineLayoutable>
 
 /**
  @param style Specifies how children are laid out.
  @param children ASTextLayoutable children to be positioned.
  */
-+ (instancetype)newWithStyle:(ASBaselineStackLayoutSpecStyle)style children:(NSArray *)children;
++ (instancetype)newWithStyle:(ASBaselineLayoutSpecStyle)style children:(NSArray *)children;
 
 @end

AsyncDisplayKit/Layout/ASBaselineLayoutSpec.mm

@@ -8,7 +8,7 @@
  *
  */
 
-#import "ASBaselineStackLayoutSpec.h"
+#import "ASBaselineLayoutSpec.h"
 #import "ASStackLayoutable.h"
 
 #import <numeric>
@@ -21,13 +21,13 @@
 #import "ASStackLayoutSpecUtilities.h"
 #import "ASStackPositionedLayout.h"
 #import "ASStackUnpositionedLayout.h"
-#import "ASBaselineStackPositionedLayout.h"
+#import "ASBaselinePositionedLayout.h"
 #import "ASThread.h"
 
 
-@implementation ASBaselineStackLayoutSpec
+@implementation ASBaselineLayoutSpec
 {
-  ASBaselineStackLayoutSpecStyle _style;
+  ASBaselineLayoutSpecStyle _style;
   std::vector<id<ASStackLayoutable>> _stackChildren;
   ASDN::RecursiveMutex _propertyLock;
 }
@@ -35,16 +35,16 @@
 @synthesize ascender = _ascender;
 @synthesize descender = _descender;
 
-+ (instancetype)newWithStyle:(ASBaselineStackLayoutSpecStyle)style children:(NSArray *)children
++ (instancetype)newWithStyle:(ASBaselineLayoutSpecStyle)style children:(NSArray *)children
 {
-  ASDisplayNodeAssert((style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal && style.baselineAlignment != ASBaselineStackLayoutBaselineAlignmentNone) || style.stackLayoutStyle.direction == ASStackLayoutDirectionVertical, @"baselineAlignment is set to none. If you don't need baseline alignment please use ASStackLayoutSpec");
+  ASDisplayNodeAssert((style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal && style.baselineAlignment != ASBaselineLayoutBaselineAlignmentNone) || style.stackLayoutStyle.direction == ASStackLayoutDirectionVertical, @"baselineAlignment is set to none. If you don't need baseline alignment please use ASStackLayoutSpec");
   
-  ASBaselineStackLayoutSpec *spec = [super new];
+  ASBaselineLayoutSpec *spec = [super new];
   if (spec) {
     spec->_style = style;
     spec->_stackChildren = std::vector<id<ASStackLayoutable>>();
-    for (id<ASBaselineStackLayoutable> child in children) {
+    for (id<ASBaselineLayoutable> child in children) {
-      ASDisplayNodeAssert([child conformsToProtocol:@protocol(ASBaselineStackLayoutable)], @"child must conform to ASStackLayoutable");
+      ASDisplayNodeAssert([child conformsToProtocol:@protocol(ASBaselineLayoutable)], @"child must conform to ASStackLayoutable");
       
       spec->_stackChildren.push_back(child);
     }
@@ -63,7 +63,7 @@
   
   const auto unpositionedLayout = ASStackUnpositionedLayout::compute(_stackChildren, stackStyle, constrainedSize);
   const auto positionedLayout = ASStackPositionedLayout::compute(unpositionedLayout, stackStyle, constrainedSize);
-  const auto baselinePositionedLayout = ASBaselineStackPositionedLayout::compute(positionedLayout, _style, constrainedSize);
+  const auto baselinePositionedLayout = ASBaselinePositionedLayout::compute(positionedLayout, _style, constrainedSize);
   
   const CGSize finalSize = directionSize(stackStyle.direction, unpositionedLayout.stackDimensionSum, baselinePositionedLayout.crossSize);
   

AsyncDisplayKit/Layout/ASBaselineLayoutable.h

@@ -8,7 +8,7 @@
 
 #import "ASStackLayoutable.h"
 
-@protocol ASBaselineStackLayoutable <ASStackLayoutable>
+@protocol ASBaselineLayoutable <ASStackLayoutable>
 
 /**
  * @abstract The distance from the top of the layoutable object to its baseline

AsyncDisplayKit/Private/ASBaselinePositionedLayout.h

@@ -10,17 +10,17 @@
 
 #import "ASLayout.h"
 #import "ASDimension.h"
-#import "ASBaselineStackLayoutSpec.h"
+#import "ASBaselineLayoutSpec.h"
 #import "ASStackPositionedLayout.h"
 
-struct ASBaselineStackPositionedLayout {
+struct ASBaselinePositionedLayout {
     const std::vector<ASLayout *> sublayouts;
     const CGFloat crossSize;
     const CGFloat ascender;
     const CGFloat descender;
     
     /** Given a positioned layout, computes each child position using baseline alignment. */
-    static ASBaselineStackPositionedLayout compute(const ASStackPositionedLayout &positionedLayout,
+    static ASBaselinePositionedLayout compute(const ASStackPositionedLayout &positionedLayout,
-                                               const ASBaselineStackLayoutSpecStyle &style,
+                                               const ASBaselineLayoutSpecStyle &style,
                                                const ASSizeRange &constrainedSize);
 };

AsyncDisplayKit/Private/ASBaselinePositionedLayout.mm

@@ -8,39 +8,39 @@
  *
  */
 
-#import "ASBaselineStackPositionedLayout.h"
+#import "ASBaselinePositionedLayout.h"
 
 #import "ASLayoutSpecUtilities.h"
 #import "ASStackLayoutSpecUtilities.h"
 
-static CGFloat baselineForItem(const ASBaselineStackLayoutSpecStyle &style,
+static CGFloat baselineForItem(const ASBaselineLayoutSpecStyle &style,
                                const ASLayout *layout) {
   
-  __weak id<ASBaselineStackLayoutable> child = (id<ASBaselineStackLayoutable>) layout.layoutableObject;
+  __weak id<ASBaselineLayoutable> child = (id<ASBaselineLayoutable>) layout.layoutableObject;
   switch (style.baselineAlignment) {
-    case ASBaselineStackLayoutBaselineAlignmentNone:
+    case ASBaselineLayoutBaselineAlignmentNone:
       return 0;
-    case ASBaselineStackLayoutBaselineAlignmentFirst:
+    case ASBaselineLayoutBaselineAlignmentFirst:
       return child.ascender;
-    case ASBaselineStackLayoutBaselineAlignmentLast:
+    case ASBaselineLayoutBaselineAlignmentLast:
       return layout.size.height + child.descender;
   }
   
 }
 
-static CGFloat baselineOffset(const ASBaselineStackLayoutSpecStyle &style,
+static CGFloat baselineOffset(const ASBaselineLayoutSpecStyle &style,
                               const ASLayout *l,
                               const CGFloat maxAscender,
                               const CGFloat maxBaseline)
 {
   if (style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal) {
-    __weak id<ASBaselineStackLayoutable> child = (id<ASBaselineStackLayoutable>)l.layoutableObject;
+    __weak id<ASBaselineLayoutable> child = (id<ASBaselineLayoutable>)l.layoutableObject;
     switch (style.baselineAlignment) {
-      case ASBaselineStackLayoutBaselineAlignmentFirst:
+      case ASBaselineLayoutBaselineAlignmentFirst:
         return maxAscender - child.ascender;
-      case ASBaselineStackLayoutBaselineAlignmentLast:
+      case ASBaselineLayoutBaselineAlignmentLast:
         return maxBaseline - baselineForItem(style, l);
-      case ASBaselineStackLayoutBaselineAlignmentNone:
+      case ASBaselineLayoutBaselineAlignmentNone:
         return 0;
     }
   }
@@ -55,8 +55,8 @@ static CGFloat maxDimensionForLayout(const ASLayout *l,
   return maxDimension;
 }
 
-ASBaselineStackPositionedLayout ASBaselineStackPositionedLayout::compute(const ASStackPositionedLayout &positionedLayout,
+ASBaselinePositionedLayout ASBaselinePositionedLayout::compute(const ASStackPositionedLayout &positionedLayout,
-                                                                 const ASBaselineStackLayoutSpecStyle &style,
+                                                                 const ASBaselineLayoutSpecStyle &style,
                                                                  const ASSizeRange &constrainedSize)
 {
   ASStackLayoutSpecStyle stackStyle = style.stackLayoutStyle;
@@ -91,9 +91,9 @@ ASBaselineStackPositionedLayout ASBaselineStackPositionedLayout::compute(const A
     our layoutSpec to have it so that it can be baseline aligned with another text node or baseline layout spec.
    */
   const auto ascenderIt = std::max_element(positionedLayout.sublayouts.begin(), positionedLayout.sublayouts.end(), [&](const ASLayout *a, const ASLayout *b){
-    return ((id<ASBaselineStackLayoutable>)a.layoutableObject).ascender < ((id<ASBaselineStackLayoutable>)b.layoutableObject).ascender;
+    return ((id<ASBaselineLayoutable>)a.layoutableObject).ascender < ((id<ASBaselineLayoutable>)b.layoutableObject).ascender;
   });
-  const CGFloat maxAscender = baselineIt == positionedLayout.sublayouts.end() ? 0 : ((id<ASBaselineStackLayoutable>)(*ascenderIt).layoutableObject).ascender;
+  const CGFloat maxAscender = baselineIt == positionedLayout.sublayouts.end() ? 0 : ((id<ASBaselineLayoutable>)(*ascenderIt).layoutableObject).ascender;
   
   /*
     Step 3: Take each child and update its layout position based on the baseline offset.
@@ -106,7 +106,7 @@ ASBaselineStackPositionedLayout ASBaselineStackPositionedLayout::compute(const A
   CGPoint p = CGPointZero;
   BOOL first = YES;
   auto stackedChildren = AS::map(positionedLayout.sublayouts, [&](ASLayout *l) -> ASLayout *{
-    __weak id<ASBaselineStackLayoutable> child = (id<ASBaselineStackLayoutable>) l.layoutableObject;
+    __weak id<ASBaselineLayoutable> child = (id<ASBaselineLayoutable>) l.layoutableObject;
     p = p + directionPoint(stackStyle.direction, child.spacingBefore, 0);
     if (first) {
       // if this is the first item use the previously computed start point
@@ -156,7 +156,7 @@ ASBaselineStackPositionedLayout ASBaselineStackPositionedLayout::compute(const A
   const auto descenderIt = std::max_element(stackedChildren.begin(), stackedChildren.end(), [&](const ASLayout *a, const ASLayout *b){
     return  a.position.y + a.size.height <  b.position.y + b.size.height;
   });
-  const CGFloat minDescender = descenderIt == stackedChildren.end() ? 0 : ((id<ASBaselineStackLayoutable>)(*descenderIt).layoutableObject).descender;
+  const CGFloat minDescender = descenderIt == stackedChildren.end() ? 0 : ((id<ASBaselineLayoutable>)(*descenderIt).layoutableObject).descender;
 
   return {stackedChildren, crossSize, maxAscender, minDescender};
 }