Compress tile images

So "python3 scripts/linux-install.py" as documented in README will work.

.appveyor.yml

@@ -2,7 +2,7 @@
 image: Visual Studio 2022
 environment:
     matrix:
-        - PYTHON: "C:\\Python312"
+        - PYTHON: "C:\\Python313"
 # Shamelessly taken from https://github.com/plicease/Dist-Zilla-PluginBundle-Author-Plicease/blob/master/.appveyor.yml
 # Thanks!
 install:

.github/workflows/macos-package.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
     - uses: actions/checkout@v2

NEWS.asciidoc

@@ -1,5 +1,11 @@
 [[news]]
 === News
+* _11 January, 2025:_ There is a new stable release
+https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.2.0/[PySolFC
+v3.2.0]. New in this release:
+** New fullscreen mode, accessible by pressing F11.
+** Easy option to clear advanced search options.
+** Lots of bugfixes and enhancements.
 * _19 October, 2024:_ There is a new stable release
 https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.1.0/[PySolFC
 v3.1.0]. New in this release:

buildozer/aversion

@@ -9,7 +9,7 @@ else
 fi
 
 # current android version mumber.
-version="3.1.0"
+version="3.2.0"
 sversion=$(echo $version  | sed -E "s:(.*)\..*:\1:")
 tuple=$(echo $version | sed -E "s:(.*)\.(.*)\.(.*):(\1, \2, \3):")
 

buildozer/buildozer.run

@@ -7,6 +7,14 @@ export GRADLE_OPTS="-Xms1724m -Xmx5048m -Dorg.gradle.jvmargs='-Xms1724m -Xmx5048
 
 echo '### run buildozer'
 
+
+if [ "$1" == "test" ]
+then
+	echo '### ... release.test'
+  buildozer --profile test android release
+  exit 0
+fi
+
 if [ "$1" ]
 then
 	echo '### ... release'

buildozer/buildozer.spec

@@ -103,7 +103,7 @@ android.permissions = WRITE_EXTERNAL_STORAGE, MANAGE_EXTERNAL_STORAGE
 #android.features = android.hardware.usb.host
 
 # (int) Target Android API, should be as high as possible.
-android.api = 33
+android.api = 34
 
 # (int) Minimum API your APK / AAB will support.
 #android.minapi = 21
@@ -441,3 +441,7 @@ warn_on_root = 1
 #    Then, invoke the command line with the "demo" profile:
 #
 #buildozer --profile demo android debug
+
+[app@test]
+title = PySolFC.test
+package.name = pysolfc.test

buildozer/fdroid.init

@@ -6,7 +6,7 @@ then
   exit 1
 fi
 
-virtualenv FINIT
+python3 -m venv FINIT
 source FINIT/bin/activate
 
 pip3 install attrs
@@ -43,7 +43,7 @@ sed -r "s:#? ?source\.exclude_patterns =.*:source.exclude_patterns = README.*,AU
 sed -r "s:#? ?android\.skip_update =.*:android.skip_update = True:" -i buildozer.spec
 sed -r "s:#? ?android\.accept_sdk_license =.*:android.accept_sdk_license = False:" -i buildozer.spec
 sed -r "s:#? ?log_level =.*:log_level = 2:" -i buildozer.spec
-
+sed -r "s:#? ?warn_on_root =.*:warn_on_root = 0:" -i buildozer.spec
 
 echo '### end init'
 

buildozer/pubspec.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 102130100,
-      "versionName": "3.1.0",
+      "versionCode": 102130200,
+      "versionName": "3.2.0",
       "outputFile": "pysolfc-release.apk"
     }
   ],

contrib/customize_cardset.asciidoc

@@ -3,6 +3,20 @@ Cardset Customization Tutorial
 :Author: Eric Rausch
 :Email: <neelix570@gmail.com>
 
+Setting up a Cardset
+--------------------
+The easiest way to create a cardset would be to copy an existing cardset folder of the same type in your cardsets directory.  All cardsets need a number of files to work.
+
+* An image for each card - these images should be the same format and the same size, as defined in the config.txt file (described below).  These files should be named something like 01s.png for the ace of spades.  The first two (or more) digits represent the rank, and the letter after represents the suit.  The suits are labeled hcds in French decks or decks that use French suits (i.e. Hex A or Tarock decks), and the suits are alphabetical for other decks.  The suit letter z is used for jokers or trumps.
+* A shade file - shade.png, for example.
+* At least one back image, as defined in the config.txt file below.
+* A config.txt file, the format described below.
+* A copyright file, containing copyright info.
+
+The following optional files may also be added, but are only used under certain circumstances.
+
+* Bottom images.  A number of images for the bottoms of stacks.  These are not used unless your PySol install does not support generating stack bottoms, or you enable them manually (currently only possible through editing the options.cfg file).  Which bottoms are used depend on the cardset type.  Each bottom has a version with a suffix of -n, indicating the negative bottom that gets used if the appropriate option is enabled.
+* Shadow images.  These will only be used if your PySol install does not support auto-generated shadows.
 
 config.txt template
 -------------------

fastlane/metadata/android/en-US/changelogs/102130101.txt

@@ -0,0 +1,3 @@
+
+- zoom with two fingers and pan in the card free areas of a game.
+- tools menu entry to reset the zoom.

fastlane/metadata/android/en-US/changelogs/102130102.txt

@@ -0,0 +1,3 @@
+
+- added a tools menu entry to adjust font size.
+- bug fixes.

fastlane/metadata/android/en-US/changelogs/102130200.txt

@@ -0,0 +1,3 @@
+
+- menu entry to select random games.
+- enhancements and bug fixes (see https://pysolfc.sourceforge.io)

html-src/cardset_customization.html

@@ -1,4 +1,25 @@
     <h1>Cardset Customization Tutorial</h1>
+      <h2>Setting up a Cardset</h2>
+          <p>The easiest way to create a cardset would be to copy an existing cardset folder
+          of the same type in your cardsets directory.  All cardsets need a number of files to work.
+          <ul>
+          <li>An image for each card - these images should be the same format and the same size, as defined in the config.txt file (described below).
+          These files should be named something like 01s.png for the ace of spades.  The first two (or more) digits represent the rank, and the letter
+          after represents the suit.  The suits are labeled hcds in French decks or decks that use French suits (i.e. Hex A or Tarock decks), and
+          the suits are alphabetical for other decks.  The suit letter z is used for jokers or trumps.</li>
+          <li>A shade file - shade.png, for example.</li>
+          <li>At least one back image, as defined in the config.txt file below.</li>
+          <li>A config.txt file, the format described below.</li>
+          <li>A copyright file, containing copyright info.</li>
+          </ul>
+          <p>The following optional files may also be added, but are only used under certain circumstances.
+          <ul>
+          <li>Bottom images.  A number of images for the bottoms of stacks.  These are not used unless your PySol install
+          does not support generating stack bottoms, or you enable them manually (currently only possible through editing the
+          options.cfg file).  Which bottoms are used depend on the cardset type.  Each bottom has a version with a suffix of
+          -n, indicating the negative bottom that gets used if the appropriate option is enabled.</li>
+          <li>Shadow images.  These will only be used if your PySol install does not support auto-generated shadows.</li>
+          </ul>
       <h2>config.txt template</h2>
             <pre>PySolFC solitaire cardset;$A;$FMT;$B;$C;$D,$E;$F;$G;$H
 &lt;internal_name&gt;;&lt;cardset_name&gt;
@@ -17,42 +38,18 @@ back01.ext;back02.ext;back03.ext</pre>
           <p><b>$B:</b> The type of the cardset (see types below)</p>
           <h3>Cardsets Types:</h3>
             <ul>
-              <li>
-                <p>French = 1</p>
-              </li>
-              <li>
-                <p>Hanafuda = 2</p>
-              </li>
-              <li>
-                <p>Tarock = 3</p>
-              </li>
-              <li>
-                <p>Mahjongg = 4</p>
-              </li>
-              <li>
-                <p>Hex A Deck = 5</p>
-              </li>
-              <li>
-                <p>Mughal Ganjifa = 6</p>
-              </li>
-              <li>
-                <p>Navagraha Ganjiga = 7</p>
-              </li>
-              <li>
-                <p>Dashavatara Ganjifa = 8</p>
-              </li>
-              <li>
-                <p>Trumps Only = 9</p>
-              </li>
-              <li>
-                <p>Matching = 10</p>
-              </li>
-              <li>
-                <p>Puzzle = 11</p>
-              </li>
-              <li>
-                <p>Ishido = 12</p>
-              </li>
+              <li>French = 1</li>
+              <li>Hanafuda = 2</li>
+              <li>Tarock = 3</li>
+              <li>Mahjongg = 4</li>
+              <li>Hex A Deck = 5</li>
+              <li>Mughal Ganjifa = 6</li>
+              <li>Navagraha Ganjiga = 7</li>
+              <li>Dashavatara Ganjifa = 8</li>
+              <li>Trumps Only = 9</li>
+              <li>Matching = 10</li>
+              <li>Puzzle = 11</li>
+              <li>Ishido = 12</li>
             </ul>
             <p><b>$C:</b> The number of cards in the cardset, generally 42,
               48, 52, 68, 78, 96 or 120</p>
@@ -60,190 +57,70 @@ back01.ext;back02.ext;back03.ext</pre>
               or more comma separated values)</p>
           <h3>Cardsets Styles:</h3>
             <ul>
