Merge branch 'master' of https://github.com/jdorn/sql-formatter

Conflicts:
	lib/SqlFormatter.php

5 files changed, 662 insertions, 123 deletions

diff --git a/.gitignore b/.gitignore
index d1502b0..48b8bf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 vendor/
-composer.lock
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..379ab13
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,422 @@
+{
+    "hash": "a709b40d4a35e7077aa40fbd0f78f6c6",
+    "packages": [
+
+    ],
+    "packages-dev": [
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "1.2.9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9",
+                "reference": "1.2.9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable",
+                "phpunit/php-token-stream": ">=1.1.3@stable"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2013-02-26 18:55:56"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
+                "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-01-07 10:47:05"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "1eeef106193d2f8c539728e566bb4793071a9e18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18",
+                "reference": "1eeef106193d2f8c539728e566bb4793071a9e18",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2013-01-07 10:56:17"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
+                "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2013-01-30 06:08:51"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98",
+                "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2013-01-07 10:56:35"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2c67e52445416bb7c14046b432acd7eb79e4e612",
+                "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
+                "phpunit/php-file-iterator": ">=1.3.1",
+                "phpunit/php-text-template": ">=1.1.1",
+                "phpunit/php-timer": ">=1.0.2,<1.1.0",
+                "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
+                "symfony/yaml": ">=2.2.0"
+            },
+            "require-dev": {
+                "pear-pear/pear": "1.9.4"
+            },
+            "suggest": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+            },
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2013-03-11 07:06:05"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4",
+                "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2013-02-05 07:46:41"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "dev-master",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "f198ac28048eeceae852419c076123aaee59cd1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/f198ac28048eeceae852419c076123aaee59cd1c",
+                "reference": "f198ac28048eeceae852419c076123aaee59cd1c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2013-01-31 21:39:01"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "dev",
+    "stability-flags": [
+
+    ],
+    "platform": {
+        "php": ">=5.2.4"
+    },
+    "platform-dev": [
+
+    ]
+}
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php
index 6602173..7b94920 100644
--- a/lib/SqlFormatter.php
+++ b/lib/SqlFormatter.php
@@ -19,12 +19,13 @@ class SqlFormatter
     const TOKEN_TYPE_QUOTE = 2;
     const TOKEN_TYPE_BACKTICK_QUOTE = 3;
     const TOKEN_TYPE_RESERVED = 4;
-    const TOKEN_TYPE_SPECIAL_RESERVED = 5;
-    const TOKEN_TYPE_BOUNDARY = 6;
-    const TOKEN_TYPE_COMMENT = 7;
-    const TOKEN_TYPE_BLOCK_COMMENT = 8;
-    const TOKEN_TYPE_NUMBER = 9;
-    const TOKEN_TYPE_ERROR = 10;
+    const TOKEN_TYPE_RESERVED_TOPLEVEL = 5;
+    const TOKEN_TYPE_RESERVED_NEWLINE = 6;
+    const TOKEN_TYPE_BOUNDARY = 7;
+    const TOKEN_TYPE_COMMENT = 8;
+    const TOKEN_TYPE_BLOCK_COMMENT = 9;
+    const TOKEN_TYPE_NUMBER = 10;
+    const TOKEN_TYPE_ERROR = 11;
     
     // Constants for different components of a token
     const TOKEN_TYPE = 0;
