? changes.diff ? changeswithwhitespace.diff ? geshi ? geshifilter.info Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/INSTALL.txt,v retrieving revision 1.3 diff -u -r1.3 INSTALL.txt --- INSTALL.txt 8 Jun 2006 17:51:37 -0000 1.3 +++ INSTALL.txt 18 Feb 2007 15:27:30 -0000 @@ -1,9 +1,9 @@ -GeShiFilter Module +GeSHiFilter Module ******************************************************************** D R U P A L M O D U L E ******************************************************************** -Name: GeShiFilter module +Name: GeSHiFilter module Maintainers: Damien Pitard @@ -19,8 +19,10 @@ http://qbnz.com/highlighter/. -1. Place the entire geshifilter directory into your Drupal modules/ - directory. +1. Place the entire geshifilter directory into your Drupal + "sites/site-name/modules" directory, where "site-name" is the name of the + site for which you wish to install GeSHiFilter, or "all" if you would like + it to be available for all of your sites. 2. Download GeSHi latest release from @@ -28,12 +30,12 @@ http://qbnz.com/highlighter/ Remember to uncompress the file and make sure the folder is named - 'geshi'. + "geshi". -3. Place the entire 'geshi' engine folder (where geshi.php resides) -inside your modules/geshifilter directory. So the Geshi engine will live -in modules/geshifilter/geshi +3. Place the entire "geshi" engine folder (where geshi.php resides) + inside your "sites/site-name/modules/geshifilter" directory, so the Geshi + engine is in "sites/site-name/modules/geshifilter/geshi". 4. Enable this module by navigating to: @@ -50,15 +52,15 @@ administer > input formats - This filter should play well with other filters, but + This filter should play well with other filters, but it might need to be placed after the HTML filter ("rearrange" tab of your input format). You need to configure specific format settings (default language, - languages allowed...) in the "configure" tab of your input format). + languages allowed...) in the "configure" tab of your input format). - If HTML filter is enable, don't forget to add tag in - "Allowed HTML tags" textfield of HTML filter settings. + If HTML filter is enable, don't forget to add tag in + "Allowed HTML tags" textfield of HTML filter settings. -Create new content and see GeShi in action! \ No newline at end of file +Create new content and see GeShi in action! Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/README.txt,v retrieving revision 1.3 diff -u -r1.3 README.txt --- README.txt 7 Jun 2006 20:49:58 -0000 1.3 +++ README.txt 18 Feb 2007 15:27:31 -0000 @@ -1,6 +1,6 @@ GeSHi Filter Module Authors: Vincent Filby - Michael Hutchinson (http://compsoc.dur.ac.uk/~mjh/contact) + Michael Hutchinson (http://mjhutchinson.com/contact) Damien Pitard GeSHi - Generic Syntax Highlighter @@ -146,4 +146,4 @@ INSTALLATION ------------ -See INSTALL.txt in this directory. \ No newline at end of file +See INSTALL.txt in this directory. Index: geshi.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshi.css,v retrieving revision 1.3 diff -u -r1.3 geshi.css --- geshi.css 7 Jun 2006 20:26:33 -0000 1.3 +++ geshi.css 18 Feb 2007 15:27:31 -0000 @@ -12,4 +12,80 @@ .me0 {color: #006600;} .me1 {color: #006600;} .li1 {} -.li2 {font-weight: bold;} \ No newline at end of file +.li2 {font-weight: bold;} + +/*PHP*/ +.php .de1, .php .de2 {color: #000060; font-weight: normal;} .php .imp {font-weight: bold; color: red;} +.php li {font-family: 'Courier New', Courier, monospace; color: #000060; background-color: #e0e0e0; padding-bottom: 2px;} +.php li.li2 {font-weight: bold; color: #000090; line-height: 90%} +.php .kw1 {color: #b1b100;} +.php .kw2 {color: #000000; font-weight: bold;} +.php .kw3 {color: #000066;} +.php .co1 {color: #808080; font-style: italic;font-style: normal;} +.php .co2 {color: #808080; font-style: italic;} +.php .coMULTI {color: #808080; font-style: italic;font-style: normal;} +.php .es0 {color: #000099; font-weight: bold;font-weight: normal;} +.php .br0 {color: #66cc66;} +.php .st0 {color: #ff0000;} +.php .nu0 {color: #cc66cc;} +.php .me1 {color: #006600;} +.php .me2 {color: #006600;} +.php .me {1} +.php .re0 {color: #0000ff;} + + +/*CSharp*/ +.csharp .de1, .csharp .de2 {color: #000060; font-weight: normal;} .csharp .imp {font-weight: bold; color: red;} +.csharp li {font-family: 'Courier New', Courier, monospace; color: #000060; background-color: #e0e0e0; padding-bottom: 2px;} +.csharp li.li2 {font-weight: bold; color: #000090; line-height: 90%} +.csharp .kw1 {color: #0600FF;} +.csharp .kw2 {color: #FF8000; font-weight: bold;} +.csharp .kw3 {color: #008000;} +.csharp .kw4 {color: #FF0000;} +.csharp .kw5 {color: #000000;} +.csharp .co1 {color: #008080; font-style: italic;font-style: normal;} +.csharp .co2 {color: #008080;} +.csharp .coMULTI {color: #008080; font-style: italic;font-style: normal;} +.csharp .es0 {color: #008080; font-weight: bold;font-weight: normal;} +.csharp .br0 {color: #008000;} +.csharp .st0 {color: #808080;} +.csharp .nu0 {color: #FF0000;} +.csharp .me1 {color: #0000FF;} +.csharp .me2 {color: #0000FF;} +.csharp .me {1} + +/* bash */ +.bash .de1, .bash .de2 {color: #000060; font-weight: normal;} +.bash .imp {font-weight: bold; color: red;} +.bash li {font-family: 'Courier New', Courier, monospace; color: #000060; background-color: #e0e0e0; padding-bottom: 2px;} +.bash .kw1 {color: #b1b100;} +.bash .kw3 {color: #000066;} +.bash .es0 {color: #000099; font-weight: bold;font-weight: normal;} +.bash .br0 {color: #66cc66;} +.bash .st0 {color: #ff0000;} +.bash .nu0 {color: #cc66cc;} +.bash .me {1} +.bash .re0 {color: #0000ff;} +.bash .re1 {color: #0000ff;} +.bash .re2 {color: #0000ff;} +.bash .re3 {color: #808080; font-style: italic;} +.bash .re4 {color: #0000ff;} + +/* diff */ +.diff .de1, .diff .de2 {color: #000060; font-weight: normal;} +.diff .imp {font-weight: bold; color: red;} +.diff li {font-family: 'Courier New', Courier, monospace; color: #000060; background-color: #e0e0e0; padding-bottom: 2px;} +.diff .kw1 {color: #aaaaaa; font-style: italic;} +.diff .kw2 {color: #dd6611;} +.diff .es0 {font-weight: normal;} +.diff .me {1} +.diff .re0 {color: #440088;} +.diff .re1 {color: #991111;} +.diff .re2 {color: #00b000;} +.diff .re3 {color: #888822;} +.diff .re4 {color: #888822;} +.diff .re5 {color: #0011dd;} +.diff .re6 {color: #440088;} +.diff .re7 {color: #991111;} +.diff .re8 {color: #00b000;} +.diff .re9 {color: #888822;} Index: geshifilter.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.css,v retrieving revision 1.2 diff -u -r1.2 geshifilter.css --- geshifilter.css 7 Jun 2006 20:49:58 -0000 1.2 +++ geshifilter.css 18 Feb 2007 15:27:31 -0000 @@ -1,23 +1,32 @@ -pre.geshifilter { - display:block; - padding:0.5em; - margin:0.5em; +pre.geshifilter, div.geshifilter { + font-family: 'Courier New', Courier, monospace; + font-size: 103%; + background-color: #f0f0f0; + margin: 0.3em; + line-height: 107%; + color: #0000bb; + padding: 0.3em; border: 1px solid #CCC; - background-color: #FFFFFF; + width: 98%; + overflow: auto; + overflow-y : hidden; + height: auto; } -div.geshifilter { - display:block; - padding:0.5em; - margin:0.5em; - border: 1px solid #CCC; - background-color: #FFFFFF; +.geshifilter { + white-space: pre; } +.geshifilter a:hover {background-color: #d6d6e6;} +.geshifilter a:link {color: #006;} +.geshifilter .head {font-family: Verdana, Arial, sans-serif; color: #808080; font-size: 70%; font-weight: bold; background-color: #f0f0ff; border-bottom: 1px solid #d0d0d0; padding: 2px;} +.geshifilter .foot {font-family: Verdana, Arial, sans-serif; color: #808080; font-size: 70%; font-weight: bold; background-color: #f0f0ff; border-top: 1px solid #d0d0d0; padding: 2px;} + + code.geshifilter { - display:inline; - padding:0; - margin:0; + display:inline; + padding:0; + margin:0; border: none; background-color: none; } Index: geshifilter.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.module,v retrieving revision 1.3 diff -u -r1.3 geshifilter.module --- geshifilter.module 26 Jun 2006 23:43:50 -0000 1.3 +++ geshifilter.module 18 Feb 2007 15:27:31 -0000 @@ -1,8 +1,24 @@ 'admin/settings/geshifilter', + 'title' => t('GeSHi Filter'), + 'description' => t('Syntax highlighting options.'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('geshifilter_admin_settings'), + 'access' => user_access('administer site configuration'), + 'type' => MENU_NORMAL_ITEM, + ); + return $items; +} @@ -11,8 +27,6 @@ */ function geshifilter_help($section) { switch ($section) { - case 'admin/modules#description': - return t("Provides tags for syntax-highlighting code automatically."); } } @@ -20,245 +34,239 @@ * Implementation of hook_filter_tips() */ function geshifilter_filter_tips($delta, $format, $long = false) { - - $default_type = variable_get('geshifilter_default_type_'.$format, 0); - $types = variable_get('geshifilter_types_'.$format, array()); - $start_param = variable_get('geshifilter_start_param', FALSE); - $line_numbers = variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS); - $inline_code=variable_get('geshifilter_inline_code_'.$format, FALSE); - + $default_type = variable_get('geshifilter_default_type_'.$format, 0); + $types = variable_get('geshifilter_types_'.$format, array()); + $start_param = variable_get('geshifilter_start_param', FALSE); + $line_numbers = variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS); + $inline_code=variable_get('geshifilter_inline_code_'.$format, FALSE); + if ($long) { - - $text=t('

