Merge branch 'hotfix/1.4.1'

CEAppController.m

@@ -206,7 +206,8 @@ + (void)initialize
                 k_key_showColoringIndicatorTextLength: @115000U, 
                 k_key_runAppleScriptInLaunching: @YES, 
                 k_key_showAlertForNotWritable: @YES, 
-                k_key_notifyEditByAnother: @YES};
+                k_key_notifyEditByAnother: @YES,
+                k_key_enableSmartQuotes: @NO};
     [[NSUserDefaults standardUserDefaults] registerDefaults:theDefaults];
     [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:theDefaults];
 

CEEditorView.m

@@ -743,7 +743,7 @@ - (void)updateDocumentInfoStringWithDrawerForceUpdate:(BOOL)inBool
     NSString *theString = ([self lineEndingCharacter] == OgreCrLfNewlineCharacter) ? [self stringForSave] : [self string];
     NSString *singleCharInfo = nil;
     NSRange selectedRange = [self selectedRange];
-    NSUInteger numberOfLines = 0, currentLine = 0, length = [theString length];
+    NSUInteger numberOfLines = 0, currentLine = 0, index = 0, length = [theString length];
     NSUInteger lineStart = 0, countInLine = 0;
 
     // IM で変換途中の文字列は選択範囲としてカウントしない (2007.05.20)
@@ -754,7 +754,7 @@ - (void)updateDocumentInfoStringWithDrawerForceUpdate:(BOOL)inBool
         lineStart = [theString lineRangeForRange:selectedRange].location;
         countInLine = selectedRange.location - lineStart;
 
-        for (NSUInteger index = 0, numberOfLines = 0; index < length; numberOfLines++) {
+        for (index = 0, numberOfLines = 0; index < length; numberOfLines++) {
             if (index <= selectedRange.location) {
                 currentLine = numberOfLines + 1;
             }

CETextViewCore.m

@@ -192,6 +192,8 @@ - (instancetype)initWithFrame:(NSRect)inFrame textContainer:(NSTextContainer *)i
         [self setIsSelfDrop:NO];
         [self setIsReadingFromPboard:NO];
         [self setHighlightLineAdditionalRect:NSZeroRect];
+        [self setAutomaticDashSubstitutionEnabled:[[NSUserDefaults standardUserDefaults] boolForKey:k_key_enableSmartQuotes]];
+        [self setAutomaticQuoteSubstitutionEnabled:[[NSUserDefaults standardUserDefaults] boolForKey:k_key_enableSmartQuotes]];
     }
 
     return self;

Info.plist

@@ -77,11 +77,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleVersion</key>
-	<string>1.4</string>
+	<string>1.4.1</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>NSMainNibFile</key>

constants.h

@@ -149,6 +149,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define k_key_runAppleScriptInLaunching     @"runAppleScriptInLaunching"
 #define k_key_showAlertForNotWritable       @"showAlertForNotWritable"
 #define k_key_notifyEditByAnother       @"notifyEditByAnother"
+#define k_key_enableSmartQuotes         @"enableSmartQuotes"
 
 
 // transparencyController

en.lproj/Version History.rtf

@@ -1,5 +1,5 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
-\readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+\readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;\red103\green103\blue103;}
 \paperw12240\paperh15840\vieww13460\viewh12280\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
@@ -15,6 +15,31 @@
 \fs24 \cf0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
+\b\fs26 \cf0 1.4.1 [2014-03-22]\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\b0 \cf0 \ul \ulc0 <New Features>\ulnone \
+(None)\
+\
+\ul <Additions/Changes>\ulnone \
+*  Disabled smart dash/quotes feature of Mavericks as default.\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs24 \cf0     * for advanced users: Run \'93
+\f1 defaults write com.aynimac.CotEditor enableSmartQuotes YES
+\f0 \'93
+\f1  
+\f0 in Terminal to enable this feature again.\
+    * On the next CotEditor 1.5, this feature will be able to be changed on Preferences.
+\fs26 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ul \ulc0 <Fixes>\ulnone \
+*  Fix an issue on ver. 1.4 that line count was always zero.\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs24 \cf0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
 \b\fs26 \cf0 1.4 [2014-03-19]\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
@@ -62,7 +87,7 @@
 \fs24 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf2 \
- 1. \cf2 The regular expression match on the syntax coloring has no effect by this change, \cf2 since ICU library is used for it. \
+ 1. The regular expression match on the syntax coloring has no effect by this change, since ICU library is used for it. \
  2. same as ones that were distributed on {\field{\*\fldinst{HYPERLINK "http://wolfrosch.com/works/goodies/coteditor_syntax"}}{\fldrslt wolfrosch.com}}.\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 

ja.lproj/Version History.rtf

