Changeset 350

Show
Ignore:
Timestamp:
11/16/08 11:02:24 (2 months ago)
Author:
wolf
Message:

[NEW] Markdown 1.4.1: Upgraded to discount 1.3.0, which solves a bunch of crashers.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cocoa/MarkdownLive/Info.plist

    r333 r350  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 
     2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 
    33<plist version="1.0"> 
    44<dict> 
    …… 
    4141        <string>????</string> 
    4242        <key>CFBundleVersion</key> 
    43         <string>1.4</string> 
     43        <string>1.4.1</string> 
    4444        <key>CFBundleShortVersionString</key> 
    45         <string>1.4</string> 
     45        <string>1.4.1</string> 
    4646        <key>NSMainNibFile</key> 
    4747        <string>MainMenu</string> 

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

    r333 r350  
    88 
    99/* Begin PBXBuildFile section */ 
    10                 79252FF20E8E080100DFAD98 /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 79252FF10E8E080100DFAD98 /* generate.c */; }; 
    1110                792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 792530EF0E8F40F200DFAD98 /* discountWrapper.m */; }; 
    12                 792530FB0E8F49CE00DFAD98 /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 792530FA0E8F49CE00DFAD98 /* mkdio.c */; }; 
    13                 792530FF0E8F49E800DFAD98 /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 792530FE0E8F49E800DFAD98 /* markdown.c */; }; 
    14                 792531010E8F4A0900DFAD98 /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 792531000E8F4A0900DFAD98 /* resource.c */; }; 
    1511                792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 792531460E8F4CD800DFAD98 /* mkdioWrapper.c */; }; 
    1612                7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */; }; 
    1713                796A2AD80A20DCEE00440275 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 796A2AD70A20DCEE00440275 /* WebKit.framework */; }; 
     14                797EF6930ED0EB5400B28F7A /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF68F0ED0EB5400B28F7A /* resource.c */; }; 
     15                797EF6940ED0EB5400B28F7A /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6900ED0EB5400B28F7A /* generate.c */; }; 
     16                797EF6950ED0EB5400B28F7A /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6910ED0EB5400B28F7A /* markdown.c */; }; 
     17                797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6920ED0EB5400B28F7A /* mkdio.c */; }; 
    1818                79F7EF740AC39638003DAB4E /* MarkdownLiveApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */; }; 
    1919                8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; }; 
    …… 
    3939                2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 
    4040                32DBCF750370BD2300C91783 /* MarkdownLive_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkdownLive_Prefix.pch; sourceTree = "<group>"; }; 
    41                 79252FF10E8E080100DFAD98 /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = generate.c; path = "discount-1.2.10/generate.c"; sourceTree = "<group>"; }; 
    4241                792530EE0E8F40F200DFAD98 /* discountWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = discountWrapper.h; sourceTree = "<group>"; }; 
    4342                792530EF0E8F40F200DFAD98 /* discountWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = discountWrapper.m; sourceTree = "<group>"; }; 
    44                 792530FA0E8F49CE00DFAD98 /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mkdio.c; path = "discount-1.2.10/mkdio.c"; sourceTree = "<group>"; }; 
    45                 792530FE0E8F49E800DFAD98 /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = markdown.c; path = "discount-1.2.10/markdown.c"; sourceTree = "<group>"; }; 
    46                 792531000E8F4A0900DFAD98 /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource.c; path = "discount-1.2.10/resource.c"; sourceTree = "<group>"; }; 
    4743                792531450E8F4CD800DFAD98 /* mkdioWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mkdioWrapper.h; sourceTree = "<group>"; }; 
    4844                792531460E8F4CD800DFAD98 /* mkdioWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdioWrapper.c; sourceTree = "<group>"; }; 
    …… 
    5046                7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdownWrapper.c; sourceTree = "<group>"; }; 
    5147                796A2AD70A20DCEE00440275 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; }; 
     48                797EF68F0ED0EB5400B28F7A /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource.c; path = "discount-1.3.0/resource.c"; sourceTree = "<group>"; }; 
     49                797EF6900ED0EB5400B28F7A /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = generate.c; path = "discount-1.3.0/generate.c"; sourceTree = "<group>"; }; 
     50                797EF6910ED0EB5400B28F7A /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = markdown.c; path = "discount-1.3.0/markdown.c"; sourceTree = "<group>"; }; 
     51                797EF6920ED0EB5400B28F7A /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mkdio.c; path = "discount-1.3.0/mkdio.c"; sourceTree = "<group>"; }; 
    5252                79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = MarkdownLiveApp.icns; sourceTree = "<group>"; }; 
    5353                8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 
    …… 
    157157                                792531490E8F4E4D00DFAD98 /* markdownWrapper.h */, 
    158158                                7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */, 
    159                                 792530FA0E8F49CE00DFAD98 /* mkdio.c */, 
    160                                 792530FE0E8F49E800DFAD98 /* markdown.c */, 
    161                                 79252FF10E8E080100DFAD98 /* generate.c */, 
    162                                 792531000E8F4A0900DFAD98 /* resource.c */, 
     159                                797EF68F0ED0EB5400B28F7A /* resource.c */, 
     160                                797EF6900ED0EB5400B28F7A /* generate.c */, 
     161                                797EF6910ED0EB5400B28F7A /* markdown.c */, 
     162                                797EF6920ED0EB5400B28F7A /* mkdio.c */, 
    163163                        ); 
    164164                        name = discount; 
    …… 
    225225                                8D15AC310486D014006FF6A4 /* MyDocument.m in Sources */, 
    226226                                8D15AC320486D014006FF6A4 /* main.m in Sources */, 
    227                                 79252FF20E8E080100DFAD98 /* generate.c in Sources */, 
    228227                                792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */, 
    229                                 792530FB0E8F49CE00DFAD98 /* mkdio.c in Sources */, 
    230                                 792530FF0E8F49E800DFAD98 /* markdown.c in Sources */, 
    231                                 792531010E8F4A0900DFAD98 /* resource.c in Sources */, 
    232228                                792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */, 
    233229                                7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */, 
     230                                797EF6930ED0EB5400B28F7A /* resource.c in Sources */, 
     231                                797EF6940ED0EB5400B28F7A /* generate.c in Sources */, 
     232                                797EF6950ED0EB5400B28F7A /* markdown.c in Sources */, 
     233                                797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */, 
    234234                        ); 
    235235                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    308308                        isa = XCBuildConfiguration; 
    309309                        buildSettings = { 
    310                                 GCC_TREAT_WARNINGS_AS_ERRORS = YES; 
    311310                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    312311                                GCC_WARN_UNUSED_VARIABLE = YES; 
    …… 
    319318                        isa = XCBuildConfiguration; 
    320319                        buildSettings = { 
    321                                 GCC_TREAT_WARNINGS_AS_ERRORS = YES; 
    322320                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    323321                                GCC_WARN_UNUSED_VARIABLE = YES; 

  • trunk/cocoa/MarkdownLive/MyDocument.m

    r333 r350  
    4747    if (!engagedAutosave) { 
    4848        engagedAutosave = YES; 
    49         [[NSDocumentController sharedDocumentController] setAutosavingDelay:30.0]; 
     49        [[NSDocumentController sharedDocumentController] setAutosavingDelay:5.0]; 
    5050    } 
    5151    [super windowControllerDidLoadNib:controller_]; 

  • trunk/cocoa/MarkdownLive/discountWrapper.m

    r333 r350  
    22 
    33#define Line discountLine 
    4 #include "discount-1.2.10/markdown.h" 
     4#include "discount-1.3.0/markdown.h" 
    55#undef Line 
    66 

  • trunk/cocoa/MarkdownLive/markdownWrapper.c

    r333 r350  
    22 
    33#include <stdio.h> 
    4 #include "discount-1.2.10/markdown.h" 
     4#include "discount-1.3.0/markdown.h" 
    55 
    66int mkd_compile_wrapper(Document *doc, int flags) { 

  • trunk/cocoa/MarkdownLive/mkdioWrapper.c

    r333 r350  
    11//#include "mkdioWrapper.h" 
    2 #include "discount-1.2.10/mkdio.h" 
     2#include "discount-1.3.0/mkdio.h" 
    33 
    44#define Document void