-              <li>
-                <p>Abstract = 35</p>
-              </li>
-              <li>
-                <p>Adult = 1</p>
-              </li>
-              <li>
-                <p>Animals = 2</p>
-              </li>
-              <li>
-                <p>Anime = 3</p>
-              </li>
-              <li>
-                <p>Art = 4</p>
-              </li>
-              <li>
-                <p>Cartoons = 5</p>
-              </li>
-              <li>
-                <p>Children = 6</p>
-              </li>
-              <li>
-                <p>Classic Look = 7</p>
-              </li>
-              <li>
-                <p>Collectors = 8</p>
-              </li>
-              <li>
-                <p>Computers = 9</p>
-              </li>
-              <li>
-                <p>Divination = 36</p>
-              </li>
-              <li>
-                <p>Engines = 10</p>
-              </li>
-              <li>
-                <p>Fantasy = 11</p>
-              </li>
-              <li>
-                <p>Four Color = 37</p>
-              </li>
-              <li>
-                <p>Ganjifa= 30</p>
-              </li>
-              <li>
-                <p>Hanafuda = 12</p>
-              </li>
-              <li>
-                <p>Hex A Deck = 29</p>
-              </li>
-              <li>
-                <p>Holiday = 13</p>
-              </li>
-              <li>
-                <p>Ishido = 34</p>
-              </li>
-              <li>
-                <p>Mahjongg = 28</p>
-              </li>
-              <li>
-                <p>Matching = 32</p>
-              </li>
-              <li>
-                <p>Monochrome = 38</p>
-              </li>
-              <li>
-                <p>Movies = 14</p>
-              </li>
-              <li>
-                <p>Matrix = 31</p>
-              </li>
-              <li>
-                <p>Music = 15</p>
-              </li>
-              <li>
-                <p>Nature = 16</p>
-              </li>
-              <li>
-                <p>Operating Systems = 17</p>
-              </li>
-              <li>
-                <p>People = 19</p>
-              </li>
-              <li>
-                <p>Places = 20</p>
-              </li>
-              <li>
-                <p>Plain = 21</p>
-              </li>
-              <li>
-                <p>Products = 22</p>
-              </li>
-              <li>
-                <p>Puzzle = 33</p>
-              </li>
-              <li>
-                <p>Round Cardsets = 18</p>
-              </li>
-              <li>
-                <p>Science Fiction = 23</p>
-              </li>
-              <li>
-                <p>Sports = 24</p>
-              </li>
-              <li>
-                <p>Tarock = 27</p>
-              </li>
-              <li>
-                <p>Vehicles = 25</p>
-              </li>
-              <li>
-                <p>Video Games = 26</p>
-              </li>
+              <li>Abstract = 35</li>
+              <li>Adult = 1</li>
+              <li>Animals = 2</li>
+              <li>Anime = 3</li>
+              <li>Art = 4</li>
+              <li>Cartoons = 5</li>
+              <li>Children = 6</li>
+              <li>Classic Look = 7</li>
+              <li>Collectors = 8</li>
+              <li>Computers = 9</li>
+              <li>Divination = 36</li>
+              <li>Engines = 10</li>
+              <li>Fantasy = 11</li>
+              <li>Four Color = 37</li>
+              <li>Ganjifa= 30</li>
+              <li>Hanafuda = 12</li>
+              <li>Hex A Deck = 29</li>
+              <li>Holiday = 13</li>
+              <li>Ishido = 34</li>
+              <li>Mahjongg = 28</li>
+              <li>Matching = 32</li>
+              <li>Monochrome = 38</li>
+              <li>Movies = 14</li>
+              <li>Matrix = 31</li>
+              <li>Music = 15</li>
+              <li>Nature = 16</li>
+              <li>Operating Systems = 17</li>
+              <li>People = 19</li>
+              <li>Places = 20</li>
+              <li>Plain = 21</li>
+              <li>Products = 22</li>
+              <li>Puzzle = 33</li>
+              <li>Round Cardsets = 18</li>
+              <li>Science Fiction = 23</li>
+              <li>Sports = 24</li>
+              <li>Tarock = 27</li>
+              <li>Vehicles = 25</li>
+              <li>Video Games = 26</li>
             </ul>
             <p><b>$E:</b> The origin (country) of the cardset</p>
           <h3>Cardsets Origins:</h3>
             <ul>
-              <li>
-                <p>Australia = 1021</p>
-              </li>
-              <li>
-                <p>Austria = 1001</p>
-              </li>
-              <li>
-                <p>Belgium = 1019</p>
-              </li>
-              <li>
-                <p>Canada = 1010</p>
-              </li>
-              <li>
-                <p>China = 1011</p>
-              </li>
-              <li>
-                <p>Czech Republic = 1012</p>
-              </li>
-              <li>
-                <p>Denmark = 1013</p>
-              </li>
-              <li>
-                <p>England = 1003</p>
-              </li>
-              <li>
-                <p>France = 1004</p>
-              </li>
-              <li>
-                <p>Germany = 1006</p>
-              </li>
-              <li>
-                <p>Great Britain = 1014</p>
-              </li>
-              <li>
-                <p>Hungary = 1015</p>
-              </li>
-              <li>
-                <p>India = 1020</p>
-              </li>
-              <li>
-                <p>Italy = 1005</p>
-              </li>
-              <li>
-                <p>Japan = 1016</p>
-              </li>
-              <li>
-                <p>Netherlands = 1002</p>
-              </li>
-              <li>
-                <p>Portugal = 1022</p>
-              </li>
-              <li>
-                <p>Russia = 1007</p>
-              </li>
-              <li>
-                <p>Spain = 1008</p>
-              </li>
-              <li>
-                <p>Sweden = 1017</p>
-              </li>
-              <li>
-                <p>Switzerland = 1009</p>
-              </li>
-              <li>
-                <p>USA = 1018</p>
-              </li>
+              <li>Australia = 1021</li>
+              <li>Austria = 1001</li>
+              <li>Belgium = 1019</li>
+              <li>Canada = 1010</li>
+              <li>China = 1011</li>
+              <li>Czech Republic = 1012</li>
+              <li>Denmark = 1013</li>
+              <li>England = 1003</li>
+              <li>France = 1004</li>
+              <li>Germany = 1006</li>
+              <li>Great Britain = 1014</li>
+              <li>Hungary = 1015</li>
+              <li>India = 1020</li>
+              <li>Italy = 1005</li>
+              <li>Japan = 1016</li>
+              <li>Netherlands = 1002</li>
+              <li>Portugal = 1022</li>
+              <li>Russia = 1007</li>
+              <li>Spain = 1008</li>
+              <li>Sweden = 1017</li>
+              <li>Switzerland = 1009</li>
+              <li>USA = 1018</li>
             </ul>
             <p><b>$F:</b> The Year the cardset was created (in the range 1000
               to 2299)</p>