@@ -1,6 +1,6 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
-\readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128 HiraKakuPro-W3;\f2\fnil\fcharset0 LucidaGrande;
-}
+\readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128 HiraKakuPro-W3;\f2\fmodern\fcharset0 Courier;
+\f3\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red103\green103\blue103;}
 \paperw12240\paperh15840\vieww13460\viewh13880\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
@@ -15,7 +15,7 @@
 \fs24 \cf0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
-\b \cf0 1.4 [2014-03-19]
+\b \cf0 1.4.1 [2014-03-22]
 \b0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
@@ -24,27 +24,52 @@
 \cf0 \ulnone \'81\'69\'82\'c8\'82\'b5\'81\'6a\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 \ul \'81\'83\'92\'c7\'89\'c1\'81\'5e\'8f\'43\'90\'b3\'81\'5e\'95\'cf\'8d\'58\'81\'84\ulnone \
+*  Mavericks\'82\'c9\'82\'e6\'82\'e9\'83\'58\'83\'7d\'81\'5b\'83\'67\'88\'f8\'97\'70\'95\'84\'81\'5e\'83\'5f\'83\'62\'83\'56\'83\'85\'8b\'40\'94\'5c\'82\'f0\'83\'66\'83\'74\'83\'48\'83\'8b\'83\'67\'82\'c5\'96\'b3\'8c\'f8\'82\'c9\'90\'dd\'92\'e8\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs22 \cf0     * \'8f\'e3\'8b\'89\'8e\'d2\'8c\'fc\'82\'af\'81\'46\'97\'4c\'8c\'f8\'82\'c9\'82\'b5\'82\'bd\'82\'a2\'8f\'ea\'8d\'87\'82\'cd\'83\'5e\'81\'5b\'83\'7e\'83\'69\'83\'8b\'82\'c5 
+\f2 defaults write com.aynimac.CotEditor enableSmartQuotes YES
+\f1  \'82\'f0\'8e\'c0\'8d\'73\'82\'b5\'82\'c4\'89\'ba\'82\'b3\'82\'a2\'81\'42\
+    * 1.5\'82\'c5\'82\'cd\'8a\'c2\'8b\'ab\'90\'dd\'92\'e8\'82\'a9\'82\'e7\'97\'4c\'8c\'f8\'81\'45\'96\'b3\'8c\'f8\'82\'f0\'90\'d8\'82\'e8\'91\'d6\'82\'a6\'82\'e7\'82\'ea\'82\'e9\'82\'e6\'82\'a4\'82\'c9\'82\'b5\'82\'dc\'82\'b7\'81\'42
+\fs24 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ul \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
+*  1.4\'82\'c5\'83\'58\'83\'65\'81\'5b\'83\'5e\'83\'58\'83\'6f\'81\'5b\'82\'a8\'82\'e6\'82\'d1\'83\'68\'83\'8d\'83\'8f\'81\'5b\'82\'c9\'95\'5c\'8e\'a6\'82\'b3\'82\'ea\'82\'e9\'91\'8d\'8d\'73\'90\'94\'82\'aa\'83\'5b\'83\'8d\'82\'c9\'82\'c8\'82\'c1\'82\'c4\'82\'a2\'82\'bd\'95\'73\'8b\'ef\'8d\'87\'82\'f0\'8f\'43\'90\'b3
+\f0\fs26 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs24 \cf0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\b \cf0 1.4 [2014-03-19]
+\b0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\f1 \cf0 \ul \'81\'83\'90\'56\'8b\'40\'94\'5c\'81\'84\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ulnone \'81\'69\'82\'c8\'82\'b5\'81\'6a\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ul \'81\'83\'92\'c7\'89\'c1\'81\'5e\'8f\'43\'90\'b3\'81\'5e\'95\'cf\'8d\'58\'81\'84\ulnone \
 *  \'91\'ce\'89\'9e\'82\'b7\'82\'e9OS\'82\'f0OS X 10.7\'88\'c8\'8f\'e3\'82\'c9\'95\'cf\'8d\'58\
 *  64-bit\'82\'c9\'91\'ce\'89\'9e\
 *  Retina\'83\'66\'83\'42\'83\'58\'83\'76\'83\'8c\'83\'43\'82\'c9\'91\'ce\'89\'9e\
 *  \'8c\'9f\'8d\'f5\'81\'5e\'92\'75\'8a\'b7\'8b\'40\'94\'5c\'82\'c5\'8e\'67\'97\'70\'82\'b3\'82\'ea\'82\'e9\'90\'b3\'8b\'4b\'95\'5c\'8c\'bb\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a\'82\'aa\'8b\'53\'8e\'d4\'82\'cc\'83\'74\'83\'48\'81\'5b\'83\'4e\'82\'c5\'82\'a0\'82\'e9\'8b\'53\'89\'5f\'82\'c9\'95\'cf\'8d\'58 
