From dbe16762120b19f82015c80e117e44ceecd63a08 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 28 Apr 2021 09:26:53 +0530 Subject: [PATCH] String changes --- manual/conf.py | 7 +++++-- manual/conversion.rst | 2 +- manual/simple_index.rst | 4 ++-- manual/typesetting_math.rst | 15 +++++++-------- src/calibre/gui2/book_details.py | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/manual/conf.py b/manual/conf.py index 4c929f5874..455a788ea1 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -31,7 +31,7 @@ needs_sphinx = '1.2' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.addons.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'custom', 'sidebar_toc', 'sphinx.ext.viewcode'] +extensions = ['sphinx.ext.autodoc', 'custom', 'sidebar_toc', 'sphinx.ext.viewcode', 'sphinx.ext.extlinks'] # Add any paths that contain templates here, relative to this directory. templates_path = ['templates'] @@ -175,7 +175,10 @@ def sort_languages(x): html_context['other_languages'].sort(key=sort_languages) html_context['support_text'] = _('Support calibre') html_context['support_tooltip'] = _('Contribute to support calibre development') -html_context['homepage_url'] = 'http://calibre-ebook.com' + (f'/{language}' if needs_localization else '') +html_context['homepage_url'] = 'https://calibre-ebook.com' + (f'/{language}' if needs_localization else '') +extlinks = { + 'website': (html_context['homepage_url'] + '/%s', None), +} del sort_languages, get_language epub_author = u'Kovid Goyal' diff --git a/manual/conversion.rst b/manual/conversion.rst index 21d9d2e60c..11882fa264 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -586,7 +586,7 @@ instead of using the text inside the tag. Note the trailing ``/@title`` on the XPath expression, you can use this form to tell calibre to get the text from any attribute you like. -How options are set/saved for Conversion +How options are set/saved for conversion ------------------------------------------- There are two places where conversion options can be set in calibre. The first is diff --git a/manual/simple_index.rst b/manual/simple_index.rst index a71c6519f1..a60d754635 100644 --- a/manual/simple_index.rst +++ b/manual/simple_index.rst @@ -16,8 +16,8 @@ If you want to read the book on your reader, connect it to the computer, wait ti To get started with more advanced usage, you should read about :doc:`gui`. For even more power and versatility, learn the :doc:`generated/en/cli-index`. You will find the list of :doc:`faq` useful as well. If you have more questions, or want to discuss calibre with other users or ask -for help with specific things, there are `forums and other help resources -available `_. +for help with specific things, there are :website:`forums and other help resources +available `. .. only:: online diff --git a/manual/typesetting_math.rst b/manual/typesetting_math.rst index 435a516ad5..9f4463b595 100644 --- a/manual/typesetting_math.rst +++ b/manual/typesetting_math.rst @@ -1,14 +1,14 @@ .. _typesetting_math: -Typesetting Math in e-books -============================ +Typesetting mathematics in e-books +==================================== -The calibre E-book viewer has the ability to display math embedded in e-books -(EPUB and HTML files). You can typeset the math directly with TeX or MathML or +The calibre E-book viewer has the ability to display mathematics embedded in e-books +(EPUB and HTML files). You can typeset the mathematics directly with TeX or MathML or AsciiMath. The calibre E-book viewer uses the excellent `MathJax `_ library to do this. This is a brief tutorial on -creating e-books with math in them that work well with the calibre E-book viewer. +creating e-books with mathematics in them that work well with the calibre E-book viewer. A simple HTML file with mathematics @@ -20,7 +20,7 @@ TeX notation for mathematics. You will see that you can use normal TeX commands, with the small caveat that ampersands and less than and greater than signs have to be written as & < and > respectively. -The first step is to tell calibre that this will contains maths. You do this by +The first step is to tell calibre that this will contains mathematics. You do this by adding the following snippet of code to the section of the HTML file:: @@ -60,6 +60,5 @@ More information ----------------- Since the calibre E-book viewer uses the MathJax library to render mathematics, the best -place to find out more about math in e-books and get help is the `MathJax +place to find out more about mathematics in e-books and get help is the `MathJax website `_. - diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index cc641606af..289c903400 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -76,7 +76,7 @@ def create_search_internet_menu(callback, author=None): m = QMenu(( _('Search the internet for the author {}').format(author) if author is not None else - _('Search the internet for this book')) + '…' + _('Search the internet for this book')) ) m.menuAction().setIcon(QIcon(I('search.png'))) items = all_book_searches() if author is None else all_author_searches()