Code:

'); - - //some language are allowed, type param is supported - if (!$types[0]) { - - $text .= t('

To post highlighted code, surround it code with <blockcode [type="language"]>...</blockcode> tags.

+ $text=t('

Code:

'); + + //some language are allowed, type param is supported + if (!$types[0]) { + + $text .= t('

To post highlighted code, surround it code with <blockcode [type="language"]>...</blockcode> tags.

E.g. actionscript block code: 

<blockcode type="actionscript">
...
</blockcode>

'); - - if ($inline_code) { - $text .= t('

You may also post highlighted inline code surrounding it with <code [type="language"]>...</code> tags.

-

E.g. highlight actionscript inline code: + if ($inline_code) { + $text .= t('

You may also post highlighted inline code surrounding it with <code [type="language"]>...</code> tags.

+

E.g. highlight actionscript inline code: 

<code type="actionscript">...</code>

'); - } - - if ($default_type) { - $text .= t('

If you don\'t use type="language" param or specify an unsupported language, the code will be highlighted as %default-code code.

', array('%default-code' => theme('placeholder', $default_type))); - } - else { - $text .= t('

If you don\'t use type="language" param or specify an unsupported language, the code will not be highlighted.

'); - } - - $supported_types = array_keys($types, TRUE); - - $text .= t('

The following languages are supported for highlight:
%type_list.

', array('%type_list' => theme('item_list', $supported_types))); - - } - //no languages allowed, type param is not supported - else { - - $text.= t('

To post code, surround it with <blockcode>...</blockcode> tags.

+ } + + if ($default_type) { + $text .= t('

If you don\'t use type="language" param or specify an unsupported language, the code will be highlighted as %default-code code.

', array('%default-code' => theme('placeholder', $default_type))); + } else { + $text .= t('

If you don\'t use type="language" param or specify an unsupported language, the code will not be highlighted.

'); + } + + $supported_types = array_keys($types, TRUE); + $text .= t('

The following languages are supported for highlight:
%type_list.

', array('%type_list' => theme('item_list', $supported_types))); + + } + //no languages allowed, type param is not supported + else { + + $text.= t('

To post code, surround it with <blockcode>...</blockcode> tags.

E.g. : 

<blockcode>
...
</blockcode>

'); - - if ($inline_code) { - $text.= t('

You may also post inline code surrounding it with <code>...</code> tags.

+ if ($inline_code) { + $text.= t('

You may also post inline code surrounding it with <code>...</code> tags.

E.g. : 

<code>...</code>

'); - } - - if ($default_type) { - $text .= t('

By default, the code will be highlighted as %default-code code.

', array('%default-code' => theme('placeholder', $default_type))); - } - else { - $text .= t('

The code will not be highlighted.

'); - } - } - - if ($line_numbers == GESHI_NORMAL_LINE_NUMBERS || $line_numbers == GESHI_FANCY_LINE_NUMBERS) { //line numbers - if ($start_param) { - $text .= ' '.t('

The code will be numbered. You can make the line numbers start at any number using start=number param + } + + if ($default_type) { + $text .= t('

By default, the code will be highlighted as %default-code code.

', array('%default-code' => theme('placeholder', $default_type))); + } + else { + $text .= t('

The code will not be highlighted.

'); + } + } + + if ($line_numbers == GESHI_NORMAL_LINE_NUMBERS || $line_numbers == GESHI_FANCY_LINE_NUMBERS) { //line numbers + if ($start_param) { + $text .= ' '.t('

The code will be numbered. You can make the line numbers start at any number using start=number param

E.g. highlight actionscript code and start line number at 5: 

<blockcode type="actionscript" start="5">
...
</blockcode>

'); - } - else { - $text .= ' '.t('

The code will be numbered.

'); - } - } + } + else { + $text .= ' '.t('

The code will be numbered.

'); + } + } - return $text; + return $text; } else { - $text=''; - //some language are allowed, type param is supported - if (!$types[0]) { - - $text .= t('You may post block code using <blockcode [type="language"]>...</blockcode> tags. '); - - if ($inline_code) { - $text .= t('You may also post inline code using <code [type="language"]>...</code> tags.'); - } - } - //no languages allowed, type param is not supported - else { - - $text .= t('You may post block code using <blockcode>...</blockcode> tags. '); - - if ($inline_code) { - $text .= t('You may also post inline code using <code>...</code> tags.'); - } - } - - return $text; + $text=''; + //some language are allowed, type param is supported + if (!$types[0]) { + + $text .= t('You may post block code using <blockcode [type="language"]>...</blockcode> tags. '); + + if ($inline_code) { + $text .= t('You may also post inline code using <code [type="language"]>...</code> tags.'); + } + } + //no languages allowed, type param is not supported + else { + + $text .= t('You may post block code using <blockcode>...</blockcode> tags. '); + + if ($inline_code) { + $text .= t('You may also post inline code using <code>...</code> tags.'); + } + } + + return $text; } } /** * Admin page linked from menu */ -function geshifilter_settings() { - - $form = array(); +function geshifilter_admin_settings() { + + $form = array(); - $form['geshi'] = array( + $form['geshi'] = array( '#type' => 'fieldset', '#title' => t('Geshi'), '#collapsible' => true, '#collapsed' => true); - + - $options = array(GESHI_HEADER_PRE => t('Use <pre> container'), - GESHI_HEADER_DIV => t('Use <div> container'), - GESHI_HEADER_NONE => t('No container')); - + $options = array(GESHI_HEADER_PRE => t('Use <pre> container'), + GESHI_HEADER_DIV => t('Use <div> container'), + GESHI_HEADER_NONE => t('No container')); + $form['geshi']['geshifilter_code_container'] = array( - '#type' => 'radios', - '#title' => t('Code Container'), - '#default_value' => variable_get('geshifilter_code_container', GESHI_HEADER_PRE), - '#options' => $options, - '#description' => t('Which container must goes around the code to contain it. (Geshi documentation » The Code Container).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-code-container'))); - - $options = array( 0 => t('Use in-line styles'), - 1 => t('Use CSS classes')); + '#type' => 'radios', + '#title' => t('Code Container'), + '#default_value' => variable_get('geshifilter_code_container', GESHI_HEADER_PRE), + '#options' => $options, + '#description' => t('Which container must goes around the code to contain it. (Geshi documentation » The Code Container).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-code-container'))); + + $options = array( 0 => t('Use in-line styles'), + 1 => t('Use CSS classes')); $form['geshi']['geshifilter_css_classes'] = array( - '#type' => 'radios', - '#title' => t('CSS classes'), - '#default_value' => variable_get('geshifilter_css_classes', 0), - '#options' => $options, - '#description' => t('Using CSS to highlight your code instead of in-lining the styles is more compliant (the style attribute is deprecating in XHTML 2.0) and results in far less outputted code (Geshi documentation » Using CSS Classes).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#using-css-classes'))); - - - $options = array(GESHI_NO_LINE_NUMBERS => t('Disable line numbers'), - GESHI_NORMAL_LINE_NUMBERS => t('Use normal line numbering'), - GESHI_FANCY_LINE_NUMBERS => t('Use fancy line numbering')); - + '#type' => 'radios', + '#title' => t('CSS classes'), + '#default_value' => variable_get('geshifilter_css_classes', 0), + '#options' => $options, + '#description' => t('Using CSS to highlight your code instead of in-lining the styles is more compliant (the style attribute is deprecating in XHTML 2.0) and results in far less outputted code (Geshi documentation » Using CSS Classes).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#using-css-classes'))); + + + $options = array(GESHI_NO_LINE_NUMBERS => t('Disable line numbers'), + GESHI_NORMAL_LINE_NUMBERS => t('Use normal line numbering'), + GESHI_FANCY_LINE_NUMBERS => t('Use fancy line numbering')); + $form['geshi']['geshifilter_line_numbers'] = array( - '#type' => 'radios', - '#title' => t('Line Numbers'), - '#default_value' => variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS), - '#options' => $options, - '#description' => t('Add line numbers to code. Fancy line numbers means that you can specify a different style for each nth line number (Geshi documentation » Line Numbers).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers'))); - - $form['geshi']['geshifilter_fancy_number'] = array( - '#type' => 'textfield', - '#size' => 2, - '#maxlength' => 2, - '#title' => t('Fancy number each'), - '#default_value' => variable_get('geshifilter_fancy_number', 5), - '#description' => t('Line numbers will be styled with a different style every n line numbers. (Geshi documentation » Line Numbers).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers'))); - - $form['geshi']['geshifilter_start_param'] = array( - '#type' => 'checkbox', - '#title' => t('Allow start param'), - '#default_value' => variable_get('geshifilter_start_param', FALSE), - '#description' => t('Allow users to make the line numbers start at any number using start=number param. This feature will break XHTML strict compliancy (Geshi documentation » Choosing a Start Number).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#starting-line-numbers'))); - - $form['inline'] = array( + '#type' => 'radios', + '#title' => t('Line Numbers'), + '#default_value' => variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS), + '#options' => $options, + '#description' => t('Add line numbers to code. Fancy line numbers means that you can specify a different style for each nth line number (Geshi documentation » Line Numbers).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers'))); + + $form['geshi']['geshifilter_fancy_number'] = array( + '#type' => 'textfield', + '#size' => 2, + '#maxlength' => 2, + '#title' => t('Fancy number each'), + '#default_value' => variable_get('geshifilter_fancy_number', 5), + '#description' => t('Line numbers will be styled with a different style every n line numbers. (Geshi documentation » Line Numbers).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers'))); + + $form['geshi']['geshifilter_start_param'] = array( + '#type' => 'checkbox', + '#title' => t('Allow start param'), + '#default_value' => variable_get('geshifilter_start_param', FALSE), + '#description' => t('Allow users to make the line numbers start at any number using start=number param. This feature will break XHTML strict compliancy (Geshi documentation » Choosing a Start Number).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#starting-line-numbers'))); + + $form['inline'] = array( '#type' => 'fieldset', '#title' => t('In-line styles'), '#collapsible' => true, '#collapsed' => true); - $form['inline']['geshifilter_overall_style'] = array( - '#type' => 'textfield', - '#maxlength' => 255, - '#title' => t('Overall code block style'), - '#default_value' => variable_get('geshifilter_overall_style', ''), - '#description' => t('Style the overall code block. For example, you can set the border style/colour, any margins and padding etc. (Geshi documentation » The Overall Styles).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-overall-styles'))); - - $form['inline']['geshifilter_number_style'] = array( - '#type' => 'textfield', - '#maxlength' => 255, - '#title' => t('Line number style'), - '#default_value' => variable_get('geshifilter_number_style', ''), - '#description' => t('(Geshi documentation » Line Number Styles).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-number-styles'))); - - $form['inline']['geshifilter_fancy_number_style'] = array( - '#type' => 'textfield', - '#maxlength' => 255, - '#title' => t('Fancy line number style'), - '#default_value' => variable_get('geshifilter_fancy_number_style', 'font-weight: bold;'), - '#description' => t('(Geshi documentation » Line Number Styles).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-number-styles'))); - - - $form['inline']['geshifilter_code_style'] = array( - '#type' => 'textfield', - '#maxlength' => 255, - '#title' => t('Code style'), - '#default_value' => variable_get('geshifilter_code_style', 'font-weight: normal;'), - '#description' => t('Explicitly override the styles you set for line numbers (Geshi documentation » Styling Line Numbers).', - array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#styling-line-numbers'))); - - - $form['advanced'] = array( + $form['inline']['geshifilter_overall_style'] = array( + '#type' => 'textfield', + '#maxlength' => 255, + '#title' => t('Overall code block style'), + '#default_value' => variable_get('geshifilter_overall_style', ''), + '#description' => t('Style the overall code block. For example, you can set the border style/colour, any margins and padding etc. (Geshi documentation » The Overall Styles).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-overall-styles'))); + + $form['inline']['geshifilter_number_style'] = array( + '#type' => 'textfield', + '#maxlength' => 255, + '#title' => t('Line number style'), + '#default_value' => variable_get('geshifilter_number_style', ''), + '#description' => t('(Geshi documentation » Line Number Styles).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-number-styles'))); + + $form['inline']['geshifilter_fancy_number_style'] = array( + '#type' => 'textfield', + '#maxlength' => 255, + '#title' => t('Fancy line number style'), + '#default_value' => variable_get('geshifilter_fancy_number_style', 'font-weight: bold;'), + '#description' => t('(Geshi documentation » Line Number Styles).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-number-styles'))); + + + $form['inline']['geshifilter_code_style'] = array( + '#type' => 'textfield', + '#maxlength' => 255, + '#title' => t('Code style'), + '#default_value' => variable_get('geshifilter_code_style', 'font-weight: normal;'), + '#description' => t('Explicitly override the styles you set for line numbers (Geshi documentation » Styling Line Numbers).', + array('%link' => 'http://qbnz.com/highlighter/geshi-doc.html#styling-line-numbers'))); + + + $form['advanced'] = array( '#type' => 'fieldset', '#title' => t('Advanced'), '#collapsible' => true, '#collapsed' => true); - $form['advanced']['geshifilter_geshi_dir'] = array( - '#type' => 'textfield', - '#title' => t('GeSHi Directory'), - '#default_value' => variable_get('geshifilter_geshi_dir', drupal_get_path('module', 'geshifilter').'/geshi'), - '#description' => t('Location of directory where geshi.php is. i.e: "modules/geshifilter/geshi" (without quotes).'), - '#required' => TRUE); - - - $form['advanced']['geshifilter_lang_dir'] = array( - '#type' => 'textfield', - '#title' => t('Languages directory'), - '#default_value' => variable_get('geshifilter_lang_dir', drupal_get_path('module', 'geshifilter').'/geshi/geshi'), - '#description' => t('Location where GeSHi languages files reside. Languages files are files with the names of languages, ended with .php extension. i.e: "modules/geshifilter/geshi/geshi" (without quotes).'), - '#required' => TRUE); - - $form['advanced']['geshifilter_debug'] = array( - '#type' => 'checkbox', - '#title' => t('Debug mode'), - '#default_value' => variable_get('geshifilter_debug', FALSE), - '#description' => t('Enable the verbose mode for debugging.')); - - return $form; + $form['advanced']['geshifilter_geshi_dir'] = array( + '#type' => 'textfield', + '#title' => t('GeSHi Directory'), + '#default_value' => variable_get('geshifilter_geshi_dir', drupal_get_path('module', 'geshifilter').'/geshi'), + '#description' => t('Location of directory where geshi.php is. i.e: "modules/geshifilter/geshi" (without quotes).'), + '#required' => TRUE); + + + $form['advanced']['geshifilter_lang_dir'] = array( + '#type' => 'textfield', + '#title' => t('Languages directory'), + '#default_value' => variable_get('geshifilter_lang_dir', drupal_get_path('module', 'geshifilter').'/geshi/geshi'), + '#description' => t('Location where GeSHi languages files reside. Languages files are files with the names of languages, ended with .php extension. i.e: "modules/geshifilter/geshi/geshi" (without quotes).'), + '#required' => TRUE); + + $form['advanced']['geshifilter_debug'] = array( + '#type' => 'checkbox', + '#title' => t('Debug mode'), + '#default_value' => variable_get('geshifilter_debug', FALSE), + '#description' => t('Enable the verbose mode for debugging.')); + + 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'], '/\\'); - + $form_values['geshifilter_geshi_dir'] = rtrim($form_values['geshifilter_geshi_dir'], '/\\'); + $form_values['geshifilter_lang_dir'] = rtrim($form_values['geshifilter_lang_dir'], '/\\'); + // Check if geshi directory exists. if (!is_dir($form_values['geshifilter_geshi_dir'])) { form_set_error('geshifilter_geshi_dir', t('The GeSHi directory %geshi-directory does not exist. Please download GeSHi, uncompress it and copy the folder into %geshifilter-directory.', array('%geshi-directory' => theme('placeholder',$form_values['geshifilter_geshi_dir']), '%geshifilter-directory' => theme('placeholder',drupal_get_path('module', 'geshifilter'))))); @@ -274,23 +282,23 @@ form_set_error('geshifilter_lang_dir', t('The GeSHi languages directory %directory does not exist.', array('%directory' => theme('placeholder', $form_values['geshifilter_lang_dir'])))); } - // Check if there are some language files in the directory - $files = file_scan_directory($form_values['geshifilter_lang_dir'], '\.php$', array('.', '..', 'CVS', 'geshi.php'), 0, FALSE, 'name'); - if (count($files) == 0) { - drupal_set_message(t('No language pattern files found. Are you sure to have correctly installed the GeShi package?')); - } + // Check if there are some language files in the directory + $files = file_scan_directory($form_values['geshifilter_lang_dir'], '\.php$', array('.', '..', 'CVS', 'geshi.php'), 0, FALSE, 'name'); + if (count($files) == 0) { + drupal_set_message(t('No language pattern files found. Are you sure to have correctly installed the GeShi package?')); + } } /** * Implementation of hook_filter() */ function geshifilter_filter($op, $delta = 0, $format = -1, $text = '') { - - //disable cache for developpement cause nocache doesn't work + + //disable cache for developpement cause nocache doesn't work $debug = variable_get('geshifilter_debug', FALSE); - if ($debug) { - db_query('DELETE from cache'); - } + if ($debug) { + db_query('DELETE from cache'); + } switch ($op) { @@ -301,52 +309,52 @@ return t('Allows users to post hightlighted code verbatim using <blockcode type="language"> tag.'); case 'settings': - $lang_dir = variable_get('geshifilter_lang_dir', drupal_get_path('module', 'geshifilter').'/geshi/geshi'); - - // Find languages in the directory, we get a table where key == value - $files = file_scan_directory($lang_dir, '\.php$', array('.', '..', 'CVS', 'geshi.php'), 0, FALSE, 'name'); - - //produce an associative array whit keys equal to values - $languages = drupal_map_assoc(array_keys($files)); - uasort($languages, 'strnatcasecmp'); + $lang_dir = variable_get('geshifilter_lang_dir', drupal_get_path('module', 'geshifilter').'/geshi/geshi'); + + // Find languages in the directory, we get a table where key == value + $files = file_scan_directory($lang_dir, '\.php$', array('.', '..', 'CVS', 'geshi.php'), 0, FALSE, 'name'); + + //produce an associative array whit keys equal to values + $languages = drupal_map_assoc(array_keys($files)); + uasort($languages, 'strnatcasecmp'); $languages_select = $languages; - $languages_select[0] = t('- DO NOT HIGHLIGHT -'); - - $form['geshifilter'] = array( - '#type' => 'fieldset', - '#title' => t('GeSHi filter'), - '#collapsible' => true, - '#collapsed' => true, - ); - - $form['geshifilter']['geshifilter_inline_code_'.$format] = array( - '#type' => 'checkbox', - '#title' => t('Highlight inline code'), - '#default_value' => variable_get('geshifilter_inline_code_'.$format, FALSE), - '#description' => t('Enable highligthing for code surrounded by <code>...</code> tags.'), - ); + $languages_select[0] = t('- DO NOT HIGHLIGHT -'); + + $form['geshifilter'] = array( + '#type' => 'fieldset', + '#title' => t('GeSHi filter'), + '#collapsible' => true, + '#collapsed' => true, + ); + + $form['geshifilter']['geshifilter_inline_code_'.$format] = array( + '#type' => 'checkbox', + '#title' => t('Highlight inline code'), + '#default_value' => variable_get('geshifilter_inline_code_'.$format, FALSE), + '#description' => t('Enable highligthing for code surrounded by <code>...</code> tags.'), + ); $form['geshifilter']['geshifilter_default_type_'.$format] = array( - '#type' => 'select', - '#title' => t('Default language'), - '#default_value' => variable_get('geshifilter_default_type_'.$format, 0), - '#options' => $languages_select, - '#description' => t('Default language pattern used to highlight posted code where type="language" param is omitted.'), - ); - - $form['geshifilter']['geshifilter_types_'.$format] = array( - '#type' => 'checkboxes', - '#title' => t('Allowed Languages'), - '#default_value' => variable_get('geshifilter_types_'.$format, array()), - '#options' => $languages, - '#description' => t('Check every languages you want to be allowed for highlighting (i.e. usable in lang param).'), - ); - - //pass the format value, so filter_admin_configure_validate can know which format is being processed - $form['geshifilter']['format'] = array( - '#type' => 'hidden', - '#default_value' => $format, - ); + '#type' => 'select', + '#title' => t('Default language'), + '#default_value' => variable_get('geshifilter_default_type_'.$format, 0), + '#options' => $languages_select, + '#description' => t('Default language pattern used to highlight posted code where type="language" param is omitted.'), + ); + + $form['geshifilter']['geshifilter_types_'.$format] = array( + '#type' => 'checkboxes', + '#title' => t('Allowed Languages'), + '#default_value' => variable_get('geshifilter_types_'.$format, array()), + '#options' => $languages, + '#description' => t('Check every languages you want to be allowed for highlighting (i.e. usable in lang param).'), + ); + + //pass the format value, so filter_admin_configure_validate can know which format is being processed + $form['geshifilter']['format'] = array( + '#type' => 'hidden', + '#default_value' => $format, + ); return $form; @@ -357,7 +365,7 @@ return _geshifilter_process_code($format, $text); default: - return $text; + return $text; } } @@ -369,114 +377,119 @@ $types = variable_get('geshifilter_types_'.$format, array()); $css_classes = variable_get('geshifilter_css_classes', 0); $code_container = variable_get('geshifilter_code_container', GESHI_HEADER_PRE); - $line_numbers = variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS); - $fancy_number = variable_get('geshifilter_fancy_number', 5); + $line_numbers = variable_get('geshifilter_line_numbers', GESHI_NO_LINE_NUMBERS); + $fancy_number = variable_get('geshifilter_fancy_number', 5); $start_param = variable_get('geshifilter_start_param', FALSE); $overall_style = variable_get('geshifilter_overall_style', ''); - $number_style = variable_get('geshifilter_number_style', ''); - $fancy_number_style = variable_get('geshifilter_fancy_number_style', 'font-weight: bold;'); - $code_style = variable_get('geshifilter_code_style', 'font-weight: normal;'); + $number_style = variable_get('geshifilter_number_style', ''); + $fancy_number_style = variable_get('geshifilter_fancy_number_style', 'font-weight: bold;'); + $code_style = variable_get('geshifilter_code_style', 'font-weight: normal;'); $inline_code = variable_get('geshifilter_inline_code_'.$format, FALSE); $debug = variable_get('geshifilter_debug', FALSE); $tags='blockcode'.($inline_code?'|code':''); - if (preg_match_all('/<('.$tags.')((?:\s(?:.|\s|\z)*?)*)\s*>((?:.|\s|\z)*?)<\/\1\s*>/i', $text, $match)) { - // $match[0][xx] .... fully matched string ... - // $match[1][xx] .... tag - // $match[2][xx] .... full params string type="language"... - // $match[3][xx] .... code to highlight - - foreach ($match[3] as $key => $value) { - - if ($debug) { - drupal_set_message('<'.$match[1][$key].'>...</'.$match[1][$key].'> tags found'); - } - - preg_match_all('/(type|start)\s*=\s*[\"]((?:.|\s|\z)*?)[\"]/i', $match[2][$key], $param); //let lang and language tags for backward compatibility - // $param[0][xx] .... fully matched string type="language" - // $param[1][xx] .... param name - // $param[2][xx] .... param value - - //default values - $lang = variable_get('geshifilter_default_type_'.$format, 0); - $start = 1; - - foreach ($param[2] as $p_key => $p_value) { - - if ($debug) { - drupal_set_message($param[1][$p_key].'="'.$p_value.'" param found'); - } - - //if lang is known, allowed and found - if ($param[1][$p_key] == 'type' && in_array($p_value, $types) && $types[$p_value]) { - $lang = $p_value; - } - - //if start param has been allowed - if (($line_numbers == GESHI_NORMAL_LINE_NUMBERS ||$line_numbers == GESHI_FANCY_LINE_NUMBERS) && $start_param) { - - if ($debug) { - drupal_set_message('start param is allowed'); - } - - //if start param is found - if ($param[1][$p_key] == 'start' && $p_value) { - $start = $p_value; - } - } - } - - if ($debug) { - drupal_set_message('language used: '.$lang); - drupal_set_message('start param: '.$start); - } - - // geshi will reencode these - $matched = decode_entities($value); - - // undo nl and p formatting - $matched = preg_replace("@
@", "", $matched); - $matched = preg_replace("@

|

@", "", $matched); - - $geshi = new GeSHi($matched, $lang, $lang_dir); - - $geshi->enable_classes($css_classes); - - if ($match[1][$key] =='code') { - $geshi->set_header_type(GESHI_HEADER_NONE); - } - else { - $geshi->set_header_type($code_container); - } - - if ($match[1][$key] != 'code') { - $geshi->set_overall_class('geshifilter'); - } - - //line numbers - if ($line_numbers != GESHI_NO_LINE_NUMBERS && $match[1][$key] != 'code') { - $geshi->enable_line_numbers($line_numbers, ($line_numbers == GESHI_FANCY_LINE_NUMBERS)?$fancy_number:null); - - if ($start_param) { - $geshi->start_line_numbers_at($start); - } - } - - //styles - $geshi->set_overall_style($overall_style) ; - $geshi->set_line_style($number_style, $fancy_number_style); - $geshi->set_code_style($code_style); - - if ($match[1][$key] == 'code') { - $text = str_replace($match[0][$key], ''.$geshi->parse_code().'', $text); - } - else { - $text = str_replace($match[0][$key], $geshi->parse_code(), $text); - } - } - } - - return $text; + if (preg_match_all('/<('.$tags.')((?:\s(?:.|\s|\z)*?)*)\s*>\s*((?:.|\s|\z)*?)\s*<\/\1\s*>\s*/i', $text, $match)) { + + // $match[0][xx] .... fully matched string ... + // $match[1][xx] .... tag + // $match[2][xx] .... full params string type="language"... + // $match[3][xx] .... code to highlight + + foreach ($match[3] as $key => $value) { + + if ($debug) { + drupal_set_message('<'.$match[1][$key].'>...</'.$match[1][$key].'> tags found'); + } + + preg_match_all('/(type|start)\s*=\s*[\"]((?:.|\s|\z)*?)[\"]/i', $match[2][$key], $param); //let lang and language tags for backward compatibility + // $param[0][xx] .... fully matched string type="language" + // $param[1][xx] .... param name + // $param[2][xx] .... param value + + //default values + $lang = variable_get('geshifilter_default_type_'.$format, 0); + $start = 1; + + foreach ($param[2] as $p_key => $p_value) { + + if ($debug) { + drupal_set_message($param[1][$p_key].'="'.$p_value.'" param found'); + } + + //if lang is known, allowed and found + if ($param[1][$p_key] == 'type' && in_array($p_value, $types) && $types[$p_value]) { + $lang = $p_value; + } + + //if start param has been allowed + if (($line_numbers == GESHI_NORMAL_LINE_NUMBERS ||$line_numbers == GESHI_FANCY_LINE_NUMBERS) && $start_param) { + + if ($debug) { + drupal_set_message('start param is allowed'); + } + + //if start param is found + if ($param[1][$p_key] == 'start' && $p_value) { + $start = $p_value; + } + } + } + + if ($debug) { + drupal_set_message('language used: '.$lang); + drupal_set_message('start param: '.$start); + } + + // geshi will reencode these + $matched = decode_entities($value); + + // undo nl and p formatting + $matched = preg_replace("@
@", "", $matched); + $matched = preg_replace("@

|

@", "", $matched); + + $geshi = new GeSHi($matched, $lang, $lang_dir); + + $geshi->enable_classes($css_classes); + + if ($match[1][$key] =='code') { + $geshi->set_header_type(GESHI_HEADER_NONE); + } + else { + $geshi->set_header_type($code_container); + } + + if ($match[1][$key] != 'code') { + $geshi->set_overall_class('geshifilter'); + } + + //line numbers + if ($line_numbers != GESHI_NO_LINE_NUMBERS && $match[1][$key] != 'code') { + $geshi->enable_line_numbers($line_numbers, ($line_numbers == GESHI_FANCY_LINE_NUMBERS)?$fancy_number:null); + + if ($start_param) { + $geshi->start_line_numbers_at($start); + } + }