Skip to content

Commit

Permalink
Merge branch 'release-0.2.0'
Browse files Browse the repository at this point in the history
Conflicts:
	DTMarkdownParser.xcodeproj/project.pbxproj
  • Loading branch information
odrobnik committed Nov 3, 2013
2 parents 36de3a6 + a5388d2 commit 6e83e02
Show file tree
Hide file tree
Showing 30 changed files with 4,722 additions and 898 deletions.
45 changes: 45 additions & 0 deletions AppledocSettings.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?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>--project-name</key>
<string>DTMarkdownParser</string>
<key>--project-company</key>
<string>Cocoanetics</string>
<key>--project-version</key>
<string>0.2</string>
<key>--company-id</key>
<string>com.cocoanetics</string>
<key>--docset-atom-filename</key>
<string>DTMarkdownParser.atom</string>
<key>--docset-feed-url</key>
<string>https://docs.cocoanetics.com/DTMarkdownParser/%DOCSETATOMFILENAME</string>
<key>--docset-package-url</key>
<string>https://docs.cocoanetics.com/DTMarkdownParser/%DOCSETPACKAGEFILENAME</string>
<key>--docset-fallback-url</key>
<string>https://docs.cocoanetics.com/DTMarkdownParser/</string>
<key>--create-docset</key>
<true/>
<key>--publish-docset</key>
<true/>
<key>--install-docset</key>
<false/>
<key>--logformat</key>
<string>xcode</string>
<key>--keep-intermediate-files</key>
<true/>
<key>--no-repeat-first-par</key>
<true/>
<key>--ignore</key>
<array>
<string>*.m</string>
<string>Externals</string>
<string>Demo</string>
<string>Test</string>
</array>
<key>--index-desc</key>
<string>Readme.markdown</string>
<key>--warn-invalid-crossref</key>
<false/>
</dict>
</plist>
10 changes: 9 additions & 1 deletion Core/Source/DTMarkdownParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright (c) 2013 Cocoanetics. All rights reserved.
//

#import "DTWeakSupport.h"

@class DTMarkdownParser;

/**
Expand Down Expand Up @@ -51,6 +53,9 @@

@end

/**
Parsing options for DTMarkdownParser
*/
typedef NS_ENUM(NSUInteger, DTMarkdownParserOptions)
{
/**
Expand All @@ -59,6 +64,9 @@ typedef NS_ENUM(NSUInteger, DTMarkdownParserOptions)
DTMarkdownParserOptionGitHubLineBreaks = 1<<0
};

/**
DTMarkdownParser is an event-based parser for Markdown. It is modeled after `NSXMLParser` and events can be used to generate HTML or other structured output formats.
*/

@interface DTMarkdownParser : NSObject

Expand All @@ -75,7 +83,7 @@ typedef NS_ENUM(NSUInteger, DTMarkdownParserOptions)
/**
Parsing Delegate
*/
@property (nonatomic, weak) id <DTMarkdownParserDelegate> delegate;
@property (nonatomic, DT_WEAK_PROPERTY) id <DTMarkdownParserDelegate> delegate;

/**
Starts the event-driven parsing operation.
Expand Down
Loading

0 comments on commit 6e83e02

Please sign in to comment.