* Set the encoding for webkit and allow the user to specify it.

n8gray · n8gray · commit a2eecd47faf1 · 2009-01-07T20:27:05.000Z
* add .hrl extension for erlang headers
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,11 @@
 1.1: (in progress)
-    * Added support for "textEncoding" option to set encoding, with default UTF-8.
-
+    * Added support for "textEncoding" option to set encoding for highlight
+      portion of renderer, with default UTF-8.
+    * Added support for "webkitTextEncoding" option to set encoding for webkit
+      portion of renderer, with default UTF-8.
+    
+    XXX: enabled plain-text handling!
+    
 1.0:
     * Hopefully fixed the crasher bug by keeping us single-threaded
     * Added Actionscript, Lisp, IDL, Verilog, VHDL, XHTML  (any others I forgot?)
diff --git a/Common.m b/Common.m
@@ -70,7 +70,8 @@
                                    @"ide-xcode", @"hlTheme", 
                                    @"", @"extraHLFlags", 
                                    @"", @"maxFileSize", 
-                                   @"UTF-8", @"textEncoding", nil]];
+                                   @"UTF-8", @"textEncoding", 
+                                   @"UTF-8", @"webkitTextEncoding", nil]];
     [env addEntriesFromDictionary:[defaults persistentDomainForName:myDomain]];
     
     NSString *cmd = [NSString stringWithFormat:
diff --git a/GeneratePreviewForURL.m b/GeneratePreviewForURL.m
@@ -31,20 +31,26 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
     CFBundleRef bundle = QLPreviewRequestGetGeneratorBundle(preview);
     int status;
     NSData *output = colorizeURL(bundle, url, &status, 0);
-    n8log(@"Generated preview html page in %.3f sec", -[startDate timeIntervalSinceNow] );
+    n8log(@"Generated preview html page in %.3f sec", 
+          -[startDate timeIntervalSinceNow] );
     
     if (status != 0 || QLPreviewRequestIsCancelled(preview)) {
 #ifndef DEBUG
         goto done;
 #endif
     }
     // Now let WebKit do its thing
-    CFDictionaryRef emptydict = 
-            (CFDictionaryRef)[[[NSDictionary alloc] init] autorelease];
+    NSString *textEncoding = [[NSUserDefaults standardUserDefaults] 
+                              stringForKey:@"webkitTextEncoding"];
+    if (!textEncoding || [textEncoding length] == 0)
+        textEncoding = @"UTF-8";                
+    CFDictionaryRef properties = 
+            (CFDictionaryRef)[NSDictionary dictionaryWithObject:textEncoding 
+                                                         forKey:(NSString *)kQLPreviewPropertyTextEncodingNameKey];
     QLPreviewRequestSetDataRepresentation(preview, (CFDataRef)output, 
                                           //kUTTypePlainText,
                                           kUTTypeHTML, 
-                                          emptydict);
+                                          properties);
     
 done:
     n8log(@"Finished preview in %.3f sec", -[startDate timeIntervalSinceNow] );
diff --git a/Info.plist b/Info.plist
@@ -15,6 +15,7 @@
 				<string>public.xml</string>
                 <string>com.apple.property-list</string>
                 <string>org.tug.tex</string>
+                <string>public.plain-text</string>
 			</array>
 		</dict>
 	</array>
@@ -72,7 +73,7 @@
          a given file is "source-code".  For things like .c and .m files that's
          not a problem; they're in the system already.  But for .ml files 
          we have to inform the system ourselves.  If there is a file type that
-         is supported by pygments but this plugin is not being called to 
+         is supported by highlight but this plugin is not being called to 
          quicklook it, try adding a type identifier for it below. -->
     <key>UTImportedTypeDeclarations</key>
         <array>
@@ -231,6 +232,7 @@
                     <key>public.filename-extension</key>
                     <array>
                         <string>erl</string>
+                        <string>hrl</string>
                     </array>
                 </dict>
             </dict>
diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj
@@ -189,8 +189,8 @@
 			children = (
 				0EF57F2E0D128219006084D5 /* c.lang */,
 				0EF57F7D0D133C0F006084D5 /* css.lang */,
-				0EF57D6D0D122934006084D5 /* objc.lang */,
 				0EB4960D0D0FC24000E86E0B /* ml.lang */,
+				0EF57D6D0D122934006084D5 /* objc.lang */,
 				0EF57D430D122791006084D5 /* ide-xcode.style */,
 				0EF57E690D125AB2006084D5 /* slateGreen.style */,
 				0E913A090D10B8060067BAD6 /* filetypes.conf */,
diff --git a/ReadMe.txt b/ReadMe.txt
@@ -13,6 +13,7 @@ that could be useful:
 
 Setting the text encoding (default is UTF-8):
     defaults write org.n8gray.QLColorCode textEncoding UTF-16
+    defaults write org.n8gray.QLColorCode webkitTextEncoding UTF-16
 Setting the font:
     defaults write org.n8gray.QLColorCode font Monaco
 the font size:
