From 905cbd09ed20a67878dab583daacf028ffb71506 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Mon, 22 Feb 2016 10:17:17 +0900 Subject: [PATCH] Fix: ambiguous description for epub3_page_progression_direction conf value. --- doc/config.rst | 8 ++++++-- sphinx/builders/epub3.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 9ac9b17d4..d613e6ca3 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1387,8 +1387,12 @@ the `Dublin Core metadata `_. .. confval:: epub3_page_progression_direction The global direction in which the content flows. - Allowed values are ltr (left-to-right), rtl (right-to-left) and default. - The default value is ``'ltr'``. + Allowed values are ``'ltr'`` (left-to-right), ``'rtl'`` (right-to-left) and + ``'default'``. The default value is ``'ltr'``. + + When the ``'default'`` value is specified, the Author is expressing no + preference and the Reading System may chose the rendering direction. This + value must be assumed when the attribute is not specified. .. versionadded:: 1.4 diff --git a/sphinx/builders/epub3.py b/sphinx/builders/epub3.py index ded8c50d9..0fd347735 100644 --- a/sphinx/builders/epub3.py +++ b/sphinx/builders/epub3.py @@ -120,7 +120,7 @@ class Epub3Builder(EpubBuilder): metadata['description'] = self.esc(self.config.epub3_description) metadata['contributor'] = self.esc(self.config.epub3_contributor) metadata['page_progression_direction'] = self.esc( - self.config.epub3_page_progression_direction) + self.config.epub3_page_progression_direction) or 'default' return metadata def new_navlist(self, node, level):