-\f2 \uc0\u8317 
+\f3 \uc0\u8317 
 \f1 \uc0\u185 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
-\cf0 	*  \'90\'e6\'93\'c7\'82\'dd/\'96\'df\'82\'e8\'93\'c7\'82\'dd\'82\'f0\'8e\'6e\'82\'df\'82\'c6\'82\'b7\'82\'e9Perl 5.10+\'82\'c5\'92\'e8\'8b\'60\'82\'b3\'82\'ea\'82\'e9\'91\'bd\'82\'ad\'82\'cc\'90\'b3\'8b\'4b\'95\'5c\'8c\'bb\'8b\'4c\'96\'40\'82\'aa\'8e\'67\'97\'70\'89\'c2\'94\'5c\'82\'c9\
+	*  \'90\'e6\'93\'c7\'82\'dd/\'96\'df\'82\'e8\'93\'c7\'82\'dd\'82\'f0\'8e\'6e\'82\'df\'82\'c6\'82\'b7\'82\'e9Perl 5.10+\'82\'c5\'92\'e8\'8b\'60\'82\'b3\'82\'ea\'82\'e9\'91\'bd\'82\'ad\'82\'cc\'90\'b3\'8b\'4b\'95\'5c\'8c\'bb\'8b\'4c\'96\'40\'82\'aa\'8e\'67\'97\'70\'89\'c2\'94\'5c\'82\'c9\
 *  \'83\'41\'83\'76\'83\'8a\'83\'50\'81\'5b\'83\'56\'83\'87\'83\'93\'83\'41\'83\'43\'83\'52\'83\'93\'81\'45\'8f\'91\'97\'de\'83\'41\'83\'43\'83\'52\'83\'93\'81\'45\'83\'63\'81\'5b\'83\'8b\'83\'6f\'81\'5b\'83\'41\'83\'43\'83\'52\'83\'93\'82\'f0\'92\'b2\'90\'ae\
 *  \'83\'63\'81\'5b\'83\'8b\'83\'6f\'81\'5b\'83\'41\'83\'43\'83\'52\'83\'93\'82\'c9\'8f\'ac\'82\'b3\'82\'a2\'83\'54\'83\'43\'83\'59\'82\'f0\'92\'c7\'89\'c1\
 *  \'81\'75Apache\'81\'76\'81\'75Markdown\'81\'76\'81\'75Scala\'81\'76\'81\'75XML\'81\'76\'82\'cc\'83\'56\'83\'93\'83\'5e\'83\'62\'83\'4e\'83\'58\'92\'e8\'8b\'60\'82\'f0\'92\'c7\'89\'c1 
-\f2 \uc0\u8317 
+\f3 \uc0\u8317 
 \f1 \uc0\u178 \
 *  \'81\'75PHP\'81\'76\'83\'56\'83\'93\'83\'5e\'83\'62\'83\'4e\'83\'58\'92\'e8\'8b\'60\'82\'f0\'8d\'58\'90\'56 
-\f2 \uc0\u8317 
+\f3 \uc0\u8317 
 \f1 \uc0\u178 \
 	*  PHP5.5\'82\'dc\'82\'c5\'91\'ce\'89\'9e\
 	*  \'83\'76\'83\'8d\'83\'70\'83\'65\'83\'42\'81\'45\'90\'94\'92\'6c\'82\'f0\'83\'4a\'83\'89\'81\'5b\'83\'8a\'83\'93\'83\'4f\
 	*  \'83\'41\'83\'45\'83\'67\'83\'89\'83\'43\'83\'93\'83\'81\'83\'6a\'83\'85\'81\'5b\'82\'cc\'89\'fc\'91\'50\
 *  \'81\'75Python\'81\'76\'83\'56\'83\'93\'83\'5e\'83\'62\'83\'4e\'83\'58\'92\'e8\'8b\'60\'82\'f0\'8d\'58\'90\'56 
-\f2 \uc0\u8317 
+\f3 \uc0\u8317 
 \f1 \uc0\u178 \
 	*  Python3\'8c\'6e\'82\'c9\'91\'ce\'89\'9e (>= 3.3)\
 	*  \'83\'66\'83\'52\'83\'8c\'81\'5b\'83\'5e\'82\'cc\'83\'4a\'83\'89\'81\'5b\'83\'8a\'83\'93\'83\'4f\
@@ -61,8 +86,7 @@
 *  \'83\'45\'83\'43\'83\'93\'83\'68\'83\'45\'82\'e2\'83\'70\'83\'6c\'83\'8b\'97\'de\'82\'cc\'8c\'a9\'82\'bd\'96\'da\'82\'f0\'92\'b2\'90\'ae\
 *  \'83\'4a\'83\'89\'81\'5b\'83\'52\'81\'5b\'83\'68\'83\'47\'83\'66\'83\'42\'83\'5e\'82\'cc\'89\'70\'96\'bc HexColorCode Editor \'82\'f0 Color Code Editor \'82\'c9\'89\'fc\'96\'bc\
 *  \'83\'68\'83\'4c\'83\'85\'83\'81\'83\'93\'83\'67\'82\'cc\'8d\'58\'90\'56\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
