From: <mi...@us...> - 2008-05-19 17:37:01
|
Revision: 1174 http://geshi.svn.sourceforge.net/geshi/?rev=1174&view=rev Author: milianw Date: 2008-05-19 10:37:03 -0700 (Mon, 19 May 2008) Log Message: ----------- use four spaces instead of tabs for indendation Modified Paths: -------------- trunk/geshi-1.0.X/src/geshi.php Modified: trunk/geshi-1.0.X/src/geshi.php =================================================================== --- trunk/geshi-1.0.X/src/geshi.php 2008-05-18 22:21:14 UTC (rev 1173) +++ trunk/geshi-1.0.X/src/geshi.php 2008-05-19 17:37:03 UTC (rev 1174) @@ -326,13 +326,13 @@ */ var $highlight_extra_lines_style = 'color: #cc0; background-color: #ffc;'; - /** - * The line ending - * If null, nl2br() will be used on the result string. - * Otherwise, all instances of \n will be replaced with $line_ending - * @var string - */ - var $line_ending = null; + /** + * The line ending + * If null, nl2br() will be used on the result string. + * Otherwise, all instances of \n will be replaced with $line_ending + * @var string + */ + var $line_ending = null; /** * Number at which line numbers should start at @@ -401,11 +401,11 @@ */ var $tab_width = 8; - /** - * Should we use language-defined tab stop widths? - * @var int - */ - var $use_language_tab_width = false; + /** + * Should we use language-defined tab stop widths? + * @var int + */ + var $use_language_tab_width = false; /** * Default target for keyword links @@ -1046,31 +1046,31 @@ } } - /** - * Sets whether or not to use tab-stop width specifed by language - * - * @param boolean Whether to use language-specific tab-stop widths + /** + * Sets whether or not to use tab-stop width specifed by language + * + * @param boolean Whether to use language-specific tab-stop widths * @since 1.0.7.20 - */ - function set_use_language_tab_width($use) { - $this->use_language_tab_width = (bool) $use; - } + */ + function set_use_language_tab_width($use) { + $this->use_language_tab_width = (bool) $use; + } - /** - * Returns the tab width to use, based on the current language and user - * preference - * - * @return int Tab width + /** + * Returns the tab width to use, based on the current language and user + * preference + * + * @return int Tab width * @since 1.0.7.20 - */ - function get_real_tab_width() { - if (!$this->use_language_tab_width || + */ + function get_real_tab_width() { + if (!$this->use_language_tab_width || !isset($this->language_data['TAB_WIDTH'])) { - return $this->tab_width; - } else { - return $this->language_data['TAB_WIDTH']; - } - } + return $this->tab_width; + } else { + return $this->language_data['TAB_WIDTH']; + } + } /** * Enables/disables strict highlighting. Default is off, calling this @@ -1426,15 +1426,15 @@ $this->highlight_extra_lines_style = $styles; } - /** - * Sets the line-ending - * - * @param string The new line-ending - * @since 1.0.2 - */ - function set_line_ending($line_ending) { - $this->line_ending = (string)$line_ending; - } + /** + * Sets the line-ending + * + * @param string The new line-ending + * @since 1.0.2 + */ + function set_line_ending($line_ending) { + $this->line_ending = (string)$line_ending; + } /** * Sets what number line numbers should start at. Should @@ -1924,7 +1924,7 @@ $test_str_match == GESHI_START_IMPORTANT) { $test_str .= '</span>'; } - $i = $close_pos + strlen($close) - 1; + $i = $close_pos + strlen($close) - 1; // parse the rest $result .= $this->parse_non_string_part($stuff_to_parse); $stuff_to_parse = ''; @@ -2047,8 +2047,8 @@ if (false !== strpos($result, "\t")) { $lines = explode("\n", $result); $result = null;//Save memory while we process the lines individually - $tab_width = $this->get_real_tab_width(); - $tab_string = ' ' . str_repeat(' ', $tab_width); + $tab_width = $this->get_real_tab_width(); + $tab_string = ' ' . str_repeat(' ', $tab_width); for ($key = 0, $n = count($lines); $key < $n; $key++) { $line = $lines[$key]; @@ -2084,7 +2084,7 @@ $substr = substr($line, $i + 3, 5); $posi = strpos($substr, ';'); if (false === $posi) { - ++$pos; + ++$pos; } else { $pos -= $posi+2; } @@ -2131,12 +2131,12 @@ $result = str_replace(' ', ' ', $result); if ($this->line_numbers == GESHI_NO_LINE_NUMBERS) { - if ($this->line_ending === null) { - $result = nl2br($result); - } else { - $result = str_replace("\n", $this->line_ending, $result); - } - } + if ($this->line_ending === null) { + $result = nl2br($result); + } else { + $result = str_replace("\n", $this->line_ending, $result); + } + } return $result; } @@ -3182,15 +3182,15 @@ * @since 1.0.7.21 */ function get_line_style($line) { - //$style = null; - $style = null; - if (array_key_exists($line, $this->highlight_extra_lines_styles)) { - $style = $this->highlight_extra_lines_styles[$line]; - } else { // if no "extra" style assigned - $style = $this->highlight_extra_lines_style; - } + //$style = null; + $style = null; + if (array_key_exists($line, $this->highlight_extra_lines_styles)) { + $style = $this->highlight_extra_lines_styles[$line]; + } else { // if no "extra" style assigned + $style = $this->highlight_extra_lines_style; + } - return $style; + return $style; } } // End Class GeSHi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |