Changeset 329

Show
Ignore:
Timestamp:
09/26/08 05:19:09 (4 months ago)
Author:
wolf
Message:

[DEV] MarkdownLive?: start converting to discount. Currently broken due to discount's source using Line, which conflicts with QuickDraw?'s Line. Currently trying to figure out how to work-around that.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cocoa/MarkdownLive/MarkdownLive.xcodeproj/project.pbxproj

    r316 r329  
    1010                796A2AD80A20DCEE00440275 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 796A2AD70A20DCEE00440275 /* WebKit.framework */; }; 
    1111                7972D9090E42AF6100BF53B8 /* NSTask+runMaruku.m in Sources */ = {isa = PBXBuildFile; fileRef = 7972D9080E42AF6100BF53B8 /* NSTask+runMaruku.m */; }; 
    12                 7972DA280E42B00E00BF53B8 /* maruku-0.5.9 in Resources */ = {isa = PBXBuildFile; fileRef = 7972D91E0E42B00E00BF53B8 /* maruku-0.5.9 */; }; 
     12                7979D3260E8D4BFF00768BE3 /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 7979D2F20E8D4BFF00768BE3 /* markdown.c */; }; 
     13                7979D32A0E8D4BFF00768BE3 /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 7979D2F70E8D4BFF00768BE3 /* mkdio.c */; }; 
     14                7979D32C0E8D4BFF00768BE3 /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 7979D2FA0E8D4BFF00768BE3 /* resource.c */; }; 
    1315                79F7EF740AC39638003DAB4E /* MarkdownLiveApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */; }; 
    1416                8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; }; 
    …… 
    3739                7972D9070E42AF6100BF53B8 /* NSTask+runMaruku.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTask+runMaruku.h"; sourceTree = "<group>"; }; 
    3840                7972D9080E42AF6100BF53B8 /* NSTask+runMaruku.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTask+runMaruku.m"; sourceTree = "<group>"; }; 
    39                 7972D91E0E42B00E00BF53B8 /* maruku-0.5.9 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "maruku-0.5.9"; sourceTree = "<group>"; }; 
     41                7979D2F20E8D4BFF00768BE3 /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdown.c; sourceTree = "<group>"; }; 
     42                7979D2F30E8D4BFF00768BE3 /* markdown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markdown.h; sourceTree = "<group>"; }; 
     43                7979D2F70E8D4BFF00768BE3 /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdio.c; sourceTree = "<group>"; }; 
     44                7979D2F80E8D4BFF00768BE3 /* mkdio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mkdio.h; sourceTree = "<group>"; }; 
     45                7979D2FA0E8D4BFF00768BE3 /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resource.c; sourceTree = "<group>"; }; 
    4046                79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = MarkdownLiveApp.icns; sourceTree = "<group>"; }; 
    4147                8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 
    …… 
    8793                        children = ( 
    8894                                2A37F4ABFDCFA73011CA2CEA /* Classes */, 
     95                                7979D2E10E8D4BFF00768BE3 /* discount-1.2.10 */, 
    8996                                2A37F4AFFDCFA73011CA2CEA /* Other Sources */, 
    9097                                2A37F4B8FDCFA73011CA2CEA /* Resources */, 
    …… 
    118125                        isa = PBXGroup; 
    119126                        children = ( 
    120                                 7972D91E0E42B00E00BF53B8 /* maruku-0.5.9 */, 
    121127                                79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */, 
    122128                                2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, 
    …… 
    136142                        ); 
    137143                        name = Frameworks; 
     144                        sourceTree = "<group>"; 
     145                }; 
     146                7979D2E10E8D4BFF00768BE3 /* discount-1.2.10 */ = { 
     147                        isa = PBXGroup; 
     148                        children = ( 
     149                                7979D2F20E8D4BFF00768BE3 /* markdown.c */, 
     150                                7979D2F30E8D4BFF00768BE3 /* markdown.h */, 
     151                                7979D2F70E8D4BFF00768BE3 /* mkdio.c */, 
     152                                7979D2F80E8D4BFF00768BE3 /* mkdio.h */, 
     153                                7979D2FA0E8D4BFF00768BE3 /* resource.c */, 
     154                        ); 
     155                        path = "discount-1.2.10"; 
    138156                        sourceTree = "<group>"; 
    139157                }; 
    …… 
    186204                                8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, 
    187205                                79F7EF740AC39638003DAB4E /* MarkdownLiveApp.icns in Resources */, 
    188                                 7972DA280E42B00E00BF53B8 /* maruku-0.5.9 in Resources */, 
    189206                        ); 
    190207                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    200217                                8D15AC320486D014006FF6A4 /* main.m in Sources */, 
    201218                                7972D9090E42AF6100BF53B8 /* NSTask+runMaruku.m in Sources */, 
     219                                7979D3260E8D4BFF00768BE3 /* markdown.c in Sources */, 
     220                                7979D32A0E8D4BFF00768BE3 /* mkdio.c in Sources */, 
     221                                7979D32C0E8D4BFF00768BE3 /* resource.c in Sources */, 
    202222                        ); 
    203223                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/cocoa/MarkdownLive/MyDocument.m

    r316 r329  
    11#import "MyDocument.h" 
    22#import "NSTask+runMaruku.h" 
     3#include "markdown.h" 
    34 
    45NSString        *kMarkdownDocumentType = @"MarkdownDocumentType"; 
    …… 
    1516     
    1617    NSError *error = nil; 
     18#if 1 
     19     
     20#else 
    1721    NSString *html = [NSTask runMarukuWithInput:markdown_ error:&error]; 
     22#endif 
    1823    if (error) { 
    1924        [NSApp presentError:error];