Merge branch 'release/2.3.1'

Author: delphidabbler

CHANGELOG.md

@@ -8,6 +8,19 @@ 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.1 - 2022-10-27
+
+This release includes _PasHi_ v2.3.1 and _PasHiGUI_ v1.3.1
+
+### PasHi 2.3.1 [build 16]
+
+* Corrected help screen entry for `--line-number-start` command . [Issue 63]
+
+### PasHiGUI 1.3.1 [build 10]
+
+* Fixed compilation problem causing `UUtils` unit to fail to compile from a fresh build. [Issue 64]
+* Fixed bug where the `frag` alias for the `fragment` parameter of the `doc-type` config command was not being recognised. [Issue 66]
+
 ## Release 2.3.0 - 2022-10-22
 
 This release includes _PasHi_ v2.3.0 and _PasHiGUI_ v1.3.0

Src/Assets/Help.txt

@@ -116,8 +116,9 @@ PasHi supports the following commands:
                               zero - pad with zeros
                               dash - pad with dashes (-)
                               dot - pad with dots (.).
---line-number-start   -z    Determines line number of first line of listing,
-                            in range 1..9999 [default 1].
+--line-number-start   -z    Determines line number of first line of listing.
+                            The next parameter specifies a line number in the
+                            range 1..9999 [default 1].
 --line-number-width   -i    Determines minimum width, in characters, occupied
                             by line numbers. Line numbers are padded to this
                             width if necessary. The next parameter specifies
@@ -188,4 +189,4 @@ containing spaces must not be enclosed in quotes. The "help" and "version"
 commands must *not* be used in a config file otherwise PasHi will exit with an
 error.
 
-PasHi's application data directory is %AppData%\DelphiDabbler\PasHi.
+PasHi's application data directory is %AppData%\DelphiDabbler\PasHi.

Src/GUI/FmMain.pas

@@ -602,7 +602,9 @@ procedure TMainForm.pcMainMouseLeave(Sender: TObject);
 
 procedure TMainForm.Render;
 begin
-  if fOptions.GetParamAsStr('doc-type') = 'fragment' then
+  if IsStrInList(
+    fOptions.GetParamAsStr('doc-type'), ['fragment', 'frag'], False
+  ) then
     fDocument.OutputType := doFragment
   else
     fDocument.OutputType := doComplete;

Src/GUI/FrOptions.UDocType.pas

@@ -45,7 +45,8 @@ implementation
 
 uses
   StrUtils,
-  Types;
+  Types,
+  UUtils;
 
 {$R *.dfm}
 
@@ -99,7 +100,7 @@ procedure TDocTypeOptionsFrame.Initialise(const Options: TOptions);
   Idx: Integer;
 begin
   DocType := Options.GetParamAsStr('doc-type');
-  if DocType = 'fragment' then
+  if IsStrInList(DocType, ['fragment', 'frag'], False) then
   begin
     rbDocTypeFragment.Checked := True;
     rbDocTypeComplete.Checked := False;

Src/GUI/UUtils.pas

@@ -36,8 +36,6 @@ implementation
 
 
 uses
-  // Project
-  UConsts,
   // Delphi
   SysUtils, ActiveX;
 

VERSION

@@ -1,7 +1,7 @@
 # PasHi & PasHiGUI file & product version numbers
 
-cmdlinefilever=2.3.0
-cmdlinebuild=15
-guifilever=1.3.0
-guibuild=9
-productver=2.3.0
+cmdlinefilever=2.3.1
+cmdlinebuild=16
+guifilever=1.3.1
+guibuild=10
+productver=2.3.1