Skip to content

Commit ff9a243

Browse files
delphidabblerdelphidabbler
committed
Merge branch 'release/2.2.0'
2 parents 639e9a8 + 23589bb commit ff9a243

32 files changed

+305
-174
lines changed

‎Build.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
"https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
33

44
<!--
55
* This Source Code Form is subject to the terms of the Mozilla Public License,
66
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
77
* obtain one at http://mozilla.org/MPL/2.0/
88
*
9-
* Copyright (C) 2009-2021, Peter Johnson (www.delphidabbler.com).
9+
* Copyright (C) 2009-2022, Peter Johnson (www.delphidabbler.com).
1010
*
1111
* Instructions for building PasHi and PasHiGUI.
1212
-->
1313

14-
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
14+
<html xmlns="https://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
1515

1616
<html>
1717

@@ -43,7 +43,7 @@
4343
}
4444
div.close-spaced, pre.close-spaced {
4545
padding: 0;
46-
margin: 0.25em; 0;
46+
margin: 0.25em 0;
4747
}
4848
.box, .cmd {
4949
padding: 0.25em;
@@ -247,8 +247,8 @@ <h3>
247247
into intermediate resource source (<code>.rc</code>) files. Version 2.11.2
248248
or later is required. Version Information Editor can be obtained from
249249
<a
250-
href="http://delphidabbler.com/software/vied"
251-
>http://delphidabbler.com/software/vied</a>.
250+
href="https://delphidabbler.com/software/vied"
251+
>https://delphidabbler.com/software/vied</a>.
252252
</p>
253253

254254
<p>
@@ -265,8 +265,8 @@ <h3>
265265
create <em>CodeSnip</em>'s install program. v5.4.0 (u) or later is required as
266266
is a compatible version of the ISPP pre-processor. You can get Inno Setup with
267267
ISPP at <a
268-
href="http://www.jrsoftware.org/isinfo.php"
269-
>http://www.jrsoftware.org/isinfo.php</a>. Choose the Unicode version. If you
268+
href="https://www.jrsoftware.org/isinfo.php"
269+
>https://www.jrsoftware.org/isinfo.php</a>. Choose the Unicode version. If you
270270
already have the ANSI version the Unicode version can be installed alongside
271271
it - just use a different install directory and program group name.
272272
</p>

‎CHANGELOG.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,42 @@ This change log begins with the first ever pre-release version of what was then
88

99
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).
1010

11+
## Release 2.2.0 - 2022-07-04
12+
13+
This release includes _PasHi_ v2.2.0 and _PasHiGUI_ v1.2.0. Changes are as follows:
14+
15+
### PasHi v2.2.0 [build 13]
16+
17+
* Added new `--line-number-start` command (and `-z` short form) to enable the starting line number in line numbered output to be specified.
18+
* Added new `--version` command to display the program's version number. Added the associated `version` command to the config file blacklist since it is not valid for inclusion in a config file.
19+
* Updated sign-on message: excluded program version number and updated web address.
20+
* Added program version number to branding included in output HTML.
21+
* Fixed erroneous error message for out of range numeric parameters.
22+
* Modified config file error messages.
23+
* Fixed some HTML5 inline tag formatting errors in generated output: XHTML style closing tags were being used for some elements.
24+
* Updated text of help screen re the new commands.
25+
26+
### PasHiGUI v1.2.0 [build 7]
27+
28+
* Updated options pane to provide support for the new `--line-number-start` options.
29+
* Ensured any `version` command in the program options file is ignored.
30+
* Fixed CSS errors in HTML used to display code fragments.
31+
32+
### General
33+
34+
* Updated user guide `UserGuide.html`:
35+
* Added details of new commands
36+
* Some clarifications and corrections
37+
* Fixed CSS errors
38+
* Made minor changes to read-me file that is included in distributions.
39+
* Updated various web addresses in documentation.
40+
* Updated `config-template` comments:
41+
* noted fact that the `version` command can't be used in the `config` file
42+
* added details of new `line-number-start` command & its parameters
43+
1144
## Release 2.1.0 - 2021-09-22
1245

13-
This release includes _PasHi_ v2.1.0 and _PasHiGUI_ v1.1.0. Change are as follows:
46+
This release includes _PasHi_ v2.1.0 and _PasHiGUI_ v1.1.0. Changes are as follows:
1447

1548
### PasHi v2.1.0 [build 12]
1649

