HTMLBook Prototype

inc/htmlbook/block/class-paragraph.php

@@ -22,4 +22,11 @@ class Paragraph extends Element {
 	 */
 	protected $tag = 'p';
 
+	/**
+	 * @var array
+	 */
+	protected $dataTypes = [
+		'subtitle',
+		'author',
+	];
 }

inc/htmlbook/class-element.php

@@ -109,6 +109,11 @@ class Element {
 		'wbr',
 	];
 
+	/**
+	 * @var \Pressbooks\HtmLawed
+	 */
+	protected $tidy;
+
 	/**
 	 * @var string
 	 */
@@ -148,6 +153,13 @@ public function __construct() {
 		}
 	}
 
+	/**
+	 * @param bool $tidy
+	 */
+	public function setTidy( bool $tidy, $obj = null ) {
+		$this->tidy = $tidy;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -169,6 +181,13 @@ public function getDataType() {
 		return $this->dataType;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getSupportedDataTypes() {
+		return $this->dataTypes;
+	}
+
 	/**
 	 * @param string $data_type
 	 *
@@ -199,7 +218,17 @@ public function setAttributes( array $attributes ) {
 	 * @param mixed $attribute
 	 */
 	public function appendAttribute( $attribute ) {
-		$this->attributes[] = $attribute;
+		if ( is_array( $attribute ) ) {
+			foreach ( $attribute as $k => $v ) {
+				if ( isset( $this->attributes[ $k ] ) ) {
+					$this->attributes[ $k ] .= " $v";
+				} else {
+					$this->attributes[ $k ] = $v;
+				}
+			}
+		} else {
+			$this->attributes[] = $attribute;
+		}
 	}
 
 	/**
@@ -210,11 +239,14 @@ public function getContent() {
 	}
 
 	/**
-	 * @param array $content
+	 * @param mixed $content
 	 *
 	 * @throws \LogicException
 	 */
-	public function setContent( array $content ) {
+	public function setContent( $content ) {
+		if ( ! is_array( $content ) ) {
+			$content = [ $content ];
+		}
 		foreach ( $content as $v ) {
 			if ( $this === $v ) {
 				throw new \LogicException( 'Recursion problem: cannot set self as content to self' );
@@ -361,9 +393,20 @@ public function __toString() {
 		} else {
 			$html .= '>';
 		}
+
+		$inner_html = '';
 		foreach ( $this->content as $content ) {
-			$html .= (string) $content;
+			$inner_html .= (string) $content;
 		}
+		if ( $this->tidy ) {
+			$inner_html = \Pressbooks\HtmLawed::filter(
+				$inner_html, [
+					'tidy' => 5,
+				]
+			);
+		}
+		$html .= $inner_html;
+
 		$html .= "</{$this->tag}>";
 
 		return $html;

inc/htmlbook/class-validator.php

@@ -11,6 +11,11 @@ class Validator {
 	 */
 	protected $schemaPath;
 
+	/**
+	 * @var array
+	 */
+	protected $errors = [];
+
 	public function __construct() {
 		if ( ! defined( 'PB_XMLLINT_COMMAND' ) ) {
 			define( 'PB_XMLLINT_COMMAND', '/usr/bin/xmllint' );
@@ -31,6 +36,13 @@ public function setSchemaPath( string $schema_path ) {
 		$this->schemaPath = $schema_path;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getErrors() {
+		return $this->errors;
+	}
+
 	/**
 	 * Validate an HTMLBook file
 	 *
@@ -43,15 +55,17 @@ public function validate( string $path ) {
 		$command = PB_XMLLINT_COMMAND . ' --noout --schema ' . escapeshellcmd( $this->getSchemaPath() ) . ' ' . escapeshellcmd( $path ) . ' 2>&1';
 
 		// Execute command
+		$this->errors = [];
 		$output = [];
 		$return_var = 0;
 		exec( $command, $output, $return_var );
 
 		if ( isset( $output[0] ) && str_ends_with( $output[0], ' validates' ) ) {
 			return true;
+		} else {
+			$this->errors = $output;
+			return false;
 		}
-
-		return false;
 	}
 
 }

inc/modules/export/class-export.php

@@ -400,7 +400,6 @@ protected function transformXML( $content, $path_to_xsl ) {
 	 * @param string $section_author (deprecated)
 	 *
 	 * @return string $html blob
-	 * @throws \Exception
 	 */
 	protected function doCopyrightLicense( $metadata, $title = '', $id = 0, $section_author = '' ) {
 
@@ -600,6 +599,9 @@ static function formSubmit() {
 			if ( isset( $x['odt'] ) ) {
 				$modules[] = '\Pressbooks\Modules\Export\Odt\Odt';
 			}
+			if ( isset( $x['htmlbook'] ) ) {
+				$modules[] = '\Pressbooks\Modules\Export\HTMLBook\HTMLBook';
+			}
 
 			// --------------------------------------------------------------------------------------------------------
 			// Other People's Plugins