X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Fparse.php;h=6279a348ac7de78b17905a3fa5db55325f9be4c7;hb=fdf83070cdddd7650891e2dd8d4648849874517f;hp=638d7c5b2a81374bc9f8888cd2dae37bacff9288;hpb=a877f3d4114dc9570d03177930ddbfd1332f909a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/parse.php b/maintenance/parse.php
index 638d7c5b2a..6279a348ac 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -3,7 +3,7 @@
  * Parse some wikitext.
  *
  * Wikitext can be given by stdin or using a file. The wikitext will be parsed
- * using 'CLIParser' as a title. This can be overriden with --title option.
+ * using 'CLIParser' as a title. This can be overridden with --title option.
  *
  * Example1:
  * @code
@@ -61,19 +61,20 @@ class CLIParser extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Parse a given wikitext";
+		$this->addDescription( 'Parse a given wikitext' );
 		$this->addOption(
 			'title',
 			'Title name for the given wikitext (Default: \'CLIParser\')',
 			false,
 			true
 		);
+		$this->addOption( 'tidy', 'Tidy the output' );
 		$this->addArg( 'file', 'File containing wikitext (Default: stdin)', false );
 	}
 
 	public function execute() {
 		$this->initParser();
-		print $this->render( $this->WikiText() );
+		print $this->render( $this->Wikitext() );
 	}
 
 	/**
@@ -89,11 +90,10 @@ class CLIParser extends Maintenance {
 	 * @return string Wikitext
 	 */
 	protected function Wikitext() {
-
 		$php_stdin = 'php://stdin';
 		$input_file = $this->getArg( 0, $php_stdin );
 
-		if ( $input_file === $php_stdin ) {
+		if ( $input_file === $php_stdin && !$this->mQuiet ) {
 			$ctrl = wfIsWindows() ? 'CTRL+Z' : 'CTRL+D';
 			$this->error( basename( __FILE__ )
 				. ": warning: reading wikitext from STDIN. Press $ctrl to parse.\n" );
@@ -110,7 +110,7 @@ class CLIParser extends Maintenance {
 
 	/**
 	 * Title object to use for CLI parsing.
-	 * Default title is 'CLIParser', it can be overriden with the option
+	 * Default title is 'CLIParser', it can be overridden with the option
 	 * --title <Your:Title>
 	 *
 	 * @return Title
@@ -128,10 +128,14 @@ class CLIParser extends Maintenance {
 	 * @return ParserOutput
 	 */
 	protected function parse( $wikitext ) {
+		$options = new ParserOptions;
+		if ( $this->getOption( 'tidy' ) ) {
+			$options->setTidy( true );
+		}
 		return $this->parser->parse(
 			$wikitext,
 			$this->getTitle(),
-			new ParserOptions()
+			$options
 		);
 	}
 }