Merge branch 'release/2.3.0'

Author: delphidabbler

.gitattributes

@@ -0,0 +1,6 @@
+# Customise GitHub Linguist
+
+# Highlight Inno Setup's .ps files as Pascal
+*.ps linguist-language=Pascal
+# Include Markdown files in stats
+*.md linguist-detectable

CHANGELOG.md

@@ -8,6 +8,43 @@ This change log begins with the first ever pre-release version of what was then
 
 From release 2.0.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Release 2.3.0 - 2022-10-22
+
+This release includes _PasHi_ v2.3.0 and _PasHiGUI_ v1.3.0
+
+### PasHi 2.3.0 [build 15]
+
+* Added new `--inhibit-styling` command to prevent `<span>` tags from being emitted for specified highlighter elements. [Issue 30]
+* Modified operation of `--trim` command to add facility to trim trailing spaces from source code lines. Added new parameters to specify whether lines, trailing spaces or nothing are to be trimmed. Maintained backward compatibility with older parameters, but deprecated them. [Issue 29]
+* Added new `-v` command as an alias for `--verbosity`. [Issue 38]
+* Added `frag` parameter as an alias for `fragment` in `--doc-type` command. [Issue 47]
+* Enabled `-` to be used as a parameter.
+* Added support for parsing set type parameters in form `{elem1,elem2,...}`.
+* Updated text of help screen re the new & modified commands.
+* Some minor refactoring.
+
+### PasHiGUI 1.3.0 [build 9]
+
+* Updated options pane to provide support for the new `--inhibit-styling` and modified `--trim` commands.
+
+### General
+
+* Update `UserGuide.html`:
+  * Add information about new & modified commands.
+  * Tweaked some content.
+  * Restyled tales for impreved readability.
+* Bumped config files version from 5 to 6. [Issue 55]
+* Updated `config-template`:
+  * Added comments detailing new `inhibit-styling` and modified `trim` commands.
+  * Added information about `line-number-satrt` command omitted from previous release. [Issue 53]
+  * Standardised formatting of comments.
+  * Added content explaining how to get help on the purpose of the config file commands.
+
+### Repository changes
+
+* Added link to user guide in `README.md`. [Issue 50]
+* Corrected formatting of Inno Setup files on GitHub. [Issue 36]
+
 ## Release 2.2.1 - 2022-08-29
 
 This release includes _PasHi_ v2.2.1 and _PasHiGUI_ v1.2.1. Changes are as follows:
@@ -56,9 +93,8 @@ This release includes _PasHi_ v2.2.0 and _PasHiGUI_ v1.2.0. Changes are as follo
   * Fixed CSS errors
 * Made minor changes to read-me file that is included in distributions.
 * Updated various web addresses in documentation.
-* Updated `config-template` comments:
-  * noted fact that the `version` command can't be used in the `config` file
-  * added details of new `line-number-start` command & its parameters
+* Updated `config-template` comments to note that the `version` command can't be used in the `config` file
+* Bumped config files version from 4 to 5.
 
 ## Release 2.1.0 - 2021-09-22
 
@@ -96,6 +132,7 @@ This release includes _PasHi_ v2.1.0 and _PasHiGUI_ v1.1.0. Changes are as follo
   * noted fact that the `help` command can no longer be used in the `config` file
   * added details of new `viewport` and `edge-compatibility` commands
   * noted new command parameters
+* Bumped config files version from 3 to 4.
 * Commented all v1 CSS classes as deprecated in `.css` files.
 
 ## Release 2.0.0 - 2016-09-22

Config/config-template

@@ -65,6 +65,10 @@
 #
 # A complete list of valid commands follows. Commands and parameters that are
 # slated for removal in the next major release are flagged as deprecated.
+#
+# For an explanation of what these commands do see the documentation of the
+# related command line command in the user guide or in PasHi's help screen,
+# accessed by typing "PasHi --help".
 
 
 # --- Input source commands ---
@@ -78,9 +82,12 @@
 # --- Input source trimming ---
 # Command:
 #   trim <param>
-#     where <param> ie either "yes" or "no"
+#     where <param> is one of "-", "lines", "spaces", "all", "yes" or "no"
+#     ** the "yes" and "no" parameters are DEPRECATED
+#        use "lines" instead of "yes" and "-" instead of "no"
 # Default:
-#   trim yes
+#   trim lines
+#   ** the default is DEPRECATED: may change to "all" in next release
 
 
 # --- Multiple input file separation ---
@@ -145,7 +152,7 @@
 #   title-default
 
 
-# -- Output document encoding ---
+# --- Output document encoding ---
 # Command:
 #   encoding <param>
 #     where <param> is one of "utf-8", "utf-16", "windows-1252" or "iso-8859-1"
@@ -188,38 +195,62 @@
 #   legacy-css no
 
 
-# -- Line numbering
+# --- Code generation ---
+# Command:
+#   inhibit-styling <param>
+#     where <param> is either:
+#       a set of zero or more of the values, "space", "comment", "kwd", "ident",
+#       "sym", "str", "num", "float", "hex", "preproc", "asm" or "err",
+#       separated by commas, with no spaces, and enclosed in curly brackets,
+#     or:
+#       a single one of the above values,
+#     or:
+#       a minus sign, "-", as an alias for the empty set "{}".
+# Examples:
+#   inhibit-styling {space}
+#   inhibit-styling space
+#   inhibit-styling {num,float,hex}
+#   inhibit-styling {}
+#   inhibit-styling -
+# Default:
+#   inhibit-styling {}
+
+
+# --- Line numbering ---
 # Commands:
 #   line-numbering <param>
 #     where <param> is either "on" or "off"
 #   line-number-width <param>
 #     where <param> is a number in range 1..6
 #   line-number-padding <param>
 #     where <param> is one of "space", "zero", "dot" or "dash"
+#   line-number-start <param>
+#     where <param> is a number in range 1...9999
 # Defaults:
 #   line-numbering off
 #   line-number-width 3
 #   line-number-padding space
+#   line-number-start 1
 
 
-# -- Line styling
+# --- Line styling ---
 # Command:
 #   striping <param>
 #     where <param> is either "on" or "off"
 # Default:
 #   striping off
 
 
-# -- Meta tags
+# --- Meta tags ---
 # Commands:
 #   viewport <param>
 #     where <param> is one of "phone" or "none"
 #   edge-compatibility <param>
 #     where <param> is either "on" or "off"
-#   Defaults:
-#     viewport none
-#     ** the viewport default is DEPRECATED: may change in next major release
-#     edge-compatibility off
+# Defaults:
+#   viewport none
+#   ** the viewport default is DEPRECATED: may change in next major release
+#   edge-compatibility off
 
 
 # --- Output verbosity ---

Config/version

@@ -1 +1 @@
-5
+6