Skip to content

Commit b7b2020

Browse files
faddenfadden
committed
Version 1.1.0
1 parent 7b839a9 commit b7b2020

18 files changed

Lines changed: 135 additions & 69 deletions

‎AppCommon/GlobalAppVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class GlobalAppVersion {
2727
/// Overall application version.
2828
/// </summary>
2929
public static readonly CommonUtil.Version AppVersion =
30-
new CommonUtil.Version(1, 0, 8, CommonUtil.Version.PreRelType.Dev, 2);
30+
new CommonUtil.Version(1, 1, 0, CommonUtil.Version.PreRelType.Final, 0);
3131
// NOTE: there's an independent version in DiskArc/Defs.cs
3232
}
3333
}

‎DiskArc/Defs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class Defs {
2727
/// DiskArc library version number.
2828
/// </summary>
2929
public static CommonUtil.Version LibVersion { get; } =
30-
new CommonUtil.Version(1, 0, 7, CommonUtil.Version.PreRelType.Final, 0);
30+
new CommonUtil.Version(1, 1, 0, CommonUtil.Version.PreRelType.Final, 0);
3131

3232
public const string BUILD_TYPE =
3333
#if DEBUG

‎Install.md‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ for Windows (native or emulated).
1515
There are two types of downloads here: self-contained and framework-dependent. The former
1616
includes all necessary parts of the .NET runtime in the package, so there's no need to have .NET
1717
installed on your system. If you happen to have .NET Core 6 or later already installed, the
18-
framework-dependent package is significantly smaller.
18+
framework-dependent package is significantly smaller. You can also download a pre-packaged Wine
19+
binary that allows you to run the GUI application on recent versions of Mac OS, but this may have
20+
stability issues and is considered experimental.
1921

2022
You can pick a file to download from the [Releases page](https://github.com/fadden/ciderpress2/releases),
2123
or use one of the links below to download the most recent stable release.
@@ -24,24 +26,32 @@ or use one of the links below to download the most recent stable release.
2426

2527
System | Link
2628
------------- | ----
27-
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_win-x86_sc.zip
28-
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_win-x64_sc.zip
29-
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_osx-x64_sc.zip
30-
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_linux-x64_sc.zip
29+
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_win-x86_sc.zip
30+
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_win-x64_sc.zip
31+
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_osx-x64_sc.zip
32+
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_linux-x64_sc.zip
3133

3234
**Framework-Dependent** (~1 MB)
3335

3436
System | Link
3537
------------- | ----
36-
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_win-x86_fd.zip
37-
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_win-x64_fd.zip
38-
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_osx-x64_fd.zip
39-
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.7/cp2_1.0.7_linux-x64_fd.zip
38+
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_win-x86_fd.zip
39+
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_win-x64_fd.zip
40+
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_osx-x64_fd.zip
41+
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2_1.1.0_linux-x64_fd.zip
42+
43+
**Wine Emulation** (EXPERIMENTAL) (450+ MB)
44+
45+
System | Link
46+
------------- | ----
47+
Mac OS | https://github.com/fadden/CiderPress2/releases/download/v1.1.0/cp2wine_1.1.0_mac.zip
4048

4149
Once downloaded, unzip the file somewhere convenient (Safari on the Mac will do the unzip
4250
for you). There is no installer; the commands are executed directly from where they are unzipped.
43-
On some systems an additional step may be necessary. You will need a command-line shell to
44-
run "cp2":
51+
On some systems an additional step may be necessary. (For the pre-packaged Wine binary, see the
52+
README file included in the ZIP for additional instructions.)
53+
54+
You will need a command-line shell to run "cp2":
4555

4656
- Windows: hit Windows+R to open the "run" window. Enter "cmd" for a classic DOS shell or
4757
"powershell" for something fancier, and hit return.
@@ -68,10 +78,10 @@ The commands are:
6878
- `cp2`: command-line interface
6979
- `CiderPress2`: desktop graphical interface (Windows builds only)
7080

71-
The download includes the manual for cp2, `Manual-cp2.md`, formatted for 80 columns for ease
72-
of viewing in a terminal window. The file is in "Markdown" format, which is perfectly readable
73-
as a plain text file. The manual for the GUI, and tutorials for both applications, can
74-
be found on the [web site](https://ciderpress2.com/).
81+
The download includes the manual for the cp2 command-line utility, `Manual-cp2.md`, formatted for
82+
80 columns for ease of viewing in a terminal window. The file is in "Markdown" format, which is
83+
perfectly readable as a plain text file. The manual for the GUI, and tutorials for both forms of
84+
the application, can be found on the [web site](https://ciderpress2.com/).
7585

7686
### Installing .NET ###
7787

@@ -122,8 +132,7 @@ on whether your target is 32-bit or 64-bit, respectively). You can then run the
122132

123133
It's possible to run the GUI application under macOS and Linux using the
124134
[Wine](https://www.winehq.org/) compatibility layer. Instructions for setting this up can be found
125-
[here](https://github.com/fadden/CiderPress2/blob/main/WineNotes.md). In addition, a pre-built
126-
"wrapped" application for macOS may be available for download from the Releases page.
135+
[here](https://github.com/fadden/CiderPress2/blob/main/WineNotes.md).
127136

128137
The emulation is very good, but not perfect. You may experience problems that don't occur when
129138
run natively on Windows.

‎README.md‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@ For installation instructions, see the [install guide](Install.md).
1414

1515
**Current status:**
1616
- The command-line tool runs on Windows, macOS, and Linux (anywhere .NET Core 6 runs).
17-
- The desktop GUI is written for Windows, but
18-
[can be made to run](https://github.com/fadden/CiderPress2/blob/main/WineNotes.md) on other
17+
- The desktop GUI is written for Windows, but [can be made to run](WineNotes.md) on other
1918
systems with Wine emulation.
20-
- Video demos:
21-
- v1.0 quick introduction: https://youtu.be/ZrUfNzscq3g
22-
- v0.4 drag & drop: https://youtu.be/P2kss3aOEvs
23-
- v0.3 disk handling: https://youtu.be/5tE07owhcCc
24-
- v0.2 new GUI: https://www.youtube.com/watch?v=esEHP6Bo8GI
25-
- v0.1 CLI/GUI: https://www.youtube.com/watch?v=_jDVdC6-eoA
19+
- Brief (3 min) video introduction to v1.0: https://youtu.be/ZrUfNzscq3g
2620

2721
## Getting Started ##
2822

‎SourceNotes.md‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,27 @@ Finally, build the applications and submit the changes.
174174
`MakeDist/bin/debug/NET6.0`). This builds the distribution packages
175175
in Release mode. The output will be in the `DIST` directory.
176176
10. Submit all changes to git, push them to the server.
177-
11. Create a new release on github. Drag `DIST/*.zip` into the release.
178-
12. Update/close any issues that have been addressed by the new release.
177+
11. Create the pre-packaged Wine release for Mac OS. (This requires
178+
performing several steps on a Macintosh. See the
179+
[Wine Notes](WineNotes.md) document for more information.)
180+
12. Create a new release on github. Drag `DIST/*.zip` into the release.
181+
13. Update/close any issues that have been addressed by the new release.
179182

180183
Version numbers should follow the semantic versioning scheme: v1.2.3,
181184
v1.2.3-dev1, etc.
182185

183-
There is an additional step for publishing updates to the files in the
184-
file format documentation set. `ndocs/formatdoc/convert.py` will generate
185-
HTML versions of the Markdown documentation. This is necessary because the
186-
major search engines don't like to index github repositories. The conversion
187-
script requires an external program, and may need github authentication to
188-
avoid being cut off by the rate limiter (the HTML conversion is actually
189-
performed by the github web API), so it's not part of the publication script.
190-
The `ndocs/publish.py` script just copies them to the `docs` directory.
186+
There is an additional step for publishing updates to the files in the file
187+
format documentation set (all of the "*-notes.md" files). The script
188+
`ndocs/formatdoc/convert.py` will generate HTML versions of the Markdown
189+
documentation. This is necessary because the major search engines don't like
190+
to index github repositories. The conversion script requires an external
191+
program, and may need github authentication to avoid being cut off by the
192+
rate limiter (the HTML conversion is actually performed by the github web
193+
API), so it's not part of the publication script. The `ndocs/publish.py`
194+
script just copies them to the `docs` directory. Check the comments at the
195+
top of `convert.py` for further instructions.
191196

192197
Modified "-notes.md" files can usually be converted at the time they are
193198
updated, since their contents aren't really tied to a release. Doing a full
194199
refresh as part of generating a "final" release is still prudent to avoid
195200
missing any changes.
196-
197-
Creating a Wine-wrapped binary for macOS is described in the
198-
[Wine Notes](WineNotes.md) document.

‎docs/Manual-cp2.md‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,10 +1497,13 @@ disk images.
14971497

14981498
#### `--set-int=name:value`
14991499

1500-
This is a way to pass certain configuration options to lower-level code.
1501-
For example, `--set-int=dos-vtoc-track:0x15` would direct the DOS filesystem
1502-
code to look for the catalog on track 0x15 instead of 0x11. You generally
1503-
won't need to use this.
1500+
This is a way to pass certain configuration options to lower-level code. You
1501+
generally won't need to use this. Examples:
1502+
1503+
- `--set-int=dos-vtoc-track:0x15` directs the DOS filesystem code to look for
1504+
the catalog on track 0x15 instead of 0x11.
1505+
- `--set-int=nufx-comp-alg:5` overrides the compression algorithm used when
1506+
adding files to NuFX (ShrinkIt) archives.
15041507

15051508
#### `--show-log`, `--no-show-log` (default)
15061509

@@ -1786,10 +1789,12 @@ The available converters are:
17861789
converting characters
17871790
- `inchar` (multi): define input (host) character set
17881791
- `outchar` (multi): define output (archive) character set
1792+
- `pastext`: convert text file to UCSD Pascal Textfile format; best used
1793+
with a Pascal filesystem
17891794

1790-
The `inchar` setting may be `utf8` (default), `latin` for ISO 8859-1, or
1791-
`1252` for Windows Code Page 1252. Use `utf8` for plain ASCII; it will also
1792-
work for UTF-16.
1795+
The `inchar` setting for the plain text importer can be `utf8` (default),
1796+
`latin` for ISO 8859-1, or `1252` for Windows Code Page 1252. Use `utf8` for
1797+
plain ASCII; it will also work for UTF-16.
17931798

17941799
The `outchar` setting may be `ascii` (default), `hiascii` (DOS characters with
17951800
their high bits set), or `mor` for Mac OS Roman. `ascii` is automatically

‎docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ handful of top-level documents (like the project README and installation
2828
instructions) are copied out of the `top` directory.
2929

3030
Some text variable substitutions can be performed on HTML and Markdown files
31-
as they are copied, e.g. all occurrences of `1.0.7` will be replaced with
31+
as they are copied, e.g. all occurrences of `1.1.0` will be replaced with
3232
the current app version. This is used to update the links in the download
3333
instructions (`Install.md`) to point at the current release.
3434

‎docs/doc-index.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ <h3>Compression</h3>
128128
NuFX (ShrinkIt) LZW/1 and LZW/2</a></li>
129129
<li><a href="formatdoc/Squeeze-notes.html">
130130
Squeeze (RLE+Huffman)</a></li>
131+
<!-- <li><a href="formatdoc/ZX0-notes.html">
132+
ZX0</a></li> -->
131133
</ul>
132134

133135
<h3>Disk Images</h3>
@@ -138,9 +140,9 @@ <h3>Disk Images</h3>
138140
<li><a href="formatdoc/TwoIMG-notes.html">
139141
2IMG (.2mg .2img)</a></li>
140142
<li><a href="formatdoc/DART-notes.html">
141-
DART (.dart, .image)</a></li>
143+
DART (.dart .image)</a></li>
142144
<li><a href="formatdoc/DiskCopy-notes.html">
143-
Disk Copy 4.2 (.image)</a></li>
145+
Disk Copy 4.2 (.image .dc42)</a></li>
144146
<li><a href="formatdoc/Trackstar-notes.html">
145147
Trackstar (.app)</a></li>
146148
<li><a href="formatdoc/Unadorned-notes.html">

‎docs/features.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,9 @@ <h4>File Conversion - Import</h4>
245245
<th>Action</th>
246246
</tr>
247247
<tr> <td>Plain text</td> <td>convert EOL and character set</td> </tr>
248-
<tr> <td>Merlin Assembler</td> <td>convert plain text to Merlin's ProDOS file format</td> </tr>
249248
<tr> <td>Applesoft BASIC</td> <td>convert plain text to executable form</td> </tr>
249+
<tr> <td>Merlin Assembler</td> <td>convert plain text to Merlin's ProDOS file format</td> </tr>
250+
<tr> <td>Pascal Textfile</td> <td>convert plain text to UCSD Pascal Textfile format</td> </tr>
250251
</table>
251252

252253
<p>For plain text conversions, imported text files may be encoded with

‎docs/formatdoc/ApplePascal-notes.html‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,24 @@
3232
to do when copying Pascal files to a ProDOS disk.</p>
3333
<div class="markdown-heading"><h2 class="heading-element">Textfile</h2><a aria-label="Permalink: Textfile" class="anchor" href="#user-content-textfile" id="user-content-textfile" name="user-content-textfile"><span aria-hidden="true" class="octicon octicon-link"></span></a></div>
3434
<p>The file is divided into 1KB chunks. The first chunk is reserved for use by the system text
35-
editor. The contents are not documented, and there is generally no reason to access it.</p>
35+
editor. The contents are not documented in the Apple references, but some information is
36+
available (e.g. <a href="https://markbessey.blog/2025/05/08/ucsd-pascal-in-depth-3-n/" rel="nofollow">https://markbessey.blog/2025/05/08/ucsd-pascal-in-depth-3-n/</a>). The chunk contains
37+
housekeeping data, such as margins and timestamps. The Pascal system Editor program seems
38+
perfectly happy to open files with a zeroed-out header.</p>
3639
<p>The remaining chunks contain a series of unbroken lines of ASCII text, each of which is
3740
terminated with a carriage return ($0d). Any leftover space at the end of a chunk is filled
3841
with NULs ($00).</p>
3942
<p>Pascal programs are often indented with spaces (' '), so to reduce the file size, leading spaces
4043
may be compressed with run-length encoding. If a line starts with an ASCII DLE ($10), the
4144
following byte holds the number of spaces, plus 32. It's valid to encode a lack of indentation
42-
as $10 $20 (i.e. 0 spaces).</p>
45+
as $10 $20 (i.e. 0 spaces). Values up to $ff (223 spaces) appear to be valid, though the Editor
46+
won't apply compression at all if the number of spaces exceeds that.</p>
47+
<p>It's unclear to what extent control characters and high-ASCII text are allowed or tolerated,
48+
though the Editor does not allow control characters to be entered (they're inserted as '?'
49+
instead).</p>
50+
<p>According to the Pascal 1.3 manual, the name of every textfile must end in <code>.TEXT</code>.</p>
51+
<p>Newly-created textfiles will be 2KB: 1KB for the header, 1KB for the first (empty) text chunk
52+
(which will, if created by the Editor, have a single carriage return in it).</p>
4353
<div class="markdown-heading"><h2 class="heading-element">Codefile</h2><a aria-label="Permalink: Codefile" class="anchor" href="#user-content-codefile" id="user-content-codefile" name="user-content-codefile"><span aria-hidden="true" class="octicon octicon-link"></span></a></div>
4454
<p>A codefile may be any of the following:</p>
4555
<ul>

0 commit comments

Comments
 (0)