@@ -263,31 +140,16 @@ back01.ext;back02.ext;back03.ext</pre>
             will be truncated.</p>
       <h2>Line 3</h2>
           <ul>
-            <li>
-              <p><b>X:</b> The cards' width (the card image width)</p>
-            </li>
-            <li>
-              <p><b>Y:</b> The cards' height (the card image height)</p>
-            </li>
-            <li>
-              <p><b>D:</b> The color depth (mostly 8)</p>
-            </li>
+            <li><b>X:</b> The cards' width (the card image width)</li>
+            <li><b>Y:</b> The cards' height (the card image height)</li>
+            <li><b>D:</b> The color depth (mostly 8)</li>
           </ul>
       <h2>Line 4</h2>
           <ul>
-            <li>
-              <p><b>XOFF:</b> The horizontal offset of the cards</p>
-            </li>
-            <li>
-              <p><b>YOFF:</b> The vertical offset of the cards</p>
-            </li>
-            <li>
-              <p><b>SXOFF:</b> The offset of the horizontal shadow (mostly
-                7)</p>
-            </li>
-            <li>
-              <p><b>SYOFF:</b> The offset of the vertical shadow (mostly 7)</p>
-            </li>
+            <li><b>XOFF:</b> The horizontal offset of the cards</li>
+            <li><b>YOFF:</b> The vertical offset of the cards</li>
+            <li><b>SXOFF:</b> The offset of the horizontal shadow (mostly 7)</li>
+            <li><b>SYOFF:</b> The offset of the vertical shadow (mostly 7)</li>
           </ul>
       <h2>Line 5</h2>
           <p><code>back01.ext</code>: The name of the default back image (where <code>ext</code> means the file extension e.g: <code>png</code> or <code>gif</code>.)</p>
@@ -309,7 +171,9 @@ back01.ext;back02.ext;back03.ext</pre>
               <a href="https://github.com/shlomif/shlomif-computer-settings/blob/master/shlomif-settings/git/commit-messages/cc0-copyright-disclaimer.txt">CC0/Public Domain/MIT License/GPL terms</a></p>
           <h3>Credits:</h3>
             <p>Credits go to:</p>
-            <p><a href="mailto:andsa@web.de">Andreas Sauer</a> for clarifying certain
-              points<br></p>
-            <p><a href="https://www.shlomifish.org/">Shlomi Fish</a> for making some
-              improvements to this tutorial</p>
+            <ul>
+            <li><a href="mailto:andsa@web.de">Andreas Sauer</a> for clarifying certain
+              points</li>
+            <li><a href="https://www.shlomifish.org/">Shlomi Fish</a> for making some
+              improvements to this tutorial</li>
+            </ul>

html-src/faq.html

@@ -0,0 +1,64 @@
+<h1>FAQ</h1>
+<h2>The animation is too slow...</h2>
+<p>
+Unfortunately the Tcl/Tk toolkit lacks a sprite concept, so
+there is a lot of (invisible double-buffered) redraw going on
+when dragging cards around.
+<p>
+Disabling <i>Card shadow</i>, <i>Shade legal moves</i>,
+background table tiles and sound will somewhat improve the display speed.
+
+<h2>The table tiles look strange</h2>
+<p>
+Background table tiles should only be enabled when using
+a true-color video mode - otherwise they may look bad
+because of dithering.
+<p>
+BTW, you can add your own background tiles by copying the images
+to the main <i>data/tiles</i> or your home <i>~/.PySolFC/tiles</i> directory.
+<!-- They must be in GIF or PPM format. -->
+
+<h2>My antivirus app says the Windows installer contains a virus.</h2>
+<p>
+We have been asked about the fact that some anti viruses, including those
+on <a href="https://www.virustotal.com/">VirusTotal</a>, have identified the Microsoft
+Windows downloads as containing malware. What we know is that they are generated from
+the <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">open source</a>
+source code by <a href="https://www.appveyor.com/">AppVeyor</a>, are checked using
+VirusTotal before they are uploaded, and at that point were considered to be malware clean.
+<p>
+However, as time passes, they seem to accumulate classifyings as containing malware
+in what appears to be <a href="https://en.wikipedia.org/wiki/False_positives_and_false_negatives">false positives</a>. So we believe the downloads are nonetheless safe and free of
+malware.
+<p>
+Furthermore, note that we believe that many anti-malware applications are harmful
+by themselves, and that they are all an incomplete (non-)solution to an
+issue that does not exist in <a href="https://en.wikipedia.org/wiki/Linux#Desktop">Linux</a> and the <a href="https://en.wikipedia.org/wiki/List_of_BSD_operating_systems">BSDs operating systems</a>.
+<p>
+For more information, see:
+<ol>
+<li><a href="https://sourceforge.net/p/pysolfc/discussion/503709/thread/d841b6a1/">Forum discussion</a></li>
+<li><a href="http://linuxmafia.com/~rick/faq/">Viruses on Linux</a></li>
+<li><a href="https://www.mail-archive.com/wikimedia-l@lists.wikimedia.org/msg30001.html">Discussion about anti-viruses.</a></li>
+</ol>
+
+<h2>I received an error that there is no module named "formatter".</h2>
+<p>
+This error occurs if you're trying to run an older version of PySolFC
+with Python 3.10.  If you are using Python 3.10 or later, please upgrade your
+version of PySolFC to 2.14.0 or later - older versions are not compatible with
+Python 3.10.
+<p>
+If you are getting your copy from your Linux distribution's package manager,
+please contact the people who maintain the packages for your distribution.
+You can always get the latest version from the PySolFC website or from
+Flathub.
+
+<h2>It won't let me deal more cards in Spider.</h2>
+<p>
+When playing Spider, you are not allowed to deal more cards if there are any
+empty piles.  If there aren't enough cards left to put one in each pile, the
+game is lost.  Part of the game is planning ahead when to deal more cards to
+avoid this situation.
+<p>
+If you want a variation without this rule, you can play Relaxed Spider instead.

html-src/gen-html.py