-\cf0 \ul \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
+\ul \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
 *  \'95\'cf\'8d\'58\'82\'aa\'82\'c8\'82\'a2\'82\'cc\'82\'c9\'95\'73\'88\'d3\'82\'c9\'81\'75\'95\'ca\'82\'cc\'83\'76\'83\'8d\'83\'5a\'83\'58\'82\'c9\'82\'e6\'82\'c1\'82\'c4\'95\'cf\'8d\'58\'82\'b3\'82\'ea\'82\'dc\'82\'b5\'82\'bd\'81\'42\'81\'76\'82\'c6\'82\'a2\'82\'a4\'83\'41\'83\'89\'81\'5b\'83\'67\'82\'aa\'8f\'6f\'82\'e9\'96\'e2\'91\'e8\'82\'f0\'8f\'43\'90\'b3\
 *  \'8f\'89\'89\'f1\'8b\'4e\'93\'ae\'8e\'9e\'82\'c9\'81\'75\'8a\'4a\'94\'ad\'8c\'b3\'82\'aa\'96\'a2\'8a\'6d\'94\'46\'81\'76\'82\'c6\'82\'a2\'82\'a4\'83\'41\'83\'89\'81\'5b\'83\'67\'82\'aa\'8f\'6f\'82\'c4\'82\'a2\'82\'bd\'82\'cc\'82\'f0\'8f\'43\'90\'b3\
 *  Lion\'97\'70\'83\'6f\'83\'43\'83\'69\'83\'8a\'82\'c5\'83\'74\'83\'8b\'83\'58\'83\'4e\'83\'8a\'81\'5b\'83\'93\'8e\'9e\'82\'c9\'83\'63\'81\'5b\'83\'8b\'83\'6f\'81\'5b\'82\'cc\'94\'77\'8c\'69\'82\'aa\'93\'a7\'82\'af\'82\'c4\'82\'b5\'82\'dc\'82\'a4\'95\'73\'8b\'ef\'8d\'87\'82\'f0\'8f\'43\'90\'b3\
@@ -72,8 +96,7 @@
 *  \'8c\'be\'8c\'ea\'82\'aaEnglish\'82\'cc\'82\'c6\'82\'ab\'82\'cc\'83\'63\'81\'5b\'83\'8b\'83\'6f\'81\'5b\'83\'89\'83\'78\'83\'8b\'82\'cc\'92\'50\'8c\'ea\'8a\'d4\'83\'75\'83\'89\'83\'93\'83\'4e\'82\'f0\'8f\'43\'90\'b3\
 *  \'8a\'c2\'8b\'ab\'90\'dd\'92\'e8\'82\'cc\'81\'75\'83\'77\'83\'62\'83\'5f\'82\'cc\'8f\'e3\'82\'c9\'8b\'e6\'90\'d8\'82\'e8\'90\'fc\'82\'f0\'88\'f3\'8e\'9a\'81\'76\'82\'c6\'82\'a2\'82\'a4\'8c\'eb\'8b\'4c\'82\'f0\'8f\'43\'90\'b3\
 *  CotEditor 1.1\'82\'c54.0\'82\'c9\'8d\'58\'90\'56\'82\'b3\'82\'ea\'82\'bd\'82\'cd\'82\'b8\'82\'ccRegexKitLite\'82\'aa\'8e\'c0\'8d\'db\'82\'c9\'82\'cd\'8d\'58\'90\'56\'82\'b3\'82\'ea\'82\'c4\'82\'a2\'82\'c8\'82\'a9\'82\'c1\'82\'bd\'82\'cc\'82\'f0\'8f\'43\'90\'b3\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
-\cf0 \
+\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \fs22 \cf2  1. \'83\'56\'83\'93\'83\'5e\'83\'62\'83\'4e\'83\'58\'83\'4a\'83\'89\'81\'5b\'83\'8a\'83\'93\'83\'4f\'82\'cc\'90\'b3\'8b\'4b\'95\'5c\'8c\'bb\'82\'cdICU\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a\'82\'f0\'8e\'67\'97\'70\'82\'b5\'82\'c4\'82\'a2\'82\'e9\'82\'bd\'82\'df\'89\'65\'8b\'bf\'82\'cd\'82\'a0\'82\'e8\'82\'dc\'82\'b9\'82\'f1