Merge branch 'master' of github.com:280north/cappuccino

Foundation/CPScanner.j

@@ -1,9 +1,24 @@
-// CPScanner.j
-// © Emanuele Vulcano, 2008.
-//
-// Licensed under the terms of Cappuccino's license
-// (the GNU Lesser General Public License, version 2.1).
-// Please see Cappuccino's LICENSE file for details.
+/*
+ * CPScanner.j
+ * Foundation
+ *
+ * Created by Emanuele Vulcano.
+ * Copyright 2008, Emanuele Vulcano.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPCharacterSet.j>
 

Foundation/CPString.j

@@ -138,7 +138,7 @@ var CPStringRegexSpecialCharacters = [
 */
 - (id)initWithString:(CPString)aString
 {
-    if ([self class] === CPString) 
+    if ([self class] === CPString)
         return String(aString);
 
     var result = new String(aString);
@@ -807,10 +807,10 @@ var CPStringRegexSpecialCharacters = [
 
 @end
 
-var diacritics = [[192,198],[224,230],[231,231],[232,235],[236,239],[242,246],[249,252]]; // Basic Latin ; Latin-1 Supplement.
-var normalized = [65,97,99,101,105,111,117];
+var diacritics = [[192,198],[224,230],[231,231],[232,235],[236,239],[242,246],[249,252]], // Basic Latin ; Latin-1 Supplement.
+    normalized = [65,97,99,101,105,111,117];
 
-String.prototype.stripDiacritics = function ()
+String.prototype.stripDiacritics = function()
 {
     var output = "";
     for (var indexSource = 0; indexSource < this.length; indexSource++)