@@ -46,6 +46,7 @@ fix_gettext()
 files = [
     ('credits.html', 'PySol Credits'),
     ('credits_old.html', 'PySol Credits'),
+    ('faq.html', 'PySol - FAQ'),
     ('ganjifa.html', 'PySol - General Ganjifa Card Rules'),
     ('general_rules.html', 'PySol - General Rules'),
     ('glossary.html', 'PySol - Glossary'),

html-src/glossary.html

@@ -323,6 +323,15 @@ the deck.</p>
 Hearts, and Diamonds.</p>
 </dd>
 
+<dt><b>SUPER MOVE</b></dt>
+
+<dd>
+<p>A special move where you move a sequence of cards at once, in a game
+that does not normally allow it.  However, if there are enough open
+reserves and empty stacks to perform the move by moving cards between
+them one at a time, you can make it as a single move as a shortcut.</p>
+</dd>
+
 <dt><b>TABLEAU</b></dt>
 
 <dd>

html-src/howtoplay.html

@@ -42,59 +42,18 @@ You can also reach '<i>R</i>' (redo) from there.
 Left-handed people may prefer using '<i>L</i>' (auto drop),
 '<i>K</i>' (undo) and '<i>J</i>' (deal).
 
-<!--
-<h2>Point-and-Click play</h2>
-<p>
-If you prefer Point-and-Click over Drag-and-Drop you can enable
-<i>Quick play</i> and use the right mouse button. See below.
--->
-
 <h2>Automatic play</h2>
 <p>
 Note that automatic play can spoil the gameplay, so purists should
 not enable any option but maybe <i>Auto face up</i>. Also, some games
 disable certain features as they would be trivial otherwise.
-<p>
-Auto face up
 <ul type="disc">
-<li> Automatically face up all cards.
+<li> <i>Auto face up</i> - Automatically face up all cards.
+<li> <i>Auto drop</i> - Automatically drop cards to the Foundations.
+<li> <i>Auto deal</i> - Automatically deal cards to the Waste stack if it is empty.
+<li> <i>Quick play</i> - Use the right mouse button to move piles around quickly.
+The logic involved is not too clever on purpose (i.e. it does not consult the hint system).
 </ul>
-Auto drop
-<ul type="disc">
-<li> Automatically drop cards to the Foundations.
-</ul>
-Auto deal
-<ul type="disc">
-<li> Automatically deal cards to the Waste stack if it is empty.
-</ul>
-Quick play
-<ul type="disc">
-<li> Use the right mouse button to move piles around quickly.
-     The logic involved is not too clever on purpose
-     (i.e. it does not consult the hint system).
-</ul>
-
-
-<h2>The animation is too slow...</h2>
-<p>
-Unfortunately the Tcl/Tk toolkit lacks a sprite concept, so
-there is a lot of (invisible double-buffered) redraw going on
-when dragging cards around.
-<p>
-Disabling <i>Card shadow</i>, <i>Shade legal moves</i>,
-background table tiles and sound will somewhat improve the display speed.
-
-
-<h2>The table tiles look strange</h2>
-<p>
-Background table tiles should only be enabled when using
-a true-color video mode - otherwise they may look bad
-because of dithering.
-<p>
-BTW, you can add your own background tiles by copying the images
-to the main <i>data/tiles</i> or your home <i>~/.PySolFC/tiles</i> directory.
-<!-- They must be in GIF or PPM format. -->
-
 
 <h2>Some notes about scoring</h2>
 <p>

html-src/index.html

@@ -19,9 +19,10 @@
 <li> <a href="cardset_customization.html">Cardset Customization</a>
 <li> <a href="plugins.html">Plugins</a>
 </ul>
-<h2>Misc</h2>
+<h2>About</h2>
 <ul>
 <li> <a href="news.html">What's new?</a>
+<li> <a href="faq.html">FAQ</a>
 <li> <a href="report_bug.html">Report a Bug</a>
 <li> <a href="license.html">PySol license terms</a>
 <li> <a href="credits.html">PySol credits</a>

html-src/intro.html

@@ -5,7 +5,7 @@ The answer is simple...
 
 <h3>PySol highlights</h3>
 <ul>
-<li> currently supports more than 1000 distinct solitaire games
+<li> currently supports more than 1,200 distinct solitaire games
 <li> based upon an extensible solitaire engine
 <li> lots of classic games like Forty Thieves, FreeCell, Klondike and Spider
 <li> special games like Ganjifa, Hanafuda, Poker and Tarock type games
@@ -24,7 +24,7 @@ The answer is simple...
 <li> integrated HTML help browser
 <li> lots of documentation
 <li> portable across Windows, Mac, and Linux
-<li> completely ad-free
+<li> completely ad-free, now and forever
 <li> written in 100% pure Python
 <li> distributed under the terms of the GNU General Public License
 <li> <i>Commercial Quality Freeware</i>

html-src/news.html

@@ -1,6 +1,28 @@
 <h1>What's New?</h1>
 <ul>
 <li>
+<p><em>11 January, 2025:</em> There is a new stable release
+<a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.2.0/">PySolFC
+v3.2.0</a>.  New in this release:</p>
+<ul>
+<li>
+<p>
+New fullscreen mode, accessible by pressing F11.
+</p>
+</li>
+<li>
+<p>
+Easy option to clear advanced search options.
+</p>
+</li>
+<li>
+<p>
+Lots of bugfixes and enhancements.
+</p>
+</li>
+</ul>
+</li>
+<li>
 <p><em>19 October, 2024:</em> There is a new stable release
 <a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.1.0/">PySolFC
 v3.1.0</a>.  New in this release:</p>

html-src/report_bug.html

@@ -1,10 +1,9 @@
 <h1>Report a Bug</h1>
 <p>
 Before you report a bug, please verify that you are running
-the latest version of PySolFC, and also check the PySolFC site's
-<a href="https://pysolfc.sourceforge.io/faq.html">FAQ page</a>,
-and issues previously reported on GitHub, to ensure that the bug
-was not previously reported.
+the latest version of PySolFC.  Also, check the
+<a href="faq.html">FAQ</a>, and issues previously reported
+on GitHub, to ensure that the bug was not previously reported.
 <p>
 If you found a bug in PySolFC, the best place to report it
 is on GitHub.  To do so, create an issue at

html-src/rules/accordion.html

@@ -14,3 +14,9 @@ the card that is further to the left (in PySol, this is the card that is
 further from the deck) may be moved on top of the other.
 <p>
 The game is won when only one card remains.
+
+<h3>Notes</h3>
+<p>
+Accordion, and its related games, can be played with cards dealt manually
+by the player one at a time, or all cards dealt at once.  This option
+can be set in the options menu.

html-src/rules/accordionsrevenge.html

@@ -15,7 +15,7 @@ This card must be the last remaining card in order to win the game.
 <h3>Notes</h3>
 <p>
 Accordion's Revenge is unwinnable if the first or second card is
-declared.  As such, PySol will reselect the declared card if it
-is chosen.
+declared.  As such, PySol will never select either of those cards as
+the target.
 <p>
 The concept of Accordion's Revenge was invented by Mark Masten.

html-src/rules/aceofhearts.html

@@ -18,5 +18,5 @@ are no moves left, you can deal a card from the talon to each pile.
 <p>
 The single foundation is started with the ace of hearts.  After the
 ace of hearts is played, it is built up by rank, regardless of suit,
-turning the corner from king to ace as neede.  The game is won if
+turning the corner from king to ace as needed.  The game is won if
 all cards are moved to this one foundation.

html-src/rules/balarama.html

@@ -1,16 +1,26 @@
 <h1>Balarama</h1>
+<p>
 Dashavatara Ganjifa type. One deck. No redeal.
+
 <h3>Object</h3>
+<p>
 Move all cards to the foundations.
+
 <h3>Quick description</h3>
+<p>
 The cards build down by rank in alternate colors on the tableau, no more
 than twelve to a row.  Any card or sequence may be played on an empty row.
+
 <h3>Rules</h3>
+<p>
 All cards are dealt to the sixteen rows when the games begins.  Cards
 on the tableau build down in rank in alternating colors.  See the general
 <a href="../ganjifa.html">Ganjifa</a>
-card rules for information on that.   The foundations build up by suit.
+card rules for information on that.  The foundations build up by suit.
+<p>
 Any card or sequence may be played on an empty row.  The four reserve
 stacks hold one card each.
+
 <h3>Strategy</h3>
+<p>
 An empty row is more useful than the reserve stacks.  Try for an empty row.

html-src/rules/bigbraid.html

@@ -1,4 +1,4 @@
-<h1>Big Braid</h1>
+<h1>Big Braid (Der gro&szlig;e Zopf)</h1>
 <p>
 Napoleon type. 3 decks. 2 redeals.
 

html-src/rules/bigstoreroom.html

@@ -0,0 +1,13 @@
+<h1>Big Storeroom</h1>
+<p>
+Hex A Deck type. 2 decks. 1 redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Like <a href="wizardsstoreroom.html">Wizard's Storeroom</a>
+but with two decks and nine piles.
+

html-src/rules/colours.html

@@ -0,0 +1,15 @@
+<h1>Colours</h1>
+<p>
+Numerica type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="ladybetty.html">Lady Betty</a>,
+but the foundations are built up by same color, and
+wrap from king to ace.  At the start of the game, a
+two through five are dealt to the foundations, in
+alternating colors.

html-src/rules/cribbagepatience.html

@@ -4,7 +4,7 @@ Cribbage type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>
-Deal five cribbage hands to get a total score of 61 points or more.
+Deal five cribbage hands to get a total score of 80 points or more.
 
 <h3>Rules</h3>
 <p>
@@ -16,7 +16,8 @@ Points are awarded for the 2 Cribbage hands: the remaining four cards, plus
 the four cards in the crib.
 <p>
 After each hand, repeat the process four more times to deal a total of five
-hands.  You win if after all five hands, your score reaches 61 points.
+hands.  You win if after all five hands, your score reaches 80 points.
+
 <h3>Cribbage Scoring</h3>
 <p>
 Cribbage hands are scored as follows - each hand is worth the total value

html-src/rules/cribbagepatienceii.html

@@ -0,0 +1,18 @@
+<h1>Cribbage Patience II</h1>
+<p>
+Cribbage type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Deal four cribbage hands to get a total score of 80 points or more.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="cribbagepatience.html">Cribbage Patience</a>,
+but two cards are not dealt face-down to the crib.  After moving two
+cards from the hand to the crib, a second six-card hand is dealt, and
+you move two cards from that hand to finish the crib.  Then, all
+three hands are scored.
+<p>
+Due to the increased number of cards per hand, only four hands are dealt
+per game.

html-src/rules/decade.html

@@ -15,3 +15,11 @@ is won if all cards are removed.
 <p>
 In PySol, a sequence is removed by selecting the first and last
 card of the sequence.
+Royal Marriage, and its related games, can be played with cards dealt
+manually by the player one at a time, or all cards dealt at once.  This
+
+<h3>Notes</h3>
+<p>
+Decade, and its related games, can be played with cards dealt manually
+by the player one at a time, or all cards dealt at once.  This option
+can be set in the options menu.

html-src/rules/doublebisley.html

@@ -9,4 +9,4 @@ Move all cards to the foundations.
 <h3>Quick Description</h3>
 <p>
 Like <a href="bisley.html">Bisley</a>,
-but two decks and twenty four playing piles.
+but two decks and twenty-four playing piles.

html-src/rules/families.html

@@ -0,0 +1,27 @@
+<h1>Families</h1>
+<p>
+Memory game type. 32 cards. No redeal.
+
+<h3>Object</h3>
+<p>
+Remove all groups of jack-queen-king of the same suit.
+
+<h3>Rules</h3>
+<p>
+Families is played with eight sets of Jack, Queen, and King - two of
+each suit, along with six black jokers and two red jokers.
+<p>
+Flip three cards.  If you flip a sequence of Jack, Queen, and King of
+the same suit, the cards are removed.  If not, they are flipped face-down.
+<p>
+If a red joker is flipped, all of the remaining unmatched cards that were
+not flipped are reshuffled and redealt (after you've flipped all three
+cards).
+<p>
+If a pair of black jokers is flipped, the game is lost.  If all eight
+sequences are removed before this happens, the game is won.
+
+<h3>Notes</h3>
+<p>
+<i>Undo</i>, <i>Bookmarks</i>, <i>Autodrop</i> and <i>Quickplay</i>
+are disabled for this game.

html-src/rules/fatimehsgame.html

@@ -12,7 +12,7 @@ with twelve rows and two redeals.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When
 the talon is empty after each round the cards are gathered up from the

html-src/rules/fatimehsgamerelaxed.html

@@ -13,7 +13,7 @@ which will hold two cards.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When
 the talon is empty after each round the cards are gathered up from the

html-src/rules/flamboyant.html

@@ -0,0 +1,22 @@
+<h1>Flamboyant</h1>
+<p>
+Fan game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+The tableau piles are built in seventeen sets of three cards, with
+two in the back row face-down, and a third face-up card overlapping
+them.  The final card is dealt separately.
+<p>
+The tableau piles are built down by alternate color, with any face-up card
+or valid sequence of cards being movable.  Once the top card is moved,
+the two below it can be flipped face-up and played.  Empty piles cannot
+be filled, except for the final single card, where a king or sequence of
+cards starting with a king can be played.
+<p>
+Foundations are built up in suit from Ace to King.  The game is won
+when all cards are moved to the foundations.

html-src/rules/freecell2reserves.html

@@ -1,6 +1,6 @@
 <h1>FreeCell (2 Reserves)</h1>
 <p>
-FreeCell type. 1 decks. No redeal.
+FreeCell type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/freecellnoreserve.html

@@ -1,6 +1,6 @@
 <h1>FreeCell (No Reserve)</h1>
 <p>
-FreeCell type. 1 decks. No redeal.
+FreeCell type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/gaji.html

@@ -16,7 +16,7 @@ on Iris 2, and Pine 3 plays on Phoenix 3.  Gaji is wild.  It can play
 on any card in the tableau and any card can play on Gaji.  Any card
 can also be played on the canvas.    Gaji will only play in its proper
 position on the foundation.  Cards play on the tableau by suit in
-decending rank order.  There can be no more than twelve cards in a row.
+descending rank order.  There can be no more than twelve cards in a row.
 Once a card is played on a foundation stack it can't be taken off
 except by undoing the move.
 

html-src/rules/hexaklon.html

@@ -19,7 +19,7 @@ that row may become unmovable.  The Wizards have ranks like the suit cards
 corresponding to Ace through Four.  If a Wizard is played in it's proper rank
 position the row can still be moved.  The rank can be determined by the height
 of the hat.  The Ace Wizard has the tallest hat.  A stack with two Wizards can
-be moved only if they are both in their rank position and they are not ajacent
+be moved only if they are both in their rank position and they are not adjacent
 to each other.  The Wizards will not move off of the tableau until all the other
 cards have been moved to the foundations.
 

html-src/rules/hitormiss.html

@@ -9,7 +9,7 @@ Move all cards to the foundation.
 <h3>Rules</h3>
 <p>As you draw cards from the talon, one at a time, declare a card rank
 in sequence (ace to king, then start over from ace).  If the drawn card
-matches the declard rank, that is a "Hit", and the card may be moved to
+matches the declared rank, that is a "Hit", and the card may be moved to
 the foundation.  Otherwise, it is a "Miss".  You can continue to redeal
 as many times as you need, until you go through the entire deck twice in
 a row without getting a single "Hit".

html-src/rules/hurricane.html

@@ -1,6 +1,6 @@
 <h1>Hurricane</h1>
 <p>
-Pairing game type. 1 deck. No redeal.
+Pairing type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/idesofmarch.html

@@ -0,0 +1,12 @@
+<h1>Ides of March</h1>
+<p>
+Pairing type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the single foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="hurricane.html">Hurricane</a>,
+but remove pairs whose ranks total 15, or pairs of aces.

html-src/rules/interregnum.html

@@ -24,7 +24,7 @@ added to each of the playing piles.
 <p>
 <i>Autodrop</i> is disabled for this game.
 
-<h3>Histoy</h3>
+<h3>History</h3>
 <p>
 This is a two-deck variation of
 <a href="auldlangsyne.html">Auld Lang Syne</a>.

html-src/rules/kalisgame.html

@@ -12,7 +12,7 @@ with twelve rows and two redeals.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When

html-src/rules/kalisgamedoubled.html

@@ -12,7 +12,7 @@ with twelve rows, three redeals and a reserve stack.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are three redeals.  When

html-src/rules/kalisgamerelaxed.html

@@ -13,7 +13,7 @@ which will hold two cards.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When

html-src/rules/katrinasgame.html

@@ -10,9 +10,9 @@ with twenty two rows and one redeal, using the Tarock deck.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there is one redeal.  When
 the talon is empty after the first round the cards are gathered up from

html-src/rules/katrinasgamedoubled.html

@@ -12,9 +12,9 @@ using four decks.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game with two exceptions.  The first exception
 is that there are two redeals.  When the talon is empty after the one

html-src/rules/katrinasgamerelaxed.html

@@ -12,9 +12,9 @@ with a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game with two exceptions.  The first exception
 is that there is one redeal.  When the talon is empty after the first

html-src/rules/kingdom.html

@@ -8,7 +8,7 @@ Move all cards to the foundations.
 
 <h3>Rules</h3>
 <p>
-The foundations build up by rank igonoring suit.
+The foundations build up by rank ignoring suit.
 <p>
 The reserve piles can hold a single card and
 are automatically filled from the waste or talon.

html-src/rules/kurma.html

@@ -10,7 +10,7 @@ Play is similar to
 The rows build down by suit and rank.
 
 <h3>Rules</h3>
-The cards on the tableau build down in rank of the same suit.    The
+The cards on the tableau build down in rank of the same suit.  The
 foundations build up in rank by suit starting with the Ace.  The cards
 are dealt from the talon one at a time.  Any card or movable pile may
 be played on an empty row.  Cards may be played from the foundations.

html-src/rules/larasgamedoubled.html

@@ -10,8 +10,8 @@ with four decks, two redeals and a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are the use of four decks instead of two two redeals and a reserve stack.
-Otherwise the play and dealing rules are the same.
+are the use of four decks instead of two, two redeals, and a reserve stack.
+Otherwise, the play and dealing rules are the same.
 <p>
 When the talon is empty after each round the cards are gathered up from
 the tableau and dealt to the rows without being shuffled using the same

html-src/rules/larasgamerelaxed.html

@@ -10,8 +10,8 @@ with a redeal and a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are the use of four decks instead of two two redeals and a reserve stack.
-Otherwise the play and dealing rules are the same.
+are the use of a redeals, and a reserve stack.  Otherwise, the play and
+dealing rules are the same.
 <p>
 When the talon is empty after each round the cards are gathered up from
 the tableau and dealt to the rows without being shuffled using the same

html-src/rules/littleishido.html

@@ -0,0 +1,12 @@
+<h1>Little Ishido</h1>
+<p>
+Ishido game type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all tiles to the playing area.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href='ishido.html'>Ishido</a>, but with four colors and symbols,
+and a 6X8 grid.  The initial tiles are placed in the four corners only.

html-src/rules/littleishidorelaxed.html

@@ -0,0 +1,14 @@
+<h1>Little Ishido Relaxed</h1>
+<p>
+Ishido game type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all tiles to the playing area.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href='ishido.html'>Ishido</a>, but with four colors and symbols,
+and a 6X8 grid.  The initial tiles are placed in the four corners only.
+Also, there are no restrictions when placing a tile next to two or more
+other tiles - they just have to match the color or symbol of each.

html-src/rules/louis.html

@@ -0,0 +1,19 @@
+<h1>Louis</h1>
+<p>
+Two-Deck game type. 2 decks. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Move all the cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="sthelena.html">St. Helena</a>,
+but at the start of the game, a card is dealt to each of the
+twelve tableau piles.  During this round, an empty tableau pile
+will be immediately filled from the talon.  When no moves are left,
+the rest of the deck can be dealt.
+<p>
+Also, there are no restrictions as to which tableau piles
+cards can be moved to foundations from, and tableau piles are
+built up or down by same suit.

html-src/rules/microbe.html

@@ -0,0 +1,27 @@
+<h1>Microbe</h1>
+<p>
+Spider type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Group all the cards in sets of 13 cards in descending sequence
+by alternate color from King to Ace and move such sets to the foundations.
+
+<h3>Rules</h3>
+<p>
+The decks are separated.  From one deck, four cards are dealt to each of
+eleven tableau piles, with alternating cards face-up and face-down (the
+bottom and third from the bottom cards are face-down).  The remaining
+eight cards from that deck are combined with the other deck to form the
+talon.
+<p>
+Tableau piles are built down by alternate color, and any card or valid
+sequence of cards can be moved between tableau piles.  Any valid card or
+sequence can fill empty piles.
+<p>
+The object is to group the cards in sets of 13 cards, from King to Ace
+in an alternating color sequence. Such groups can be moved to the foundations.
+<p>
+When there are no moves left, you can deal one card from the talon to
+each tableau pile.  The game is won if all cards are grouped into sequences
+and moved to the foundations.

html-src/rules/millie.html

@@ -6,7 +6,6 @@ Gypsy type. 2 decks. No redeal.
 <p>
 Move all cards to the foundations.
 
-
 <h3>Quick Description</h3>
 <p>
 Like <a href="gypsy.html">Gypsy</a>, but only a single card

html-src/rules/mughalcircles.html

@@ -1,18 +1,23 @@
 <h1>Mughal Circles</h1>
+<p>
 Mughal Ganjifa type. One deck. No redeal.
 
 <h3>Object</h3>
+<p>
 Move all cards to the foundations.
 
 <h3>Quick description</h3>
+<p>
 The cards build down by rank and by suit on the tableau.  Any card may be
 played on an empty row.  Only one card may be moved at a time.
 
 <h3>Rules</h3>
+<p>
 All cards are dealt to the twenty four rows when the games begins.  Cards
 on the tableau build down by suit in descending rank order.  The foundations
 build up by suit.  Any card may be played on an empty row. The reserve stacks
 hold one card each. Only one card at a time may be moved.
 
 <h3>Strategy</h3>
+<p>
 Try to keep a reserve stack open.  Play higher ranked cards on empty rows.

html-src/rules/noumea.html

@@ -0,0 +1,27 @@
+<h1>Noumea</h1>
+<p>
+One-Deck game type. 1 decks. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+The four aces are dealt to the foundations, and 20 cards
+are dealt to reserve piles.  The reserve piles can hold a
+single card and are automatically filled from the waste or
+talon when empty.
+<p>
+There is no building on the tableau piles, so you can
+only move cards to the foundations.
+<p>
+When there are no moves left, you can deal cards three at
+a time from the talon, and move them to an appropriate
+foundation.  Two redeals are allowed, so you can go through
+the deck three times.  The game is won if all cards are
+moved to the foundations.
+
+<h3>Notes</h3>
+<p>
+<i>Autodrop</i> is disabled for this game.

html-src/rules/outbackpatience.html

@@ -0,0 +1,12 @@
+<h1>Outback Patience</h1>
+<p>
+Yukon type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="austalianpatience.html">Australian Patience</a>,
+but with two decks, and eight piles of seven cards each.

html-src/rules/pyramidthirteen.html

@@ -0,0 +1,22 @@
+<h1>Pyramid Thirteen</h1>
+<p>
+Pairing game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the single foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="pyramid.html">Pyramid</a>, but all but the
+front row of the pyramid are dealt face-down, and no redeals
+are allowed.
+
+<h3>Notes</h3>
+<p>
+This difficult variant of Pyramid is based on the Gnome AisleRiot
+rules.  It is called "Thirteen" there, but renamed Pyramid Thirteen
+here to avoid confusion with the game
+<a href="thirteens.html">Thirteens</a>.
+<p>
+<i>Quickplay</i> is disabled for this game.

html-src/rules/relaxedcruel.html

@@ -0,0 +1,12 @@
+<h1>Relaxed Cruel</h1>
+<p>
+Baker's Dozen type. 1 deck. Unlimited redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Just like <a href="cruel.html">Cruel</a>,
+but the number of cards you can move as a sequence is not restricted.

html-src/rules/royalmarriage.html

@@ -11,9 +11,15 @@ To remove all cards between the king and queen of hearts
 The queen of hearts is placed on top of the deck and the king
 on the bottom.
 <p>
-Three cards are dealt from the stock, but additional cards may be
-dealt at any time.  If there are one or two cards between two cards
-of the same rank or suit, those cards may be removed.
+Cards are dealt from the stock in a sequence.  If there are one
+or two cards between two cards of the same rank or suit, those cards
+may be removed.
 <p>
 The game is won when the king of hearts is brought to his "bride",
 the queen, as in, all cards between them have been removed.
+
+<h3>Notes</h3>
+<p>
+Royal Marriage, and its related games, can be played with cards dealt
+manually by the player one at a time, or all cards dealt at once.  This
+option can be set in the options menu.

html-src/rules/saratoga.html

@@ -1,6 +1,6 @@
 <h1>Saratoga</h1>
 <p>
-Klondike type. 1 deck. Unlimited redeal.
+Klondike type. 1 deck. Unlimited redeals.
 
 <h3>Object</h3>
 <p>

html-src/rules/sevenup.html

@@ -18,6 +18,10 @@ card of the sequence.
 
 <h3>Notes</h3>
 <p>
+Seven Up, and its related games, can be played with cards dealt manually by
+the player one at a time, or all cards dealt at once.  This option can be set in
+the options menu.
+<p>
 The average rank of the cards in a deck is 7, and the total of all cards of
 each suit is 91, which is a multiple of 7.  Thus, the total of all cards in the
 entire deck is 364, also a multiple of 7.

html-src/rules/tabbycat.html

@@ -12,7 +12,7 @@ Foundations are built up from Ace to King, regardless of suit. One
 must move an entire Ace-to-King sequence to a foundation as one move.
 <p>
 The playing piles build down by rank, regardless of suit. A king may
-be played on an ace.. An empty pile can receive any card, or
+be played on an ace. An empty pile can receive any card, or
 sequence.
 <p>
 When no more moves are possible, click on the talon. One card will be

html-src/rules/thirty.html

@@ -18,5 +18,5 @@ of the same suit can be moved together.  The reserve cards can be
 moved to appropriate tableau or foundation piles at any time.
 <p>
 The foundations are built up by same suit, starting with the ace.
-Then, the seven is played on the ace and it is built up to king.
+Then, the seven is played on the ace, which is then built up to king.
 The game is won if all cards are moved to the foundations.

html-src/rules/thirtytwocards.html

@@ -9,7 +9,7 @@ Move all the cards to the foundations.
 <h3>Quick Description</h3>
 <p>
 Like <a href="vague.html">Vague</a>,
-but with two decks, and thirty two tableau cards (as
+but with two decks, and thirty-two tableau cards (as
 the game's name suggests).  Additionally, one set of
 foundations is built down from king to ace while the
 other is built up from ace to king.

html-src/rules/waspii.html

@@ -0,0 +1,13 @@
+<h1>Wasp II</h1>
+<p>
+Spider type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="wasp.html">Wasp</a>,
+but only three of the tableau piles contain
+face-down cards (similar to <a href="scorpionii.html">Scorpion II</a>).

html-src/rules/wizardscastle.html

@@ -0,0 +1,15 @@
+<h1>Wizard's Castle</h1>
+<p>
+Hex A Deck type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Rows build down in rank in alternating color.  Wizards are wild,
+so any card can be played on one, and a wizard can be played on
+any card.  Only one card can be moved at a time.  Foundations build
+up in rank by suit.  Any card can be played on an empty row.  Cards
+can be played from the foundations.

html-src/rules/wizardsstoreroom.html

@@ -0,0 +1,23 @@
+<h1>Wizard's Storeroom</h1>
+<p>
+Hex A Deck type. 1 deck. 1 redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+The tableau consists of one reserve stack and five row stacks.
+Fourteen cards are dealt to the reserve stack and one card each to the
+row stacks.  When a row stack is emptied it must be filled from the reserve
+stack first.  When the reserve stack is empty any card can be played on an
+empty row stack.  Wizards are wild - any card can be played on them, and they
+can be played on any card.  The Wizards have ranks like the suit cards
+corresponding to Ace through Four.  If a Wizard is played in it's proper rank
+position the row can still be moved, otherwise, the full sequence can't be moved.
+The row stacks build down in rank by alternate colors.
+<p>
+The foundations build up in rank by suit.  The Wizards will not move off of the
+tableau until all the other cards have been moved to the foundations.
+The game is won when all cards are moved to the foundations.

po/de_pysol.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-10-29 20:05-0400\n"
+"PO-Revision-Date: 2025-03-14 19:16-0400\n"
 "Last-Translator: H. Schaekel <Holger.Schaekel@web.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -111,6 +111,9 @@ msgstr "&Nächste Nummer"
 msgid "&Cancel"
 msgstr "&Abbruch"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Zufallsspiel auswählen"
@@ -676,7 +679,7 @@ msgid ""
 "Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
 "Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
 "Copyright (C) 2005 - 2009 Skomoroh.\n"
-"Copyright (C) 2020 - 2024 PySolFC.\n"
+"Copyright (C) 2020 - 2025 PySolFC.\n"
 "All Rights Reserved.\n"
 "\n"
 "PySol is free software distributed under the terms\n"
@@ -2546,7 +2549,7 @@ msgstr "Hinweise"
 
 #: pysollib/kivy/menubar.py:202 pysollib/kivy/menubar.py:1663
 msgid "Options"
-msgstr "Optionen"
+msgstr "Einstellungen"
 
 #: pysollib/kivy/menubar.py:207 pysollib/kivy/menubar.py:321
 #: pysollib/kivy/menubar.py:1671
@@ -2561,6 +2564,9 @@ msgstr "Zuletzt gespielte"
 msgid "Favorite games"
 msgstr "Favoritenliste"
 
+msgid "Random game"
+msgstr ""
+
 #: pysollib/kivy/menubar.py:244
 msgid "<Add>"
 msgstr "<Hinzufügen>"
@@ -2647,7 +2653,7 @@ msgid "Automatic play"
 msgstr "Automatisierung"
 
 #: pysollib/kivy/menubar.py:513
-msgid "Auto face up"
+msgid "Auto face-up"
 msgstr "Automatisch aufdecken"
 
 #: pysollib/kivy/menubar.py:523
@@ -3010,16 +3016,16 @@ msgid "Right"
 msgstr "Rechts"
 
 msgid "Other graphics"
-msgstr ""
+msgstr "Graphik Varianten"
 
 msgid "Demo logo"
-msgstr ""
+msgstr "Demo Logo"
 
 msgid "Pause text"
-msgstr ""
+msgstr "Pause Text"
 
 msgid "Redeal icons"
-msgstr ""
+msgstr "Redeal Icons"
 
 #: pysollib/kivy/menubar.py:1062
 msgid "Startup splash screen"
@@ -3035,7 +3041,7 @@ msgstr "Inhalt"
 
 #: pysollib/kivy/menubar.py:1094
 msgid "How to use PySol"
-msgstr ""
+msgstr "Bedienung"
 
 #: pysollib/kivy/menubar.py:1098 pysollib/kivy/toolbar.py:204
 #: pysollib/tile/toolbar.py:189 pysollib/tk/toolbar.py:189
@@ -4183,6 +4189,9 @@ msgstr "Nationalität:"
 msgid "Year:"
 msgstr "Jahr:"
 
+msgid "Num. cards:"
+msgstr ""
+
 msgid "Compatible with current game"
 msgstr ""
 
@@ -4364,6 +4373,9 @@ msgstr "Aktuelle Sitzung"
 msgid "Log"
 msgstr "Protokoll"
 
+msgid "Demo Log"
+msgstr ""
+
 #: pysollib/tile/tkstats.py:523 data/pysolfc.glade:1404
 msgid "Full log"
 msgstr "Volles Protokoll"
@@ -4968,10 +4980,10 @@ msgstr "Karte suchen"
 msgid "Full picture"
 msgstr ""
 
-msgid "Icon Style"
+msgid "Icon style"
 msgstr ""
 
-msgid "Icon Size"
+msgid "Icon size"
 msgstr ""
 
 msgid "Small icons"
@@ -5165,6 +5177,9 @@ msgstr "Kommentare..."
 msgid "Log..."
 msgstr ""
 
+msgid "Demo log..."
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:427
 msgid "D&emo statistics..."
 msgstr "D&emo Statistiken..."
@@ -5350,7 +5365,7 @@ msgstr ""
 msgid "&Hamming"
 msgstr ""
 
-msgid "Card la&yout"
+msgid "Game la&yout"
 msgstr ""
 
 msgid "&Spread stacks"
@@ -5452,6 +5467,9 @@ msgstr ""
 msgid "&Sticky mouse"
 msgstr ""
 
+msgid "D&rag cards cursor"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:610
 msgid "Use mouse for undo/redo"
 msgstr ""
@@ -5492,6 +5510,9 @@ msgstr ""
 msgid "Save games &geometry"
 msgstr "Spielgeometrie speichern"
 
+msgid "&Keep dialogs on top"
+msgstr ""
+
 msgid "Othe&r graphics"
 msgstr ""
 
@@ -5537,7 +5558,7 @@ msgstr "&Regeln dieses Spiels"
 msgid "What's &new?"
 msgstr ""
 
-msgid "R&eport a Bug"
+msgid "R&eport a bug"
 msgstr ""
 
 #: pysollib/ui/tktile/menubar.py:660

po/fr_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1.02\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-10-29 20:06-0400\n"
+"PO-Revision-Date: 2025-03-14 19:16-0400\n"
 "Last-Translator: Eric Rausch <neelix570@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -116,6 +116,9 @@ msgstr "&Numéro suivant"
 msgid "&Cancel"
 msgstr "&Annuler"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Jeu au hasard"
@@ -682,7 +685,7 @@ msgid ""
 "Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
 "Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
 "Copyright (C) 2005 - 2009 Skomoroh.\n"
-"Copyright (C) 2020 - 2024 PySolFC.\n"
+"Copyright (C) 2020 - 2025 PySolFC.\n"
 "All Rights Reserved.\n"
 "\n"
 "PySol is free software distributed under the terms\n"
@@ -697,7 +700,7 @@ msgstr ""
 "Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer.\n"
 "Copyright (C) 2003 Mt. Hood Playing Card Co.\n"
 "Copyright (C) 2005 - 2009 Skomoroh.\n"
-"Copyright (C) 2020 - 2024 PySolFC.\n"
+"Copyright (C) 2020 - 2025 PySolFC.\n"
 "Tous droits réservés.\n"
 "\n"
 "PySol est un logiciel libre distribué sous la licence\n"
@@ -2602,6 +2605,9 @@ msgstr "Jeux récents"
 msgid "Favorite games"
 msgstr "Jeux favoris"
 
+msgid "Random game"
+msgstr ""
+
 #: pysollib/kivy/menubar.py:244
 msgid "<Add>"
 msgstr "<Ajouter>"
@@ -2688,7 +2694,7 @@ msgid "Automatic play"
 msgstr "Jouer auto"
 
 #: pysollib/kivy/menubar.py:513
-msgid "Auto face up"
+msgid "Auto face-up"
 msgstr "Retourner auto"
 
 #: pysollib/kivy/menubar.py:523
@@ -4234,6 +4240,9 @@ msgstr "Origine:"
 msgid "Year:"
 msgstr "Année:"
 
+msgid "Num. cards:"
+msgstr ""
+
 msgid "Compatible with current game"
 msgstr ""
 
@@ -4415,6 +4424,9 @@ msgstr "Session en cours"
 msgid "Log"
 msgstr "Journal"
 
+msgid "Demo Log"
+msgstr ""
+
 #: pysollib/tile/tkstats.py:523 data/pysolfc.glade:1404
 msgid "Full log"
 msgstr "Journal complet"
@@ -5019,10 +5031,10 @@ msgstr "Trouver carte"
 msgid "Full picture"
 msgstr ""
 
-msgid "Icon Style"
+msgid "Icon style"
 msgstr ""
 
-msgid "Icon Size"
+msgid "Icon size"
 msgstr ""
 
 msgid "Small icons"
@@ -5216,6 +5228,9 @@ msgstr "&Commentaires..."
 msgid "Log..."
 msgstr "Journal..."
 
+msgid "Demo log..."
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:427
 msgid "D&emo statistics..."
 msgstr "Statistiques d&émo..."
@@ -5396,7 +5411,7 @@ msgstr ""
 msgid "&Hamming"
 msgstr ""
 
-msgid "Card la&yout"
+msgid "Game la&yout"
 msgstr ""
 
 msgid "&Spread stacks"
@@ -5498,6 +5513,9 @@ msgstr "&Pointer/Cliquer"
 msgid "&Sticky mouse"
 msgstr "&Sélection"
 
+msgid "D&rag cards cursor"
+msgstr ""
+
 #: pysollib/ui/tktile/menubar.py:610
 msgid "Use mouse for undo/redo"
 msgstr "Souris pour annuler/répéter"
@@ -5538,6 +5556,9 @@ msgstr "Barre d'&aide"
 msgid "Save games &geometry"
 msgstr "Enregistrer la &géométrie du jeu"
 
+msgid "&Keep dialogs on top"
+msgstr ""
+
 msgid "Othe&r graphics"
 msgstr ""
 
@@ -5585,7 +5606,7 @@ msgstr "&Règles de ce jeu"
 msgid "What's &new?"
 msgstr ""
 
-msgid "R&eport a Bug"
+msgid "R&eport a bug"
 msgstr ""
 
 #: pysollib/ui/tktile/menubar.py:660