From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 5E3816DE0962 for ; Sat, 5 Nov 2016 13:20:20 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.209 X-Spam-Level: X-Spam-Status: No, score=-0.209 tagged_above=-999 required=5 tests=[AWL=-0.189, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tqn1yGrsCtEb for ; Sat, 5 Nov 2016 13:20:19 -0700 (PDT) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by arlo.cworth.org (Postfix) with ESMTPS id BB76E6DE00B8 for ; Sat, 5 Nov 2016 13:20:17 -0700 (PDT) Received: by mail-lf0-f65.google.com with SMTP id o141so5361957lff.1 for ; Sat, 05 Nov 2016 13:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=M3maDv7vQ/pqgsJbavjQ7clfioB/ZWzHrQBdxRXlBcE=; b=cZWQdbd9WAAwaVXLA27CSFPcmEXJej69ainmYEm4cA5wwlx4NlvyWE6ak58yoYLn0n QYU/aYWP88OyOxW1dUh3Fow8tK/ygNWNVUYYH2DVyGLU4mjkBg1Q966uN8YIOVTlT/Kz AnIqDFV9Ov/JFPsu+qoEezuy9JXswNFjacofTytavn0mmlsTJJuBVgZ0bM77KJYx22K3 xOOWh3R8KXlGsSoJco91JiW+BQplQnHpxJsCGUBCTMFqdAvce3RKdir4o5wJwoHnkWWk vWyr+Jq7RQQL4YiHH36lbhjDXcM+bVi0kreXwFpozLm3WLHTH8gZebhNLdzyAqHFKbsF HOLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=M3maDv7vQ/pqgsJbavjQ7clfioB/ZWzHrQBdxRXlBcE=; b=a3QTByu6dLemMfkWx+cTBLa5+P/DRWRXDclSHnzFsfMHOH4rZWsYo0Ba0pWbGX0n2t CP5jOeetZuQtqK/im7zj1NpY/j3nbJCoY5+lgJOuhFyo89EIF1N3L89HQr/37p1glxdA vNtciYrdp5rQaEDWo3jaBCYrhhp45HbF+gwhZPt1wYcL7KVydhnMWOIbhDbacZLRqsKW H5iNes5F5B0bCqz9Xp24fc3Ox2ToQLrony2W2CtQ9Qw2+OBt0latbCbb+tfIxcr5mrE3 VSl3/bMBsbRKCM/zs4OGU2vGZ+4MPKtEBzDvzzD73k7VW6qHeqVdi22tqAwXSSwQCZCo BFTw== X-Gm-Message-State: ABUngvfY+1gwMGD32rH74GDsccbqkOhbIyZyj5QCEhiGxkr/f3VfeZWViYBbji3bhAlk2w== X-Received: by 10.25.17.88 with SMTP id g85mr11059425lfi.10.1478377216011; Sat, 05 Nov 2016 13:20:16 -0700 (PDT) Received: from localhost (mobile-access-bcee98-78.dhcp.inet.fi. [188.238.152.78]) by smtp.gmail.com with ESMTPSA id g4sm3510592lji.45.2016.11.05.13.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Nov 2016 13:20:15 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 2/9] doc/conf.py: generate texinfo_documents list from man_pages list Date: Sat, 5 Nov 2016 22:18:11 +0200 Message-Id: <5c9c27a91e0084644222b0221ed00ead084ed93d.1478376896.git.jani@nikula.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2016 20:20:20 -0000 No need to repeat mostly the same information twice in conf.py. We probably want to have a corresponding texinfo document for all the man pages. Python list comprehension to the rescue. (The reverse is not true; we have a texinfo document for notmuch-emacs we don't want as a man page.) There should be no user visible changes. --- doc/conf.py | 60 ++++++++++++------------------------------------------------ 1 file changed, 12 insertions(+), 48 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index fce5a3afdfc2..aa02b9a8bb7b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -135,52 +135,16 @@ texinfo_documents = [ ('notmuch-emacs', 'notmuch-emacs', u'notmuch Documentation', u'Carl Worth and many others', 'notmuch-emacs', 'emacs based front-end for notmuch', 'Miscellaneous'), -('man1/notmuch','notmuch',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch', - 'thread-based email index, search, and tagging','Miscellaneous'), -('man1/notmuch-address','notmuch-address',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-address', - 'output addresses from matching messages','Miscellaneous'), -('man1/notmuch-compact','notmuch-compact',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-compact', - 'compact the notmuch database','Miscellaneous'), -('man1/notmuch-config','notmuch-config',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-config', - 'access notmuch configuration file','Miscellaneous'), -('man1/notmuch-count','notmuch-count',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-count', - 'count messages matching the given search terms','Miscellaneous'), -('man1/notmuch-dump','notmuch-dump',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-dump', - 'creates a plain-text dump of the tags of each message','Miscellaneous'), -('man1/notmuch-emacs-mua','notmuch-emacs-mua',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-emacs-mua', - u'send mail with notmuch and emacs','Miscellaneous'), -('man5/notmuch-hooks','notmuch-hooks',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-hooks', - 'hooks for notmuch','Miscellaneous'), -('man1/notmuch-insert','notmuch-insert',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-insert', - 'add a message to the maildir and notmuch database','Miscellaneous'), -('man1/notmuch-new','notmuch-new',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-new', - 'incorporate new mail into the notmuch database','Miscellaneous'), -('man1/notmuch-reply','notmuch-reply',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-reply', - 'constructs a reply template for a set of messages','Miscellaneous'), -('man1/notmuch-restore','notmuch-restore',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-restore', - 'restores the tags from the given file (see notmuch dump)','Miscellaneous'), -('man1/notmuch-search','notmuch-search',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-search', - 'search for messages matching the given search terms','Miscellaneous'), -('man7/notmuch-search-terms','notmuch-search-terms',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-search-terms', - 'syntax for notmuch queries','Miscellaneous'), -('man1/notmuch-show','notmuch-show',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-show', - 'show messages matching the given search terms','Miscellaneous'), -('man1/notmuch-tag','notmuch-tag',u'notmuch Documentation', - u'Carl Worth and many others', 'notmuch-tag', - 'add/remove tags for all messages matching the search terms','Miscellaneous'), ] + +# generate texinfo list from man page list +texinfo_documents += [ + ( + x[0], # source start file + x[1], # target name + u'notmuch Documentation', # title + x[3][0], # author + x[1], # dir menu entry + x[2], # description + 'Miscellaneous' # category + ) for x in man_pages] -- 2.1.4