@@ -32,37 +33,41 @@ class SqlFormatter
     
     // Reserved words (for syntax highlighting)
     protected static $reserved = array(
-        'ACCESSIBLE', 'ACTION', 'AGAINST', 'AGGREGATE', 'ALGORITHM', 'ALL', 'ALTER', 'ANALYSE', 'ANALYZE', 'AND', 'AS', 'ASC',
+        'ACCESSIBLE', 'ACTION', 'AGAINST', 'AGGREGATE', 'ALGORITHM', 'ALL', 'ALTER', 'ANALYSE', 'ANALYZE', 'AS', 'ASC',
         'AUTOCOMMIT', 'AUTO_INCREMENT', 'BACKUP', 'BEGIN', 'BETWEEN', 'BINLOG', 'BOTH', 'CASCADE', 'CASE', 'CHANGE', 'CHANGED',
         'CHARSET', 'CHECK', 'CHECKSUM', 'COLLATE', 'COLLATION', 'COLUMN', 'COLUMNS', 'COMMENT', 'COMMIT', 'COMMITTED', 'COMPRESSED', 'CONCURRENT',
         'CONSTRAINT', 'CONTAINS', 'CONVERT', 'COUNT', 'CREATE', 'CROSS', 'CURRENT_TIMESTAMP', 'DATABASE', 'DATABASES', 'DAY', 'DAY_HOUR', 'DAY_MINUTE',
         'DAY_SECOND', 'DEFAULT', 'DEFINER', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DETERMINISTIC', 'DISTINCT', 'DISTINCTROW', 'DIV',
-        'DO', 'DROP', 'DUMPFILE', 'DUPLICATE', 'DYNAMIC', 'ELSE', 'ENCLOSED', 'END', 'ENGINE', 'ENGINE_TYPE', 'ENGINES', 'ESCAPE', 'ESCAPED', 'EVENTS', 'EXECUTE',
+        'DO', 'DUMPFILE', 'DUPLICATE', 'DYNAMIC', 'ELSE', 'ENCLOSED', 'END', 'ENGINE', 'ENGINE_TYPE', 'ENGINES', 'ESCAPE', 'ESCAPED', 'EVENTS', 'EXECUTE',
         'EXISTS', 'EXPLAIN', 'EXTENDED', 'FAST', 'FIELDS', 'FILE', 'FIRST', 'FIXED', 'FLUSH', 'FOR', 'FORCE', 'FOREIGN', 'FULL', 'FULLTEXT',
         'FUNCTION', 'GLOBAL', 'GRANT', 'GRANTS', 'GROUP_CONCAT', 'HEAP', 'HIGH_PRIORITY', 'HOSTS', 'HOUR', 'HOUR_MINUTE',
         'HOUR_SECOND', 'IDENTIFIED', 'IF', 'IGNORE', 'IN', 'INDEX', 'INDEXES', 'INFILE', 'INSERT', 'INSERT_ID', 'INSERT_METHOD', 'INTERVAL',
         'INTO', 'INVOKER', 'IS', 'ISOLATION', 'KEY', 'KEYS', 'KILL', 'LAST_INSERT_ID', 'LEADING', 'LEVEL', 'LIKE', 'LINEAR',
         'LINES', 'LOAD', 'LOCAL', 'LOCK', 'LOCKS', 'LOGS', 'LOW_PRIORITY', 'MARIA', 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE',
         'MATCH', 'MEDIUM', 'MERGE', 'MINUTE', 'MINUTE_SECOND', 'MIN_ROWS', 'MODE', 'MODIFY',
-        'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW', 'NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY', 'OR',
+        'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW', 'NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY',
         'ON UPDATE', 'ON DELETE', 'OUTFILE', 'PACK_KEYS', 'PAGE', 'PARTIAL', 'PARTITION', 'PARTITIONS', 'PASSWORD', 'PRIMARY', 'PRIVILEGES', 'PROCEDURE',
         'PROCESS', 'PROCESSLIST', 'PURGE', 'QUICK', 'RANGE', 'READ', 'READ_ONLY',
         'READ_WRITE', 'REFERENCES', 'REGEXP', 'RELOAD', 'RENAME', 'REPAIR', 'REPEATABLE', 'REPLACE', 'REPLICATION', 'RESET', 'RESTORE', 'RESTRICT',
         'RETURN', 'RETURNS', 'REVOKE', 'RLIKE', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', 'SECOND', 'SECURITY', 'SEPARATOR',
-        'SERIALIZABLE', 'SESSION', 'SET', 'SHARE', 'SHOW', 'SHUTDOWN', 'SLAVE', 'SONAME', 'SOUNDS', 'SQL',
+        'SERIALIZABLE', 'SESSION', 'SHARE', 'SHOW', 'SHUTDOWN', 'SLAVE', 'SONAME', 'SOUNDS', 'SQL',
         'SQL_CACHE', 'SQL_NO_CACHE', 'START', 'STARTING', 'STATUS', 'STOP', 'STORAGE',
         'STRAIGHT_JOIN', 'STRING', 'SUPER', 'TABLE', 'TABLES', 'TEMPORARY', 'TERMINATED', 'THEN', 'TO', 'TRAILING', 'TRANSACTIONAL',
         'TRUNCATE', 'TYPE', 'TYPES', 'UNCOMMITTED', 'UNIQUE', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USE', 'USING', 'VARIABLES',
-        'VIEW', 'WHEN', 'WITH', 'WORK', 'WRITE', 'XOR', 'YEAR_MONTH'
+        'VIEW', 'WHEN', 'WITH', 'WORK', 'WRITE', 'YEAR_MONTH'
     );
 
     // For SQL formatting
     // These keywords will all be on their own line
