Author: ricardo

Description:
Please Add the enclose type "none".

so that syntax can highlighted inline.

My revision: 37495

Patch:

• SyntaxHighlight_GeSHi.class.php.org 2008-08-18 10:25:21.00

+++ SyntaxHighlight_GeSHi.class.php 2008-09-18 14:32:20.000000000 +0200
@@ -35,9 +35,11 @@

if( !$geshi instanceof GeSHi )
        return self::formatError( htmlspecialchars( wfMsgForContent( 'syntaxhighlight-err-lang
// "Enclose" parameter

• $enclose = isset( $args['enclose'] ) && $args['enclose'] == 'div'
• ? GESHI_HEADER_DIV
• : GESHI_HEADER_PRE;

+ $enclose = GESHI_HEADER_PRE;
+ if (isset( $args['enclose']) ) {
+ if ( $args['enclose'] == 'div' ) { $enclose = GESHI_HEADER_DIV; }
+ if ( $args['enclose'] == 'none' ) { $enclose = GESHI_HEADER_NONE; }
+ }

// Line numbers?
if( isset( $args['line'] ) ) {
        // Force <div> mode to maintain valid XHTML, see

@@ -85,7 +87,12 @@

        $out = str_replace( "\n", '', $out );
// Register CSS
$parser->mOutput->addHeadItem( self::buildHeadItem( $geshi ), "source-{$lang}" );

• return '<div dir="ltr" style="text-align: left;">' . $out . '</div>';

+ if ( $enclose == GESHI_HEADER_NONE ) {
+ return '<span class="'.$lang.' source-'.$lang.'"> '.$out . '</span>';
+ } else {
+ return '<div dir="ltr" style="text-align: left;">' . $out . '</div>';
+ }
+

        }
}

Version: unspecified
Severity: enhancement