diff --git a/Common.m b/Common.m
index 70e5d8e..ca6ae81 100644
--- a/Common.m
+++ b/Common.m
@@ -73,10 +73,11 @@
#ifdef DEBUG
@"1", @"qlcc_debug",
#endif
- @"9", @"fontSizePoints",
- @"Monaco", @"font",
- @"ide-xcode", @"hlTheme",
- @"", @"extraHLFlags",
+ @"10", @"fontSizePoints",
+ @"Menlo", @"font",
+ @"edit-xcode", @"hlTheme",
+// @"-lz -j 3 -t 4 --kw-case=capitalize ", @"extraHLFlags",
+ @"-t 4 --kw-case=capitalize ", @"extraHLFlags",
@"", @"maxFileSize",
@"UTF-8", @"textEncoding",
@"UTF-8", @"webkitTextEncoding", nil]];
diff --git a/Info.plist b/Info.plist
index 04e483c..081f56c 100644
--- a/Info.plist
+++ b/Info.plist
@@ -60,7 +60,7 @@
QLPreviewWidth
800
QLPreviewHeight
- 800
+ 640
UTImportedTypeDeclarations
diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj
index 71fd8f9..81b72e6 100644
--- a/QLColorCode.xcodeproj/project.pbxproj
+++ b/QLColorCode.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 44;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -222,8 +222,11 @@
/* Begin PBXProject section */
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0430;
+ };
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QLColorCode" */;
- compatibilityVersion = "Xcode 3.0";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -297,7 +300,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/zsh -x";
- shellScript = "set err_exit\ncd $PROJECT_DIR/highlight\nX=\"-arch i386 -arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET\"\nexport CFLAGS=$X\nexport LDFLAGS=$X\nmake -j 2\n# Make sure it was built universal\nlipo -info src/highlight | grep -q i386 || exit 1\nlipo -info src/highlight | grep -q x86_64 || exit 1\nmake \\\n\tDESTDIR=$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH \\\n\tPREFIX=/highlight/ \\\n\tinstall\n\n";
+ shellScript = "set err_exit\ncd $PROJECT_DIR/highlight\nX='-arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.7'\nexport CFLAGS=$X\nexport LDFLAGS=$X\nmake -j 2\n# Make sure it was built universal\n# lipo -info src/highlight | grep -q i386 || exit 1\nlipo -info src/highlight | grep -q x86_64 || exit 1\nmake \\\n\tDESTDIR=$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH \\\n\tPREFIX=/highlight/ \\\n\tinstall\n\n";
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -350,7 +354,6 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = Package;
ZERO_LINK = NO;
};
@@ -359,15 +362,18 @@
2CA3261F0896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/Library/Frameworks/**";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Library/QuickLook;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDEBUG";
PRODUCT_NAME = QLColorCode;
+ VALID_ARCHS = x86_64;
WRAPPER_EXTENSION = qlgenerator;
ZERO_LINK = YES;
};
@@ -376,11 +382,15 @@
2CA326200896AD4900168862 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ FRAMEWORK_SEARCH_PATHS = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/Library/Frameworks/**";
GCC_PRECOMPILE_PREFIX_HEADER = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Library/QuickLook;
+ ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = QLColorCode;
+ VALID_ARCHS = x86_64;
WRAPPER_EXTENSION = qlgenerator;
};
name = Release;
@@ -388,27 +398,31 @@
2CA326230896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.0.2;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CURRENT_PROJECT_VERSION = 2.0.3_DrQ;
+ DSTROOT = "/export/tmp/$(PROJECT_NAME).dst";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- PREBINDING = NO;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Debug;
};
2CA326240896AD4900168862 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
- CURRENT_PROJECT_VERSION = 2.0.2;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CURRENT_PROJECT_VERSION = 2.0.3_DrQ;
+ DSTROOT = "/export/tmp/$(PROJECT_NAME).dst";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- PREBINDING = NO;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Release;
};
diff --git a/QLColorCode.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/QLColorCode.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..c56f54d
--- /dev/null
+++ b/QLColorCode.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/QLColorCode.xcodeproj/project.xcworkspace/xcshareddata/QLColorCode.xccheckout b/QLColorCode.xcodeproj/project.xcworkspace/xcshareddata/QLColorCode.xccheckout
new file mode 100644
index 0000000..e86297c
--- /dev/null
+++ b/QLColorCode.xcodeproj/project.xcworkspace/xcshareddata/QLColorCode.xccheckout
@@ -0,0 +1,41 @@
+
+
+
+
+ IDESourceControlProjectFavoriteDictionaryKey
+
+ IDESourceControlProjectIdentifier
+ B14A23FB-0756-45F6-B4DD-656C06B5A303
+ IDESourceControlProjectName
+ QLColorCode
+ IDESourceControlProjectOriginsDictionary
+
+ BF04F702-7BBD-4C58-BAF0-2ACE473488CA
+ ssh://github.com/derzzle/QLColorCode.git
+
+ IDESourceControlProjectPath
+ QLColorCode.xcodeproj/project.xcworkspace
+ IDESourceControlProjectRelativeInstallPathDictionary
+
+ BF04F702-7BBD-4C58-BAF0-2ACE473488CA
+ ../..
+
+ IDESourceControlProjectURL
+ ssh://github.com/derzzle/QLColorCode.git
+ IDESourceControlProjectVersion
+ 110
+ IDESourceControlProjectWCCIdentifier
+ BF04F702-7BBD-4C58-BAF0-2ACE473488CA
+ IDESourceControlProjectWCConfigurations
+
+
+ IDESourceControlRepositoryExtensionIdentifierKey
+ public.vcs.git
+ IDESourceControlWCCIdentifierKey
+ BF04F702-7BBD-4C58-BAF0-2ACE473488CA
+ IDESourceControlWCCName
+ QLColorCode
+
+
+
+
diff --git a/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/UserInterfaceState.xcuserstate b/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..39b84f8
Binary files /dev/null and b/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/WorkspaceSettings.xcsettings b/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..659c876
--- /dev/null
+++ b/QLColorCode.xcodeproj/project.xcworkspace/xcuserdata/phoenix.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+
+
+
+
+ HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges
+
+ SnapshotAutomaticallyBeforeSignificantChanges
+
+
+
diff --git a/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/Package.xcscheme b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/Package.xcscheme
new file mode 100644
index 0000000..17df961
--- /dev/null
+++ b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/Package.xcscheme
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/QLColorCode.xcscheme b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/QLColorCode.xcscheme
new file mode 100644
index 0000000..8c6eda4
--- /dev/null
+++ b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/QLColorCode.xcscheme
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/xcschememanagement.plist b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..1fef7dd
--- /dev/null
+++ b/QLColorCode.xcodeproj/xcuserdata/phoenix.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+
+
+
+
+ SchemeUserState
+
+ Package.xcscheme
+
+ orderHint
+ 1
+
+ QLColorCode.xcscheme
+
+ orderHint
+ 0
+
+
+ SuppressBuildableAutocreation
+
+ 0E0E34E90D0097020086C1E6
+
+ primary
+
+
+ 8D57630D048677EA00EA77CD
+
+ primary
+
+
+
+
+
diff --git a/colorize.sh b/colorize.sh
index c4e878d..3140085 100755
--- a/colorize.sh
+++ b/colorize.sh
@@ -32,12 +32,11 @@ debug () {
debug Starting colorize.sh
#echo target is $target
-hlDir=$rsrcDir/highlight
-cmd=$hlDir/bin/highlight
-cmdOpts=(-I --font $font --quiet --add-data-dir $rsrcDir/override \
- --data-dir $rsrcDir/highlight/share/highlight \
- --add-config-dir $rsrcDir/override/config --style $hlTheme \
- --font-size $fontSizePoints --encoding $textEncoding ${=extraHLFlags} --validate-input)
+hlDir=/usr/local/share/highlight
+cmd=/usr/local/bin/highlight
+cmdOpts=(-I -k "$font" -K $fontSizePoints --quiet -I \
+ --style=${hlTheme} \
+ --encoding $textEncoding ${=extraHLFlags} --validate-input)
#for o in $cmdOpts; do echo $o\
; done
@@ -88,12 +87,13 @@ debug Resolved $target to language $lang
go4it () {
debug Generating the preview
+ local title=`basename ${target}`
if [ $thumb = "1" ]; then
- $reader | head -n 100 | head -c 20000 | $cmd --syntax $lang $cmdOpts && exit 0
+ $reader | head -n 100 | head -c 20000 | $cmd -S $lang $cmdOpts && exit 0
elif [ -n "$maxFileSize" ]; then
- $reader | head -c $maxFileSize | $cmd --syntax $lang $cmdOpts && exit 0
+ $reader | head -c $maxFileSize | $cmd -T "${title}" -S $lang $cmdOpts && exit 0
else
- $reader | $cmd --syntax $lang $cmdOpts && exit 0
+ $reader | $cmd -S $lang -T ${title} $cmdOpts && exit 0
fi
}
diff --git a/highlight.css b/highlight.css
index 4ba7933..fe69e84 100644
--- a/highlight.css
+++ b/highlight.css
@@ -1,21 +1,21 @@
-/* Style definition file generated by highlight 2.12, http://www.andre-simon.de/ */
+/* Style definition file generated by highlight 3.14, http://www.andre-simon.de/ */
-/* Highlighting theme definition: */
+/* Highlighting theme: Kwrite Editor */
-body.hl { background-color:#ffffff; }
-pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
-.hl.num { color:#2928ff; }
+body.hl { background-color:#e0eaee; }
+pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New',monospace;}
+.hl.num { color:#b07e00; }
.hl.esc { color:#ff00ff; }
-.hl.str { color:#ff0000; }
-.hl.dstr { color:#818100; }
+.hl.str { color:#bf0303; }
+.hl.pps { color:#818100; }
.hl.slc { color:#838183; font-style:italic; }
.hl.com { color:#838183; font-style:italic; }
-.hl.dir { color:#008200; }
-.hl.sym { color:#000000; }
-.hl.line { color:#555555; }
-.hl.mark { background-color:#ffffbb;}
+.hl.ppc { color:#008200; }
+.hl.opt { color:#000000; }
+.hl.ipl { color:#0057ae; }
+.hl.lin { color:#555555; }
.hl.kwa { color:#000000; font-weight:bold; }
-.hl.kwb { color:#830000; }
+.hl.kwb { color:#0057ae; }
.hl.kwc { color:#000000; font-weight:bold; }
.hl.kwd { color:#010181; }
diff --git a/highlight/Makefile b/highlight/Makefile
new file mode 100644
index 0000000..68d3e50
--- /dev/null
+++ b/highlight/Makefile
@@ -0,0 +1,17 @@
+
+
+all : highlight
+
+highlight:
+ [ ! -d src ] && mkdir src || true
+ [ ! -x src/highlight ] && cp `which highlight` src/highlight || true
+
+
+install:
+ [ ! -d $(DESTDIR)$(PREFIX) ] && mkdir -p $(DESTDIR)$(PREFIX) || true
+ [ ! -x $(DESTDIR)$(PREFIX)highlight ] && cp src/highlight $(DESTDIR)$(PREFIX) || true
+
+
+clean:
+ rm -fr src
+