=== added file 'geshifilter.info'
--- geshifilter.info	1970-01-01 00:00:00 +0000
+++ geshifilter.info	2007-01-08 05:41:48 +0000
@@ -0,0 +1,3 @@
+; $Id$
+name = GeSHiFilter
+description = Provides tags for syntax-highlighting code automatically.

=== modified file 'geshifilter.module'
--- geshifilter.module	2007-01-08 04:22:24 +0000
+++ geshifilter.module	2007-01-08 05:41:48 +0000
@@ -1,9 +1,5 @@
 <?php // $Id: geshifilter.module,v 1.3 2006/06/26 23:43:50 dpdev Exp $ //
 
-require_once(variable_get('geshifilter_geshi_dir', drupal_get_path('module', 'geshifilter').'/geshi').'/geshi.php');
-theme_add_style(drupal_get_path('module', 'geshifilter') . '/geshifilter.css');
-theme_add_style(drupal_get_path('module', 'geshifilter') . '/geshi.css');
-
 
 
 /**
@@ -116,9 +112,31 @@
 }
 
 /**
+ * Implementation of hook_menu().
+ */
+function geshifilter_menu($may_cache) {
+  require_once(variable_get('geshifilter_geshi_dir', drupal_get_path('module', 'geshifilter').'/geshi').'/geshi.php');
+  if (!variable_get('geshifilter_manual_css',FALSE)) {
+    drupal_add_css(drupal_get_path('module', 'geshifilter') . '/geshifilter.css');
+  }
+  drupal_add_css(drupal_get_path('module', 'geshifilter') . '/geshi.css');
+
+  $items = array();
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/settings/geshifilter',
+      'title' => t('GeSHiFilter'),
+      'description' => t('Manage GeSHiFilter.'),
+      'access' => user_access('administer site configuration'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('geshifilter_admin_settings'));
+  }
+  return $items;
+}
+
+/**
  * Admin page linked from menu
  */
-function geshifilter_settings() {
+function geshifilter_admin_settings() {
 
 	$form = array();
 
@@ -180,6 +198,11 @@
 		'#default_value' => variable_get('geshifilter_start_param', FALSE),
 		'#description' => t('Allow users to make the line numbers start at any number using <em>start=number</em> param. This feature will break XHTML strict compliancy (Geshi documentation &raquo; <a href="%link">Choosing a Start Number</a>).',
 												array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#starting-line-numbers')));	
+	$form['geshi']['geshifilter_manual_css'] = array(
+		'#type' => 'checkbox',
+		'#title' => t('Allow manual CSS'),
+		'#default_value' => variable_get('geshifilter_manual_css', FALSE),
+		'#description' => t('Allow users to manually specify CSS for the formatted code.'));
 	
 	$form['inline'] = array(
     '#type' => 'fieldset',
@@ -248,13 +271,13 @@
 		'#default_value' => variable_get('geshifilter_debug', FALSE),
 		'#description' => t('Enable the verbose mode for debugging.'));		
 		
-  return $form;
+  return system_settings_form($form);
 }
 
 /*
  * Validate the settings form
  */
-function geshifilter_settings_form_validate($form_id, $form_values) {
+function geshifilter_admin_settings_validate($form_id, $form_values) {
 
 	$form_values['geshifilter_geshi_dir'] = rtrim($form_values['geshifilter_geshi_dir'], '/\\');
 	$form_values['geshifilter_lang_dir'] = rtrim($form_values['geshifilter_lang_dir'], '/\\');