Fixed up some sections of the documentation.

html-src/ganjifa.html

@@ -1,4 +1,5 @@
 <h1>General Ganjifa Card Rules</h1>
+<p>
 Ganjifa are playing cards from India and other nations in the region.
 Usually round, some rectangular decks have been produced.  The most significant
 difference between Ganjifa and other types of cards is that Ganjifa cards have

html-src/gen-html.py

@@ -50,7 +50,7 @@ files = [
     ('glossary.html', 'PySol - Glossary'),
     ('hanafuda.html', 'PySol - Rules for General Flower Card Rules'),
     ('hexadeck.html', 'PySol - General Hex A Deck Card Rules'),
-    ('howtoplay.html', 'How to play PySol'),
+    ('howtoplay.html', 'How to Use PySol'),
     ('index.html', 'PySol - a Solitaire Game Collection'),
     ('install.html', 'PySol - Installation'),
     ('intro.html', 'PySol - Introduction'),
@@ -61,9 +61,10 @@ files = [
     ]
 
 rules_files = [
-    # ('hanoipuzzle.html', ),
+    ('hanoipuzzle.html', 'PySol - Rules for Hanoi Puzzle'),
     ('mahjongg.html', 'PySol - Rules for Mahjongg'),
     ('matrix.html', 'PySol - Rules for Matrix'),
+    ('notshisensho.html', 'PySol - Rules for Not Shisen-Sho'),
     ('pegged.html', 'PySol - Rules for Pegged'),
     ('shisensho.html', 'PySol - Rules for Shisen-Sho'),
     ('spider.html', 'PySol - Rules for Spider'),
@@ -121,6 +122,8 @@ rules_footer = '''
 
 <p>
 <a href="../index.html">Back to the index</a>
+<br>
+<a href="../rules.html">Back to individual game rules</a>
 </body>
 </html>'''
 
@@ -191,9 +194,6 @@ def gen_rules_html():
         if not rules_fn:
             rules_fn = _get_game_rules_filename(gi.name)
 
-        if rules_fn in files_list:
-            continue
-
         if rules_fn in rules_ls:
             rules_dir = 'rules'
         elif rules_fn in wikipedia_ls:
@@ -204,20 +204,18 @@ def gen_rules_html():
             continue
 
         # print '>>>', rules_fn
+        if rules_fn not in files_list:
+            title = 'PySol - Rules for ' + gi.name
+            s = ''
+            if gi.si.game_type == GI.GT_HANAFUDA:
+                s = '<a href="../hanafuda.html">General Flower Card rules</a>'
+            elif gi.si.game_type == GI.GT_DASHAVATARA_GANJIFA or \
+                    gi.si.game_type == GI.GT_MUGHAL_GANJIFA:
+                s = '<a href="../ganjifa.html">About Ganjifa</a>'
+            elif gi.si.game_type == GI.GT_HEXADECK:
+                s = '<a href="../hexadeck.html">General Hex A Deck rules</a>'
 
-        title = 'PySol - Rules for ' + gi.name
-        s = ''
-        if gi.si.game_type == GI.GT_HANAFUDA:
-            s = '<a href="../hanafuda.html">General Flower Card rules</a>'
-        elif gi.si.game_type == GI.GT_DASHAVATARA_GANJIFA:
-            s = '<a href="../ganjifa.html">About Ganjifa</a>'
-        elif gi.si.game_type == GI.GT_HEXADECK:
-            s = '<a href="../hexadeck.html">General Hex A Deck rules</a>'
-        elif gi.si.game_type == GI.GT_MUGHAL_GANJIFA:
-            s = '<a href="../ganjifa.html">About Ganjifa</a>'
-            # print '***', gi.name, '***'
-
-        rules_list.append((rules_dir, rules_fn, title, s))
+            rules_list.append((rules_dir, rules_fn, title, s))
         files_list.append(rules_fn)
         # rules_list.append((rules_fn, gi.name))
         print('<li><a href="rules/%s">%s</a>'

html-src/general_rules.html

@@ -36,3 +36,14 @@ from the Foundations. Of course, you can also use the Undo key <Z>.
 
 <p>
 If you're confused by all this, just watch a demo game :-)
+
+<h2>Other Types of Decks</h2>
+
+<p>
+A few of the games in PySol use a different type of deck.  For more info about
+some of the other decks PySol games can use, see the following:
+<ul>
+<li><a href="ganjifa.html">Ganjifa</a></li>
+<li><a href="hanafuda.html">Hanafuda</a></li>
+<li><a href="hexadeck.html">Hex A Deck</a></li>
+</ul>

html-src/hanafuda.html

@@ -5,10 +5,8 @@ There are some characteristics common to all the games played with Hanafuda
 cards. They are all played with one or more of the Asian flower card decks.
 This deck is common in a number of Pacific regions including Hawaii. There are
 twelve suits of four cards each. The suits are associated with the twelve
-months of the year. For a good explanation of what the suits are,
-try <a href="http://hanafubuki.org/">Graham Leonard's Hanafuda and Kabufuda
-site</a>.
-
+months of the year.
+</p>
 <p>
 Most of the flower card solitaire games are played like western deck games
 with minor changes. See the <a href="general_rules.html">General Rules</a> for
@@ -17,5 +15,5 @@ move all the cards from the tableau to the foundations. Probably the most
 difficult part of learning to play with hanafuda cards is learning which cards
 belong in which suits and what their ranking is. The ranking of the suits is
 sometimes as important as the ranking of the cards in the suit. Try keeping
-this hanafuda help image displayed where you can refer to it as you play.
+this hanafuda help image displayed where you can refer to it as you play.</p>
 <img alt="" src="images/hanahelp.gif">

html-src/howtoplay.html

@@ -1,4 +1,4 @@
-<h1>How to play PySol</h1>
+<h1>How to use PySol</h1>
 
 <h2>Mouse Usage</h2>
 <p>

html-src/index.html

@@ -1,9 +1,9 @@
 <h1>PySol - a Solitaire Game Collection</h1>
-
-<p> <a href="intro.html">Introduction</a>
-<p> <a href="install.html">Installation</a>
-<p> <a href="howtoplay.html">How to play</a>
-
+<ul>
+<li> <a href="intro.html">Introduction</a>
+<!-- <p> <a href="install.html">Installation</a>-->
+<li> <a href="howtoplay.html">How to play</a>
+</ul>
 <h2>Rules</h2>
 <ul>
 <li> <a href="glossary.html">Glossary</a>

pysollib/kivy/menubar.py

@@ -1102,7 +1102,7 @@ class HelpMenuDialog(LMenuDialog):
                 command=self.make_help_command(self.menubar.mHelp)))
         tv.add_node(
             LTreeNode(
-                text=_('How to play'),
+                text=_('How to use PySol'),
                 command=self.make_help_command(self.menubar.mHelpHowToPlay)))
         tv.add_node(
             LTreeNode(

pysollib/ui/tktile/menubar.py

@@ -677,7 +677,7 @@ class PysolMenubarTkCommon:
                 label=n_("&Contents"),
                 command=self.mHelp, accelerator=m+"F1")
         menu.add_command(
-            label=n_("&How to play"),
+            label=n_("&How to use PySol"),
             command=self.mHelpHowToPlay)
         menu.add_command(
             label=n_("&Rules for this game"),