-    protected static $special_reserved = array(
-        'SELECT', 'FROM', 'WHERE', 'SET', 'ORDER BY', 'GROUP BY', 'LEFT JOIN', 'OUTER JOIN', 'INNER JOIN', 'RIGHT JOIN', 'JOIN', 'LIMIT',
+    protected static $reserved_toplevel = array(
+        'SELECT', 'FROM', 'WHERE', 'SET', 'ORDER BY', 'GROUP BY', 'LIMIT', 'DROP',
         'VALUES', 'UPDATE', 'HAVING', 'ADD', 'AFTER', 'ALTER TABLE', 'DELETE FROM', 'UNION ALL', 'UNION', 'EXCEPT', 'INTERSECT'
     );
 
+    protected static $reserved_newline = array(
+        'LEFT JOIN', 'RIGHT JOIN', 'OUTER JOIN', 'INNER JOIN', 'JOIN', 'XOR', 'OR', 'AND'
+    );
+
     // Punctuation that can be used as a boundary between other tokens
     protected static $boundaries = array(',', ';', ')', '(', '.', '=', '<', '>', '+', '-', '*', '/', '!', '^', '%', '|', '&', '#');
 
@@ -105,7 +110,8 @@ class SqlFormatter
     // Regular expressions for tokenizing
     protected static $regex_boundaries;
     protected static $regex_reserved;
-    protected static $regex_special_reserved;
+    protected static $regex_reserved_newline;
+    protected static $regex_reserved_toplevel;
 
     // Cache variables
     // Only tokens shorter than this size will be cached.  Somewhere between 10 and 20 seems to work well for most cases.
@@ -139,7 +145,8 @@ class SqlFormatter
         // Set up regular expressions
         self::$regex_boundaries = '('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$boundaries)).')';
         self::$regex_reserved = '('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved)).')';
-        self::$regex_special_reserved = str_replace(' ','\\s+','('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$special_reserved)).')');
+        self::$regex_reserved_toplevel = str_replace(' ','\\s+','('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved_toplevel)).')');
+        self::$regex_reserved_newline = str_replace(' ','\\s+','('.implode('|',array_map(array('SqlFormatter', 'quote_regex'),self::$reserved_newline)).')');
 
         self::$init = true;
     }
@@ -222,10 +229,17 @@ class SqlFormatter
         // this makes it so in "mytable.from", "from" is not considered a reserved word
         if (!$previous || !isset($previous[self::TOKEN_VALUE]) || $previous[self::TOKEN_VALUE] !== '.') {
             $upper = strtoupper($string);
-            // Special Reserved Word
-            if(preg_match('/^('.self::$regex_special_reserved.')($|\s|'.self::$regex_boundaries.')/', $upper,$matches)) {
+            // Top Level Reserved Word
+            if(preg_match('/^('.self::$regex_reserved_toplevel.')($|\s|'.self::$regex_boundaries.')/', $upper,$matches)) {
                 return array(
-                    self::TOKEN_TYPE=>self::TOKEN_TYPE_SPECIAL_RESERVED,
+                    self::TOKEN_TYPE=>self::TOKEN_TYPE_RESERVED_TOPLEVEL,
+                    self::TOKEN_VALUE=>substr($string,0,strlen($matches[1]))
+                );
+            }
+            // Newline Reserved Word
+            if(preg_match('/^('.self::$regex_reserved_newline.')($|\s|'.self::$regex_boundaries.')/', $upper,$matches)) {
+                return array(
+                    self::TOKEN_TYPE=>self::TOKEN_TYPE_RESERVED_NEWLINE,
                     self::TOKEN_VALUE=>substr($string,0,strlen($matches[1]))
                 );
             }
@@ -425,7 +439,7 @@ class SqlFormatter
                     }
                     
                     // Reached an invalid token type for inline parentheses
-                    if ($next[self::TOKEN_TYPE]===self::TOKEN_TYPE_SPECIAL_RESERVED || $next[self::TOKEN_TYPE]===self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE]===self::TOKEN_TYPE_BLOCK_COMMENT) {
+                    if ($next[self::TOKEN_TYPE]===self::TOKEN_TYPE_RESERVED_TOPLEVEL || $next[self::TOKEN_TYPE]===self::TOKEN_TYPE_RESERVED_NEWLINE || $next[self::TOKEN_TYPE]===self::TOKEN_TYPE_COMMENT || $next[self::TOKEN_TYPE]===self::TOKEN_TYPE_BLOCK_COMMENT) {
                         break;
                     }
                     
@@ -495,8 +509,8 @@ class SqlFormatter
                 $newline = true;
             }
            
