From 6c4129a54c19ace449fbde24b972d5e13ef5b654 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 May 2012 11:16:15 +0530
Subject: [PATCH] Make the ebook-convert documentation a lot smaller

---
 .../ebooks/conversion/plugins/fb2_output.py   |  2 +-
 src/calibre/manual/custom.py                  | 62 +++++++++----------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/fb2_output.py b/src/calibre/ebooks/conversion/plugins/fb2_output.py
index d7db2a0a33..ad35e58aad 100644
--- a/src/calibre/ebooks/conversion/plugins/fb2_output.py
+++ b/src/calibre/ebooks/conversion/plugins/fb2_output.py
@@ -154,7 +154,7 @@ class FB2Output(OutputFormatPlugin):
         OptionRecommendation(name='fb2_genre',
             recommended_value='antique', level=OptionRecommendation.LOW,
             choices=FB2_GENRES,
-            help=(_('Genre for the book. Choices: %s\n\n See: ') % FB2_GENRES) + 'http://www.fictionbook.org/index.php/Eng:FictionBook_2.1_genres ' \
+            help=(_('Genre for the book. Choices: %s\n\n See: ') % ', '.join(FB2_GENRES)) + 'http://www.fictionbook.org/index.php/Eng:FictionBook_2.1_genres ' \
                 + _('for a complete list with descriptions.')),
     ])
 
diff --git a/src/calibre/manual/custom.py b/src/calibre/manual/custom.py
index 390b5aa931..bb4f0194db 100644
--- a/src/calibre/manual/custom.py
+++ b/src/calibre/manual/custom.py
@@ -116,44 +116,42 @@ def generate_ebook_convert_help(preamble, info):
     from calibre.utils.logging import default_log
     preamble = re.sub(r'http.*\.html', ':ref:`conversion`', preamble)
     raw = preamble + textwrap.dedent('''
-    Since the options supported by ebook-convert vary depending on both the
-    input and the output formats, the various combinations are listed below:
+    The options and default values for the options change depending on both the
+    input and output formats, so you should always check with::
+
+        ebook-convert myfile.input_format myfile.output_format -h
+
+    Below are the options that are common to all conversion, followed by the
+    options specific to every input and output format
 
     ''')
-    toc = {}
-    sec_templ = textwrap.dedent('''\
-        .. include:: ../global.rst
+    parser, plumber = create_option_parser(['ebook-convert',
+        'dummyi.mobi', 'dummyo.epub', '-h'], default_log)
+    groups = [(None, None, parser.option_list)]
+    for grp in parser.option_groups:
+        if grp.title not in {'INPUT OPTIONS', 'OUTPUT OPTIONS'}:
+            groups.append((grp.title.title(), grp.description, grp.option_list))
+    options = '\n'.join(render_options('ebook-convert', groups, False))
 
-        {0}
-        ================================================================
+    raw += '\n\n.. contents::\n  :local:'
 
-        .. contents:: Contents
-          :depth: 1
-          :local:
+    raw += '\n\n' + options
+    for pl in sorted(input_format_plugins(), key=lambda x:x.name):
+        parser, plumber = create_option_parser(['ebook-convert',
+            'dummyi.'+list(pl.file_types)[0], 'dummyo.epub', '-h'], default_log)
+        groups = [(pl.name+ ' Options', '', g.option_list) for g in
+                parser.option_groups if g.title == "INPUT OPTIONS"]
+        prog = 'ebook-convert-'+(pl.name.lower().replace(' ', '-'))
+        raw += '\n\n' + '\n'.join(render_options(prog, groups, False, True))
+    for pl in sorted(output_format_plugins(), key=lambda x: x.name):
+        parser, plumber = create_option_parser(['ebook-convert', 'd.epub',
+            'dummyi.'+pl.file_type, '-h'], default_log)
+        groups = [(pl.name+ ' Options', '', g.option_list) for g in
+                parser.option_groups if g.title == "OUTPUT OPTIONS"]
+        prog = 'ebook-convert-'+(pl.name.lower().replace(' ', '-'))
+        raw += '\n\n' + '\n'.join(render_options(prog, groups, False, True))
 
-    ''')
-    for i, ip in enumerate(input_format_plugins()):
-        sraw = sec_templ.format(ip.name)
-        toc[ip.name] = 'ebook-convert-%d'%i
-        for op in output_format_plugins():
-            title = ip.name + ' to ' + op.name
-            parser, plumber = create_option_parser(['ebook-convert',
-                'dummyi.'+list(ip.file_types)[0],
-                'dummyo.'+op.file_type, '-h'], default_log)
-            cmd = 'ebook-convert '+list(ip.file_types)[0]+' '+op.file_type
-            groups = [(None, None, parser.option_list)]
-            for grp in parser.option_groups:
-                groups.append((grp.title, grp.description, grp.option_list))
-            options = '\n'.join(render_options(cmd, groups, False))
-            sraw += title+'\n------------------------------------------------------\n\n'
-            sraw += options + '\n\n'
-        update_cli_doc(os.path.join('cli', toc[ip.name]+'.rst'), sraw, info)
 
-    toct = '\n\n.. toctree::\n    :maxdepth: 2\n\n'
-    for ip in sorted(toc):
-        toct += '    ' + toc[ip]+'\n'
-
-    raw += toct+'\n\n'
     update_cli_doc(os.path.join('cli', 'ebook-convert.rst'), raw, info)
 
 def update_cli_doc(path, raw, info):