danieleggert · JanX2 · Nov 18, 2012 · Nov 18, 2012 · Nov 19, 2012 · Nov 25, 2012
diff --git a/App/en.lproj/BOViewController.xib → App/Base.lproj/BOViewController.xib b/App/en.lproj/BOViewController.xib → App/Base.lproj/BOViewController.xib
diff --git a/App/MarkdownParser-Info.plist b/App/MarkdownParser-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>dk.boedewadt.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/MarkdownParser.xcodeproj/project.pbxproj b/MarkdownParser.xcodeproj/project.pbxproj
diff --git a/MarkdownParser.xcodeproj/xcshareddata/xcschemes/MarkdownParser.xcscheme b/MarkdownParser.xcodeproj/xcshareddata/xcschemes/MarkdownParser.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -55,22 +55,30 @@
       </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3EB17EA0161F189F00A27750"
+            BuildableName = "libMarkdownParser.a"
+            BlueprintName = "MarkdownParser"
+            ReferencedContainer = "container:MarkdownParser.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction

diff --git a/MarkdownParser.xcodeproj/xcshareddata/xcschemes/MarkdownParserApp.xcscheme b/MarkdownParser.xcodeproj/xcshareddata/xcschemes/MarkdownParserApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,19 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3EB17E3B161F17B100A27750"
+            BuildableName = "MarkdownParserApp.app"
+            BlueprintName = "MarkdownParserApp"
+            ReferencedContainer = "container:MarkdownParser.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,26 +48,19 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3EB17E3B161F17B100A27750"
-            BuildableName = "MarkdownParserApp.app"
-            BlueprintName = "MarkdownParserApp"
-            ReferencedContainer = "container:MarkdownParser.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3EB17E3B161F17B100A27750"
@@ -67,16 +69,15 @@
             ReferencedContainer = "container:MarkdownParser.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3EB17E3B161F17B100A27750"

diff --git a/MarkdownParserMac/MarkdownParserMac-Info.plist b/MarkdownParserMac/MarkdownParserMac-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2012 Bödewadt. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/MarkdownParserMac/MarkdownParserMac-Prefix.pch b/MarkdownParserMac/MarkdownParserMac-Prefix.pch
@@ -0,0 +1,8 @@
+//
+// Prefix header for all source files of the 'MarkdownParserMac' target in the 'MarkdownParserMac' project
+//
+
+#ifdef __OBJC__
+	#import <Foundation/Foundation.h>
+	#import "OS-X-ObjC-Compatibility.h"
+#endif
diff --git a/MarkdownParserMac/NSFont+UIKitAdditions.h b/MarkdownParserMac/NSFont+UIKitAdditions.h
@@ -0,0 +1,17 @@
+//
+//  NSFont+UIKitAdditions.h
+//  MarkdownParser
+//
+//  Created by Jan on 18.11.12.
+//  Copyright (c) 2012 Bödewadt. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+@interface NSFont (UIKitAdditions)
+
++ (NSFont *)italicSystemFontOfSize:(CGFloat)size;
+
+- (NSFont *)fontWithSize:(CGFloat)size;
+
+@end
diff --git a/MarkdownParserMac/NSFont+UIKitAdditions.m b/MarkdownParserMac/NSFont+UIKitAdditions.m
@@ -0,0 +1,27 @@
+//
+//  NSFont+UIKitAdditions.m
+//  MarkdownParser
+//
+//  Created by Jan on 18.11.12.
+//  Copyright (c) 2012 Bödewadt. All rights reserved.
+//
+
+#import "NSFont+UIKitAdditions.h"
+
+@implementation NSFont (UIKitAdditions)
+
+// This can’t work, because no italic version of Lucida Grande is available!
++ (NSFont *)italicSystemFontOfSize:(CGFloat)size;
+{
+	NSFont *baseFont = [NSFont systemFontOfSize:((size == 0) ? [NSFont systemFontSize] : size)];
+	return [[NSFontManager sharedFontManager] convertFont:baseFont toHaveTrait:NSItalicFontMask];
+}
+
+- (NSFont *)fontWithSize:(CGFloat)size;
+{
+	NSFontDescriptor *fontDescriptor = [self fontDescriptor];
+	return [NSFont fontWithDescriptor:fontDescriptor size:((size == 0) ? [NSFont systemFontSize] : size)];
+}
+
+
+@end
diff --git a/MarkdownParserMac/en.lproj/InfoPlist.strings b/MarkdownParserMac/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/MarkdownParserMacTests/MarkdownParserMacTests-Info.plist b/MarkdownParserMacTests/MarkdownParserMacTests-Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/MarkdownParserMacTests/MarkdownParserMacTests-Prefix.pch b/MarkdownParserMacTests/MarkdownParserMacTests-Prefix.pch
@@ -0,0 +1,8 @@
+//
+// Prefix header for all source files of the 'MarkdownParserMacTests' target in the 'MarkdownParserMacTests' project
+//
+
+#ifdef __OBJC__
+	#import <Foundation/Foundation.h>
+	#import "OS-X-ObjC-Compatibility.h"
+#endif
diff --git a/MarkdownParserMacTests/en.lproj/InfoPlist.strings b/MarkdownParserMacTests/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/Source/BOMarkdownParser.h b/Source/BOMarkdownParser.h
@@ -8,6 +8,10 @@
 
 #import <Foundation/Foundation.h>
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+    #import "OS-X-ObjC-Compatibility.h"
+#endif
+
 @class UIFont;
 @class UIColor;
 @class NSMutableParagraphStyle;

