? .DS_Store
? .buildpath
? .git
? .project
? .settings
? geshifilter.kpf
? translations/.DS_Store
Index: geshifilter.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.admin.inc,v
retrieving revision 1.23
diff -u -b -u -p -r1.23 geshifilter.admin.inc
--- geshifilter.admin.inc	12 Jul 2009 23:24:48 -0000	1.23
+++ geshifilter.admin.inc	17 Aug 2009 12:17:35 -0000
@@ -203,17 +203,30 @@ function geshifilter_admin_general_setti
     );
 
     // Code container
+    $container_options = array(
+      GESHI_HEADER_PRE => t('%val: uses a @cnt wrapper, efficient whitespace coding, no automatic line wrapping, generates invalid HTML with line numbering.',
+        array('%val' => 'GESHI_HEADER_PRE', '@cnt' => '<pre>')),
+      GESHI_HEADER_DIV => t('%val: uses a @cnt wrapper, enables automatic line wrapping.',
+        array('%val' => 'GESHI_HEADER_DIV', '@cnt' => '<div>')),
+    );
+    if (version_compare(GESHI_VERSION, '1.0.8', '>=')) {
+      $container_options[GESHI_HEADER_PRE_VALID] = t('%val: uses @pre wrappers, ensures valid HTML with line numbering, but generates more markup.',
+        array('%val' => 'GESHI_HEADER_PRE_VALID', '@pre' => '<pre>', '@li' => '<li>'));
+      $container_options[GESHI_HEADER_PRE_TABLE] = t('%val: uses a @table construction for adding line numbers which avoids selection/copy/paste problems.',
+        array('%val' => 'GESHI_HEADER_PRE_TABLE', '@table' => '<table>'));
+    }
+    if (version_compare(GESHI_VERSION, '1.0.7.2', '>=')) {
+      $container_options[GESHI_HEADER_NONE] = t('%val: uses no wrapper.',
+        array('%val' => 'GESHI_HEADER_NONE'));
+    }
+
     $form['geshifilter_styling']['geshifilter_code_container'] = array(
       '#type' => 'radios',
-      '#title' => t('Code container'),
-      '#description' => t('Define the container element to use for code blocks. (GeSHi documentation: <a href="!link">The Code Container</a>).',
+      '#title' => t('Code container, wrapping technique'),
+      '#description' => t('Define the wrapping technique to use for code blocks. (GeSHi documentation: <a href="!link">The Code Container</a>).',
         array('!link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-code-container')
       ),
-      '#options' => array(
-        GESHI_HEADER_PRE => t('Use @cnt container (efficient whitespace coding, no automatic line wrapping)', array('@cnt' => '<pre>')),
-        GESHI_HEADER_DIV => t('Use @cnt container (enables automatic line wrapping)', array('@cnt' => '<div>')),
-        GESHI_HEADER_NONE => t('Use no container'),
-      ),
+      '#options' => $container_options,
       '#default_value' => variable_get('geshifilter_code_container', GESHI_HEADER_PRE),
     );
   }
Index: geshifilter.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.css,v
retrieving revision 1.7
diff -u -b -u -p -r1.7 geshifilter.css
--- geshifilter.css	18 Jan 2008 22:58:39 -0000	1.7
+++ geshifilter.css	17 Aug 2009 12:17:35 -0000
@@ -23,12 +23,19 @@ div.geshifilter {
   border: 1px solid #ccc;
   background-color: #f8f8f8;
   line-height: 1.3;
+  overflow: auto;
 }
 
-div.geshifilter > pre, div.geshifilter > div {
+div.geshifilter pre {
   margin: 0;
   padding: 0;
-  overflow: auto;
+}
+
+/* CSS resets for the table elements in GESHI_HEADER_PRE_TABLE mode. */
+div.geshifilter table, div.geshifilter tbody, div.geshifilter tr, div.geshifilter td {
+  margin: 0;
+  padding: 0;
+  border-style: none;
 }
 
 div.geshifilter > pre ol, div.geshifilter > div ol {
@@ -40,4 +47,3 @@ div.geshifilter > pre ol, div.geshifilte
   margin: 0;
   line-height: 1.3;
 }
-