‎Config/config-template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
# config file. If such a command is present then PasHi will fail with an error
6262
# message.
6363
#
64-
# At present there is only one blacklisted command: "help"
64+
# At present there are two blacklisted commands: "help" & "version".
6565
#
6666
# A complete list of valid commands follows. Commands and parameters that are
6767
# slated for removal in the next major release are flagged as deprecated.
@@ -164,7 +164,7 @@
164164
# embed-css C:\CSS\style.css
165165
# embed-css .\style.css
166166
# embed-css delphi7.css
167-
# link-css http://example.com/css/example.css
167+
# link-css https://example.com/css/example.css
168168
# link-css example.css
169169
# Default:
170170
# default-css

‎Config/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
5

‎Docs/License.rtf

3 Bytes
Binary file not shown.

‎Docs/MPL-2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice
357357

358358
This Source Code Form is subject to the terms of the Mozilla Public
359359
License, v. 2.0. If a copy of the MPL was not distributed with this
360-
file, You can obtain one at http://mozilla.org/MPL/2.0/.
360+
file, You can obtain one at https://mozilla.org/MPL/2.0/.
361361

362362
If it is not possible or desirable to put the notice in a particular
363363
file, then You may include the notice in a location (such as a LICENSE

‎Docs/ReadMe.txt

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ provides a point and click interface to PasHi. Most, but not all, of PasHi's
2727
command line options are supported. Files and text can be dragged and dropped
2828
onto the GUI to highlight them.
2929

30-
3130
Why another Pascal highlighter?
3231
-------------------------------
3332

@@ -49,7 +48,6 @@ that, tweaked it and wrapped it up in a command line program. Having made it I
4948
thought I'd release it in case anyone else found it useful. Since then it's been
5049
greatly enhanced.
5150

52-
5351
Installation
5452
------------
5553

@@ -122,9 +120,9 @@ The installer makes the following changes to your system:
122120
* Files required by the uninstaller are stored in the main installation's
123121
Uninst sub-folder.
124122

125-
* The program's uninstall information is registered with the Programs and
126-
Features (aka Add / Remove Programs) control panel applet, which in turn
127-
updates the system registry.
123+
* The program's uninstall information is registered with the "Apps and
124+
Features" (aka "Programs and Features" & "Add / Remove Programs") control
125+
panel applet, which in turn updates the system registry.
128126

129127
* The system path will have been modified for all users if you chose the
130128
relevant option.
@@ -136,48 +134,44 @@ The installer makes the following changes to your system:
136134
time that PasHi is run by each user, these files are also copied to that
137135
users's %AppData%\DelphiDabbler\PasHi directory.
138136

139-
140137
Uninstallation
141138
--------------
142139

143-
Open the Programs and Features (aka Add / Remove Programs) applet from the
144-
Control Panel, navigate to the DelphiDabbler PasHi entry and click the Remove or
145-
Uninstall button. You will be asked to confirm removal of the program. Click Yes
146-
to proceed.
140+
Open the "Apps and Features" (aka "Programs and Features" & "Add / Remove
141+
Programs") applet from the Control Panel, navigate to the DelphiDabbler PasHi
142+
entry and click the Remove or Uninstall button. You will be asked to confirm
143+
removal of the program. Click Yes to proceed.
147144

148145
PasHi, PasHiGUI (if installed) and all documentation will be removed.
149146

150-
The directory %ProgramData%\DelphiDabbler\PasHi will be removed but each user's %AppData%\DelphiDabbler\PasHi directory and all its files will be left behind.
147+
The directory %ProgramData%\DelphiDabbler\PasHi will be removed but each user's
148+
%AppData%\DelphiDabbler\PasHi directory and all its files will be left behind.
151149

152150
PasHi's install directory will be removed from the system path if present.
153151

154152
Installation information should be removed from the registry by the uninstaller.
155153

156-
157154
Documentation
158155
-------------
159156

160157
Details of how to use both the command line and GUI programs can be found in the
161158
file UserGuide.html that is installed with the program.
162159

163-
164160
Bug Reports
165161
-----------
166162

167163
Please report any bugs using the program's issue tracker on GitHub at
168-
<https://github.com/delphidabbler/pashi/issues>. You will need a free GitHub
164+
https://github.com/delphidabbler/pashi/issues. You will need a free GitHub
169165
account in order to create an issue.
170166

171-
172167
Source Code
173168
-----------
174169

175170
Source code is available from the program's GitHub repository at
176-
<https://github.com/delphidabbler/pashi/>.
171+
https://github.com/delphidabbler/pashi/.
177172

178173
Source code of each release of the program going back to v1.0.0 is available for
179-
download from <https://github.com/delphidabbler/pashi/releases>.
180-
174+
download from https://github.com/delphidabbler/pashi/releases.
181175

182176
License
183177
-------

0 commit comments

Comments
 (0)