From 70d7253dacd59205200ccc3fe9b266ba9c82842e Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Sat, 13 Feb 2016 09:29:15 -0600
Subject: [PATCH] Fix some ini and highlighting issues.

---
 calibre-plugin/plugin-defaults.ini |  6 +++---
 fanficfare/configurable.py         | 19 ++++++++++++++-----
 fanficfare/defaults.ini            |  6 +++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini
index 14b164e..b32e3f9 100644
--- a/calibre-plugin/plugin-defaults.ini
+++ b/calibre-plugin/plugin-defaults.ini
@@ -2018,7 +2018,7 @@ extra_valid_entries:stars,reviews,reads,takesplaces,snapeflavours,sitetags
 stars_label:Frogs
 takesplaces_label:Takes Place
 snapeflavours_label:Snape Flavour
-sitetags_labels:Site Tags
+sitetags_label:Site Tags
 
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -2054,8 +2054,8 @@ pages_label:Pages
 readers_label:Readers
 reads_label:Reads
 favorites_label:Favorites
-searchtags:Search Tags
-comments:Comments
+searchtags_label:Search Tags
+comments_label:Comments
 
 include_in_category:category,searchtags
 
diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py
index b90865c..ae6395c 100644
--- a/fanficfare/configurable.py
+++ b/fanficfare/configurable.py
@@ -116,6 +116,11 @@ def get_valid_list_entries():
                  ])
 
 boollist=['true','false']
+base_xenforo_list=['base_xenforoforum',
+                   'forums.spacebattles.com',
+                   'forums.sufficientvelocity.com',
+                   'questionablequesting.com',
+                   ]
 def get_valid_set_options():
     '''
     dict() of names of boolean options, but as a tuple with
@@ -155,6 +160,9 @@ def get_valid_set_options():
                'non_breaking_spaces':(['fictionmania.tv'],None,boollist),
                'universe_as_series':(['storiesonline.net'],None,boollist),
                'strip_text_links':(['bloodshedverse.com'],None,boollist),
+               'centeredcat_to_characters':(['tthfanfic.org'],None,boollist),
+               'pairingcat_to_characters_ships':(['tthfanfic.org'],None,boollist),
+               'romancecat_to_characters_ships':(['tthfanfic.org'],None,boollist),
 
                # eFiction Base adapters allow bulk_load
                # kept forgetting to add them, so now it's automatic.
@@ -169,11 +177,8 @@ def get_valid_set_options():
                'grayscale_images':(None,['epub','html'],boollist),
                'no_image_processing':(None,['epub','html'],boollist),
 
-               'continue_on_chapter_error':(['base_xenforoforum',
-                                             'forums.spacebattles.com',
-                                             'forums.sufficientvelocity.com',
-                                             'questionablequesting.com',
-                                             ],None,boollist),
+               'continue_on_chapter_error':(base_xenforo_list,None,boollist),
+               '':(base_xenforo_list,None,boollist),
                }
 
     return dict(valdict)
@@ -310,6 +315,9 @@ def get_valid_keywords():
                  'strip_chapter_numbers',
                  'strip_chapter_numeral',
                  'strip_text_links',
+                 'centeredcat_to_characters',
+                 'pairingcat_to_characters_ships',
+                 'romancecat_to_characters_ships',
                  'titlepage_end',
                  'titlepage_entries',
                  'titlepage_entry',
@@ -332,6 +340,7 @@ def get_valid_keywords():
                  'zip_filename',
                  'zip_output',
                  'continue_on_chapter_error',
+                 'capitalize_forumtags',
                  ])
 
 # *known* entry keywords -- or rather regexps for them.
diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini
index 081459f..02e68e6 100644
--- a/fanficfare/defaults.ini
+++ b/fanficfare/defaults.ini
@@ -2000,7 +2000,7 @@ extra_valid_entries:stars,reviews,reads,takesplaces,snapeflavours,sitetags
 stars_label:Frogs
 takesplaces_label:Takes Place
 snapeflavours_label:Snape Flavour
-sitetags_labels:Site Tags
+sitetags_label:Site Tags
 
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -2036,8 +2036,8 @@ pages_label:Pages
 readers_label:Readers
 reads_label:Reads
 favorites_label:Favorites
-searchtags:Search Tags
-comments:Comments
+searchtags_label:Search Tags
+comments_label:Comments
 
 include_in_category:category,searchtags