diff --git a/Source/BOMarkdownParser.m b/Source/BOMarkdownParser.m
@@ -9,7 +9,11 @@
 #import "BOMarkdownParser.h"
 
 #import "NSAttributedString+Markdown.h"
-#import <UIKit/UIKit.h>
+#if TARGET_OS_IPHONE
+    #import <UIKit/UIKit.h>
+#else
+    #import <AppKit/AppKit.h>
+#endif
 
 #import "markdown.h"
 #import "buffer.h"
@@ -26,7 +30,7 @@ @interface BOMarkdownParser (Private)
 
 - (void)setupAttributes;
 - (void)preParseSetupAttributes;
-- (void)addAttribtuesToAttributedString:(NSMutableAttributedString *)output;
+- (void)addAttributesToAttributedString:(NSMutableAttributedString *)output;
 
 @end
 
@@ -153,7 +157,7 @@ - (NSAttributedString *)parseString:(NSString *)input;
     [_output appendAttributedString:[[NSAttributedString alloc] initWithString:bufferString attributes:baseAttributes]];
 
     [_output beginEditing];
-    [self addAttribtuesToAttributedString:_output];
+    [self addAttributesToAttributedString:_output];
     [_output endEditing];
 
     NSAttributedString *result = [_output copy];
@@ -182,7 +186,9 @@ - (void)setupAttributes;
     self.listAttributes = @{NSParagraphStyleAttributeName: listParagraph};
     self.listItemAttributes = @{};
 
-    self.font = [UIFont systemFontOfSize:[UIFont systemFontSize]];
+#if TARGET_OS_IPHONE
+    CGFloat defaultSize = [UIFont systemFontSize];
+    self.font = [UIFont systemFontOfSize:defaultSize];
     self.textColor = [UIColor blackColor];
 
     self.emphasizeFont = ^(UIFont *originalFont){
@@ -194,6 +200,19 @@ - (void)setupAttributes;
         CGFloat size = originalFont.pointSize;
         return [UIFont boldSystemFontOfSize:size];
     };
+#else
+    CGFloat defaultSize = [UIFont systemFontSize];
+    self.font = [UIFont fontWithName:@"Helvetica" size:defaultSize];
+    self.textColor = [UIColor blackColor];
+
+    self.emphasizeFont = ^(UIFont *originalFont){
+        return [[NSFontManager sharedFontManager] convertFont:originalFont toHaveTrait:NSItalicFontMask];
+    };
+
+    self.doubleEmphasizeFont = ^(UIFont *originalFont){
+        return [[NSFontManager sharedFontManager] convertFont:originalFont toHaveTrait:NSBoldFontMask];
+    };
+#endif
 
     self.replaceLinkFont = self.doubleEmphasizeFont;
 }
@@ -230,7 +249,7 @@ - (void)preParseSetupAttributes;
     self.currentHeaderAttributes = self.headerAttributes;
 }
 
-- (void)addAttribtuesToAttributedString:(NSMutableAttributedString *)output;
+- (void)addAttributesToAttributedString:(NSMutableAttributedString *)output;
 {
     [output updateFontAttributeInRangesWithStartMarker:startEmphMarker endMarker:endEmphMarker usingBlock:self.emphasizeFont];
     [output updateFontAttributeInRangesWithStartMarker:startDoubleEmphMarker endMarker:endDoubleEmphMarker usingBlock:self.doubleEmphasizeFont];

diff --git a/Source/NSAttributedString+Markdown.m b/Source/NSAttributedString+Markdown.m
@@ -10,8 +10,11 @@
 #import "NSAttributedString+Markdown.h"
 
 #import <libkern/OSAtomic.h>
-#import <UIKit/UIKit.h>
-
+#if TARGET_OS_IPHONE
+    #import <UIKit/UIKit.h>
+#else
+    #import <AppKit/AppKit.h>
+#endif
 
 
 @implementation NSMutableAttributedString (BOMarkers)

diff --git a/Source/OS-X-ObjC-Compatibility.h b/Source/OS-X-ObjC-Compatibility.h
@@ -0,0 +1,32 @@
+#ifndef _OS_X_OBJC_COMPATIBILITY_H_
+#define _OS_X_OBJC_COMPATIBILITY_H_
+
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+
+#import <MarkdownParserMac/NSFont+UIKitAdditions.h>
+
+
+// Types
+#define UIImage			NSImage
+#define UIFont			NSFont
+#define UIColor			NSColor
+
+#define CGSize			NSSize
+#define CGPoint			NSPoint
+#define CGRect			NSRect
+
+// Functions
+#define CGSizeMake		NSMakeSize
+#define CGPointMake		NSMakePoint
+#define CGRectMake		NSMakeRect
+#define CGRectDivide	NSDivideRect
+
+// Constants
+#define CGRectMinXEdge	NSMinXEdge
+#define CGRectMinYEdge	NSMinYEdge
+#define CGRectMaxXEdge	NSMaxXEdge
+#define CGRectMaxYEdge	NSMaxYEdge
+
+#endif
+
+#endif /* _OS_X_OBJC_COMPATIBILITY_H_ */