Removed CSSdoc as it is now a separate project, added to composer dependencies.

Updated how custom tags are handled, they can now be configured through a separate config, and built in handlers are supplied for script and style tags.
Elements with white-space: pre; are now handled differently, you can now specify minifier options for specific elements, and defaults are provided to make <pre>, <textarea>, and <code> keep their whitespace.
Can now specify output options per element, this enables SVG's to be output as XML compliant.
Added a test for SVG output.

Author: hexydec

composer.json

@@ -11,10 +11,10 @@
         }
     ],
     "minimum-stability": "beta",
-    "require": {},
+    "require": {
+		"hexydec/cssdoc": "@dev"
+	},
 	"autoload": {
-		"psr-4": {
-			"hexydec\\htmldoc\\": "src/"
-		}
+		"classmap": ["src/"]
 	}
 }

composer.lock

@@ -18,8 +18,6 @@ The options set into the object are setup for general use, but can be configured
 | `inline`		| HTML elements that are considered inline			| `['b', 'u', 'big', 'i', 'small', 'ttspan', 'em', 'a', 'strong', 'sub', 'sup', 'abbr', 'acronym', 'cite', 'code', 'dfn', 'em', 'kbd', 'strong', 'samp', 'var', 'span']` |
 | `singleton`	| HTML elements that are singletons					| `['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr']` |
 | `closeoptional`	| HTML elements that don't have to be closed	| `['head', 'body', 'p', 'dt', 'dd', 'li', 'option', 'thead', 'th', 'tbody', 'tr', 'td', 'tfoot', 'colgroup']` |
-| `pre`			| HTML elements that contain pre-formatted content	| `['textarea', 'pre', 'code']` |
-| `plugins`		| HTML elements that have a custom handler class	| `['script', 'style']` 		|
 
 #### `attributes`
 
@@ -31,6 +29,26 @@ The options set into the object are setup for general use, but can be configured
 | `urls`		| Attributes that contain urls						| `['href', 'src', 'action', 'poster']` |
 | `urlskip`		| Skips compressing URLs if tag => attribute => value matches | <code>[<br>&nbsp; &nbsp; 'link' => [<br>&nbsp; &nbsp; &nbsp; &nbsp; 'rel' => ['stylesheet', 'icon', 'shortcut icon', 'apple-touch-icon-precomposed', 'apple-touch-icon', 'preload', 'prefetch', 'author', 'help']<br>&nbsp; &nbsp; ]<br>]</code> |
 
