--- geshifilter.module 2006-06-07 21:03:10.000000000 -0400 +++ newgeshifilter.module 2006-06-24 19:39:40.000000000 -0400 @@ -26,68 +26,199 @@ $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); - + $supported_types = array_keys($types, TRUE); + 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.

-

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: -

<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_language))); - } - 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.

-

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 -

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.

'); - } - } + $text = t(' +

GeSHi

+ +

GeSHi is a syntax highlighter for computer languages.

+

It is enabled for blocks of code and %disabled_for in-line code. %line_num %lang_state

+ +

%language_list

+ +

usage:

+ +

To post a block of code, surround it with <blockcode%type_param%start_param>...</blockcode>.

+ +

%type_instruct %start_instruct

+ +%block_example + +

%inline_instruct

+ +%inline_example' + , + array + ( + // PRESENT STATE OF GESHI SETTINGS! + + //part of first paragraph for in-line code state. + '%disabled_for' => (!$inline_code) + ? t('disabled for') + : '', + + //line numbers enabled? + '%line_num' => ($line_numbers != GESHI_NO_LINE_NUMBERS) + ? t('Line numbering is enabled'). + ( + //start parameter enabled? + ($start_param) + ? ' '.t('and the initial value can be overridden.') + : '.' + ) + : '', + + //Some language are allowed, type param is supported. + '%lang_state' => (!$types[0]) + ? t('You can specify a language from the list below. If you don\'t specify an optional language or specify an unsupported one,'). + ( + //what is the default highlight setting? + ($default_type) + ? ' '. + t('the code will be highlighted as %default_code.', + array + ( + '%default_code' => theme('placeholder', $default_type) + ) + ) + : ' '. + t('the code will not be highlighted.') + ) + //what is the default highlight setting without a choice setting? + : (($default_type) + ? ' '. + t('Syntax highlighting for %default_code will be used.', + array + ( + '%default_code' => $default_type + ) + ) + : ' '. + t('Highlighting is disabled but any special html entities will still be escaped.')), + + //language list when available. + '%language_list' => (!$types[0]) + ? t('The optional languages include the following:').(theme('item_list', $supported_types)) + : '', + + + // GESHI USAGE/INSTRUCTIONS! + + //type=language inserted when option is available. + '%type_param' => (!$types[0]) + ? ' '.t('[type="language"]') + : '', + + //start=number inserted when option is available. + '%start_param' => ($line_numbers != GESHI_NO_LINE_NUMBERS && $start_param) + ? ' '.t('[start="number"]') + : '', + + //type=lang insturctions. + '%type_instruct' => (!$types[0]) + ? t('The optional type="language" parameter can be used to specify a language to highlight.') + : '', + + //start=number instructions. + '%start_instruct' => ($line_numbers != GESHI_NO_LINE_NUMBERS && $start_param) + ? t('By default, line numbers are enabled for blocks with an initial value of 1. You can override the initial value by using the optional start="number" parameter. This comes in handy when posting a segment from a larger source and keeping the line numbers in sync.') + : '', + + //block example. + '%block_example' => + '

'. + t('e.g.%lang code block%start_param:', + array + ( + //show the sample with the first supported language. + '%lang' => (!$types[0]) + ? ' '.$supported_types[0] + : '', + //shown only when the option is available. + '%start_param' => ($line_numbers != GESHI_NO_LINE_NUMBERS && $start_param) + ? ' '.t('with an initial value of 5') + : '' + ) + ). + '

'. + '
'.
+						t('<blockcode%example_type%example_start>
...
...
...
</blockcode>',
+							array
+							(
+								//language type selectable?
+								'%example_type' => (!$types[0]) 
+									? ' '.
+										t('type="%type"',
+											array
+											(
+												//show the sample with the first supported language.
+												'%type' => $supported_types[0]
+											)
+										)
+									: '',
+								//start number definable?
+								'%example_start' => ($line_numbers != GESHI_NO_LINE_NUMBERS && $start_param)
+									? ' '.t('start="5"')
+									: ''
+							)
+						).
+					'
', + + //inline instructions. + '%inline_instruct' => ($inline_code) + ? + t('To post in-line code, surround it with <code%type_param>...</code> tags. %type_use', + array + ( + //type=language inserted when option is available. + '%type_param' => (!$types[0]) + ? ' '.t('[type="language"]') + : '', + '%type_use' => (!$types[0]) + ? t('The same rules apply for the language parameter.') + : '' + ) + ) + : '', + + //inline example. + '%inline_example' => ($inline_code) + ? + '

'. + t('e.g.%lang in-line code:', + array + ( + //show the sample with the first supported language. + '%lang' => (!$types[0]) + ? ' '.$supported_types[0] + : '' + ) + ). + '

'. + '
'.
+							t('...<code%example_type>...</code>...',
+								array
+								(
+									//language type selectable?
+									'%example_type' => (!$types[0]) 
+										? ' '.
+											t('type="%type"',
+												array
+												(
+													//show the sample with the first supported language.
+													'%type' => $supported_types[0]
+												)
+											)
+										: ''
+								)
+							).
+						'
' + : '' + ) + ); return $text; } else { @@ -96,21 +227,21 @@ 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; } }