-            // Special reserved words start a new line and increase the special indent level
-            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_SPECIAL_RESERVED) {
+            // Top level reserved words start a new line and increase the special indent level
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
                 $increase_special_indent = true;
                
                 // If the last indent type was 'special', decrease the special indent for this round
@@ -506,9 +520,9 @@ class SqlFormatter
                     array_shift($indent_types);
                 }
                
-                // Add a newline after the special reserved word
+                // Add a newline after the top level reserved word
                 $newline = true;
-                // Add a newline before the special reserved word (if not already added)
+                // Add a newline before the top level reserved word (if not already added)
                 if(!$added_newline) {
                     $return .= "\n" . str_repeat($tab, $indent_level);
                 }
@@ -522,6 +536,19 @@ class SqlFormatter
                     $highlighted = preg_replace('/\s+/',' ',$highlighted);
                 }
             }
+
+            // Newline reserved words start a new line
+            elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE) {
+                // Add a newline before the reserved word (if not already added)
+                if(!$added_newline) {
+                    $return .= "\n" . str_repeat($tab, $indent_level);
+                }
+
+                // If the token may have extra whitespace
+                if (strpos($token[self::TOKEN_VALUE],' ')!==false || strpos($token[self::TOKEN_VALUE],"\n")!==false || strpos($token[self::TOKEN_VALUE],"\t")!==false) {
+                    $highlighted = preg_replace('/\s+/',' ',$highlighted);
+                }
+            }
             
             // Multiple boundary characters in a row should not have spaces between them (not including parentheses)
             elseif($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
@@ -678,7 +705,10 @@ class SqlFormatter
         elseif($type===self::TOKEN_TYPE_RESERVED) {
             return self::highlightReservedWord($token);
         }
-        elseif($type===self::TOKEN_TYPE_SPECIAL_RESERVED) {
+        elseif($type===self::TOKEN_TYPE_RESERVED_TOPLEVEL) {
+            return self::highlightReservedWord($token);
+        }
+        elseif($type===self::TOKEN_TYPE_RESERVED_NEWLINE) {
             return self::highlightReservedWord($token);
         }
         elseif($type===self::TOKEN_TYPE_NUMBER) {
diff --git a/tests/format-highlight.html b/tests/format-highlight.html
index 0be035d..38fc4da 100644
--- a/tests/format-highlight.html
+++ b/tests/format-highlight.html
@@ -4,8 +4,7 @@
   <span style="font-weight:bold;">COUNT</span>(<span style="color: #333;">order_id</span>) <span style="font-weight:bold;">as</span> <span style="color: #333;">total</span> 
 <span style="font-weight:bold;">FROM</span> 
   <span style="color: #333;">customers</span> 
-<span style="font-weight:bold;">INNER JOIN</span> 
-  <span style="color: #333;">orders</span> <span style="font-weight:bold;">ON</span> <span style="color: #333;">customers</span><span >.</span><span style="color: #333;">customer_id</span> <span >=</span> <span style="color: #333;">orders</span><span >.</span><span style="color: #333;">customer_id</span> 
+  <span style="font-weight:bold;">INNER JOIN</span> <span style="color: #333;">orders</span> <span style="font-weight:bold;">ON</span> <span style="color: #333;">customers</span><span >.</span><span style="color: #333;">customer_id</span> <span >=</span> <span style="color: #333;">orders</span><span >.</span><span style="color: #333;">customer_id</span> 
 <span style="font-weight:bold;">GROUP BY</span> 
   <span style="color: #333;">customer_id</span><span >,</span> 
   <span style="color: #333;">customer_name</span> 
@@ -158,259 +157,296 @@
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayPayment'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'cheque'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayPaymentReturn'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'cheque'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayHome'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'homeslider'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionAuthentication'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'statsdata'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionShopDataDuplication'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'homeslider'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayTop'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blocklanguages'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionCustomerAccountAdd'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'statsdata'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayCustomerAccount'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'favoriteproducts'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayAdminStatsModules'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'statsvisits'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayAdminStatsGraphEngine'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'graphvisifire'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayAdminStatsGridEngine'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'gridhtml'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayLeftColumnProduct'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blocksharefb'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionSearch'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'statssearch'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionCategoryAdd'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blockcategories'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionCategoryUpdate'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blockcategories'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionCategoryDelete'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blockcategories'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'actionAdminMetaSave'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'blockcategories'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayMyAccountBlock'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_module`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'favoriteproducts'</span>
-  ) <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">OR</span> <span style="color: #333;">id_hook</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_hook</span> 
     <span style="font-weight:bold;">FROM</span> 
       <span style="color: purple;">`PREFIX_hook`</span> 
     <span style="font-weight:bold;">WHERE</span> 
       <span style="color: #333;">name</span> <span >=</span> <span style="color: blue;">'displayFooter'</span>
-  ) <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
+  ) 
+  <span style="font-weight:bold;">AND</span> <span style="color: #333;">id_module</span> <span >=</span> (
     <span style="font-weight:bold;">SELECT</span> 
       <span style="color: #333;">id_module</span> 
     <span style="font-weight:bold;">FROM</span> 
@@ -507,13 +543,13 @@
     <span style="color: blue;">'0000-00-00 00:00:00'</span> 
   <span style="font-weight:bold;">FROM</span> 
     <span style="color: purple;">`PREFIX_discount_quantity`</span> <span style="color: #333;">dq</span> 
-  <span style="font-weight:bold;">INNER JOIN</span> 
-    <span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span> <span style="font-weight:bold;">ON</span> (
+    <span style="font-weight:bold;">INNER JOIN</span> <span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span> <span style="font-weight:bold;">ON</span> (
       <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`id_product`</span> <span >=</span> <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_product`</span>
     )
 )</pre>
 
-<pre style="color: black; background-color: white;"><span style="font-weight:bold;">DROP</span> <span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_discount_quantity`</span></pre>
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">DROP</span> 
+  <span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_discount_quantity`</span></pre>
 
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_specific_price`</span> (
   <span style="color: purple;">`id_product`</span><span >,</span> 
@@ -561,14 +597,20 @@
   <span style="font-weight:bold;">FROM</span> 
     <span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span> 
   <span style="font-weight:bold;">WHERE</span> 
-    <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> <span style="font-weight:bold;">OR</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_percent`</span>
+    <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> 
+    <span style="font-weight:bold;">OR</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_percent`</span>
 )</pre>
 
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span> 
-  <span style="color: purple;">`PREFIX_product`</span> <span style="font-weight:bold;">DROP</span> <span style="color: purple;">`reduction_price`</span><span >,</span> 
-  <span style="font-weight:bold;">DROP</span> <span style="color: purple;">`reduction_percent`</span><span >,</span> 
-  <span style="font-weight:bold;">DROP</span> <span style="color: purple;">`reduction_from`</span><span >,</span> 
-  <span style="font-weight:bold;">DROP</span> <span style="color: purple;">`reduction_to`</span></pre>
+  <span style="color: purple;">`PREFIX_product`</span> 
+<span style="font-weight:bold;">DROP</span> 
+  <span style="color: purple;">`reduction_price`</span><span >,</span> 
+<span style="font-weight:bold;">DROP</span> 
+  <span style="color: purple;">`reduction_percent`</span><span >,</span> 
+<span style="font-weight:bold;">DROP</span> 
+  <span style="color: purple;">`reduction_from`</span><span >,</span> 
+<span style="font-weight:bold;">DROP</span> 
+  <span style="color: purple;">`reduction_to`</span></pre>
 
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (
   <span style="color: purple;">`name`</span><span >,</span> 
@@ -788,7 +830,8 @@
 
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">UNLOCK</span> <span style="font-weight:bold;">TABLES</span></pre>
 
-<pre style="color: black; background-color: white;"><span style="font-weight:bold;">DROP</span> <span style="font-weight:bold;">TABLE</span> <span style="font-weight:bold;">IF</span> <span style="font-weight:bold;">EXISTS</span> <span style="color: purple;">`admin_role`</span></pre>
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">DROP</span> 
+  <span style="font-weight:bold;">TABLE</span> <span style="font-weight:bold;">IF</span> <span style="font-weight:bold;">EXISTS</span> <span style="color: purple;">`admin_role`</span></pre>
 
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> 
   <span >*</span> 
@@ -807,7 +850,8 @@
   <span style="color: #333;">Test</span> 
 <span style="font-weight:bold;">WHERE</span> 
   (<span style="color: #333;">MyColumn</span> <span >=</span> <span style="color: green;">1</span>)
-<span style="background-color: red;">)</span><span style="font-weight:bold;">AND</span> (
+<span style="background-color: red;">)</span>
+<span style="font-weight:bold;">AND</span> (
   (
     (<span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span> 
 <span style="background-color: red;">WARNING: unclosed parentheses or section</span></pre>
\ No newline at end of file
diff --git a/tests/format.html b/tests/format.html
index e806f6d..db1f95a 100644
--- a/tests/format.html
+++ b/tests/format.html
@@ -4,8 +4,7 @@ SELECT
   COUNT(order_id) as total 
 FROM 
   customers 
-INNER JOIN 
-  orders ON customers.customer_id = orders.customer_id 
+  INNER JOIN orders ON customers.customer_id = orders.customer_id 
 GROUP BY 
   customer_id, 
   customer_name 
@@ -158,259 +157,296 @@ WHERE
       `PREFIX_hook` 
     WHERE 
       name = 'displayPayment'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'cheque'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayPaymentReturn'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'cheque'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayHome'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'homeslider'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionAuthentication'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'statsdata'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionShopDataDuplication'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'homeslider'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayTop'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blocklanguages'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionCustomerAccountAdd'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'statsdata'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayCustomerAccount'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'favoriteproducts'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayAdminStatsModules'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'statsvisits'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayAdminStatsGraphEngine'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'graphvisifire'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayAdminStatsGridEngine'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'gridhtml'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayLeftColumnProduct'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blocksharefb'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionSearch'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'statssearch'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionCategoryAdd'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blockcategories'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionCategoryUpdate'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blockcategories'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionCategoryDelete'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blockcategories'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'actionAdminMetaSave'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'blockcategories'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayMyAccountBlock'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
       `PREFIX_module` 
     WHERE 
       name = 'favoriteproducts'
-  ) OR id_hook = (
+  ) 
+  OR id_hook = (
     SELECT 
       id_hook 
     FROM 
       `PREFIX_hook` 
     WHERE 
       name = 'displayFooter'
-  ) AND id_module = (
+  ) 
+  AND id_module = (
     SELECT 
       id_module 
     FROM 
@@ -507,13 +543,13 @@ INSERT INTO `PREFIX_specific_price` (
     '0000-00-00 00:00:00' 
   FROM 
     `PREFIX_discount_quantity` dq 
-  INNER JOIN 
-    `PREFIX_product` p ON (
+    INNER JOIN `PREFIX_product` p ON (
       p.`id_product` = dq.`id_product`
     )
 )
 
-DROP TABLE `PREFIX_discount_quantity`
+DROP 
+  TABLE `PREFIX_discount_quantity`
 
 INSERT INTO `PREFIX_specific_price` (
   `id_product`, 
@@ -561,14 +597,20 @@ INSERT INTO `PREFIX_specific_price` (
   FROM 
     `PREFIX_product` p 
   WHERE 
-    p.`reduction_price` OR p.`reduction_percent`
+    p.`reduction_price` 
+    OR p.`reduction_percent`
 )
 
 ALTER TABLE 
-  `PREFIX_product` DROP `reduction_price`, 
-  DROP `reduction_percent`, 
-  DROP `reduction_from`, 
-  DROP `reduction_to`
+  `PREFIX_product` 
+DROP 
+  `reduction_price`, 
+DROP 
+  `reduction_percent`, 
+DROP 
+  `reduction_from`, 
+DROP 
+  `reduction_to`
 
 INSERT INTO `PREFIX_configuration` (
   `name`, 
@@ -788,7 +830,8 @@ LOCK TABLES `admin_assert` WRITE
 
 UNLOCK TABLES
 
-DROP TABLE IF EXISTS `admin_role`
+DROP 
+  TABLE IF EXISTS `admin_role`
 
 SELECT 
   * 
@@ -807,6 +850,7 @@ FROM
   Test 
 WHERE 
   (MyColumn = 1)
-) AND (
+) 
+AND (
   (
     (SomeOtherColumn = 2);
\ No newline at end of file