+#### `custom`
+
+This option enables you to specify custom handlers for specific tags. By default there are built in handlers for `style` and `script` tags, currently CSS is minified using [hexydec\\css\\cssdoc](https://github.com/hexydec/cssdoc) if you install the module using composer.
+
+There is currently no built-in minifier for Javascript, although an external minifier can be specified in the custom tag options:
+
+| option		| Description																		|
+|---------------|-----------------------------------------------------------------------------------|
+| `class`		| The name of the handler class (Should implement \hexydec\html\token) 				|
+| `config`		| An array of custom configuration to be passed to the handler class				|
+
+Note that the built in `style` and `script` handlers both specify `minifier` in the `config` array, here you can specify a callback for a custom minifier with the following pattern:
+
+```php
+function (string $css) : string {
+	// manipulate the css
+	return $css;
+}
+```
+
 ## Returns
 
 A new HTMLdoc object.

docs/api/construct.md

@@ -21,10 +21,10 @@ if ($doc->load($html)) {
 	</thead>
 	<tbody>
 		<tr>
-			<td rowspan="5"><code>$options</code></td>
-			<td rowspan="5">Array</td>
+			<td rowspan="6"><code>$options</code></td>
+			<td rowspan="6">Array</td>
 			<td colspan="2">An array of output options, the input is merged with `htmldoc::$config['output']`. <em>Note that for most scenarios, specifying this argument is not required</em></td>
-			<td><code>Array()</code</td>
+			<td><code>[]</code></td>
 		</tr>
 		<tr>
 			<td><code>quotestyle</code></td>
@@ -46,6 +46,17 @@ if ($doc->load($html)) {
 			<td>A boolean specifying whether to render XML compliant output. Setting this to <code>true</code> automatically sets <code>quotestyle = &quot;double&quot;</code>, <code>singletonclose = &quot;/&gt;&quot;</code>, and <code>closetag = true</code></td>
 			<td><code>false</code></td>
 		</tr>
+		<tr>
+			<td><code>elements</code></td>
+			<td>An array specifying output options for specific tags</td>
+			<td><code>[<br>
+				&nbsp; 'svg' => [<br>
+				&nbsp; &nbsp; 'xml' => true,<br>
+				&nbsp; &nbsp; 'quotestyle' => 'double',<br>
+				&nbsp; &nbsp; 'singletonclose' => '/>',<br>
+				&nbsp; &nbsp; 'closetags' => true<br>
+				&nbsp; ]</code></td>
+		</tr>
 	</tbody>
 </table>
 

docs/api/html.md

@@ -54,7 +54,7 @@ if ($doc->open($url, $context, $error)) {
 }
 ```
 
-For more information, see the API documentation for the [`load()` method](api/load.md) and the [`open()` method](api/load.md).
+For more information, see the API documentation for the [`load()` method](api/load.md) and the [`open()` method](api/open.md).
 
 ## Finding Elements and Extracting Information
 

docs/how-to-use.md

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
 			},
 			options: {
 				bin: "php tools/phpunit.phar",
-				bootstrap: "src/autoload.php",
+				bootstrap: "vendor/autoload.php",
 				testdox: true,
 				colors: true,
 				//debug: true

gruntfile.js

@@ -1,5 +1,5 @@
 <?php
-require(__DIR__.'/src/autoload.php');
+require(__DIR__.'/vendor/autoload.php');
 
 $base = empty($_POST['base']) ? '' : $_POST['base'];
 $input = '';
@@ -62,15 +62,19 @@
 		// retrieve the user posted options
 		$isset = isset($_POST['minify']) && is_array($_POST['minify']);
 		foreach ($options AS $key => $item) {
-			$minify[$key] = $isset && in_array($key, $_POST['minify']) ? (is_array($item) ? [] : (is_bool($options[$key]) ? true : $options[$key])) : false;
-			if (is_array($item)) {
-				foreach ($item AS $sub => $value) {
-					if ($minify[$key] !== false && isset($_POST['minify'][$key]) && is_array($_POST['minify'][$key]) && in_array($sub, $_POST['minify'][$key])) {
-						$minify[$key][$sub] = true;
-					} elseif ($minify[$key]) {
-						$minify[$key][$sub] = false;
+			if ($key != 'elements') {
+				$minify[$key] = $isset && in_array($key, $_POST['minify']) ? (is_array($item) ? [] : (is_bool($options[$key]) ? true : $options[$key])) : false;
+				if (is_array($item)) {
+					foreach ($item AS $sub => $value) {
+						if ($minify[$key] !== false && isset($_POST['minify'][$key]) && is_array($_POST['minify'][$key]) && in_array($sub, $_POST['minify'][$key])) {
+							$minify[$key][$sub] = true;
+						} elseif ($minify[$key]) {
+							$minify[$key][$sub] = false;
+						}
 					}
 				}
+			} else {
+				unset($options[$key]);
 			}
 		}
 

index.php

@@ -1,17 +1,19 @@
 # HTMLDoc: PHP HTML Document Parser and Minifier
 
-A tokeniser based HTML and CSS document parser and minifier, written in PHP.
+A tokeniser based HTML document parser and minifier, written in PHP.
 
 ![Licence](https://img.shields.io/badge/Licence-MIT-lightgrey.svg)
 [![Build Status](https://api.travis-ci.org/hexydec/htmldoc.svg?branch=master)](https://travis-ci.org/hexydec/htmldoc)
 ![Code Coverage](https://codecov.io/gh/hexydec/htmldoc/branch/master/graph/badge.svg)
 
 ## Description
 
-An HTML and CSS parser, primarily designed for minifying HTML documents, it also enables the document structure to be queried allowing attribute and textnode values to be extracted.
+An HTML parser, primarily designed for minifying HTML documents, it also enables the document structure to be queried allowing attribute and textnode values to be extracted.
 
 Both parsers are designed around a tokeniser to make the document processing more reliable than regex based minifiers, which are a bit blunt and can be problematic if they match patterns in the wrong places.
 
+The software is also capable of processing and minifying SVG documents.
+
 ## Usage
 
 To minify an HTML document:

readme.md

@@ -11,15 +11,7 @@
 		'hexydec\\html\\script' => $dir.'/tokens/script.php',
 		'hexydec\\html\\style' => $dir.'/tokens/style.php',
 		'hexydec\\html\\tag' => $dir.'/tokens/tag.php',
-		'hexydec\\html\\text' => $dir.'/tokens/text.php',
-		'hexydec\\html\\cssmin' => $dir.'/cssmin.php',
-		'hexydec\\css\\cssdoc' => __DIR__.'/cssdoc/cssdoc.php',
-		'hexydec\\css\\document' => __DIR__.'/cssdoc/tokens/document.php',
-		'hexydec\\css\\directive' => __DIR__.'/cssdoc/tokens/directive.php',
-		'hexydec\\css\\rule' => __DIR__.'/cssdoc/tokens/rule.php',
-		'hexydec\\css\\selector' => __DIR__.'/cssdoc/tokens/selector.php',
-		'hexydec\\css\\property' => __DIR__.'/cssdoc/tokens/property.php',
-		'hexydec\\css\\value' => __DIR__.'/cssdoc/tokens/value.php'
+		'hexydec\\html\\text' => $dir.'/tokens/text.php'
 	];
 	if (isset($classes[$class])) {
 		return require($classes[$class]);