[no subject]

[Gavin D. Smith]

branch: master
commit 85476858d9169557ec902fa1712b2b3b8e339f53
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Jul 27 21:42:57 2022 +0100

    texi2any --epub3
    
    * NEWS, TODO: Update.
    * tp/texi2any.pl: Add --epub3 to usage message.  Edit
    usage message for format selectors to remove "rather than Info".
---
 ChangeLog      | 8 ++++++++
 NEWS           | 4 ++--
 TODO           | 3 ---
 tp/texi2any.pl | 9 +++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f4c5e4df1..865cffeeab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-07-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       texi2any --epub3
+
+       * NEWS, TODO: Update.
+       * tp/texi2any.pl: Add --epub3 to usage message.  Edit
+       usage message for format selectors to remove "rather than Info".
+
 2022-07-27  Gavin Smith  <gavinsmith0123@gmail.com>
 
        texi2any --epub3
diff --git a/NEWS b/NEWS
index 77eca7c394..eee88e007d 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,8 @@ See the manual for detailed information.
 
 6.X
 * texi2any
- . LaTeX added as an output format, selected with --latex.
- . epub support (how??)
+ . LaTeX added as an output format, selected with --latex
+ . EPUB3 added as an output format, selected with --epub3
  . reform throughout the code in general
  . thorough review of character encoding issues
  . new customization variables involved with character encoding:
diff --git a/TODO b/TODO
index e23bbba58f..55f9bfe0f6 100644
--- a/TODO
+++ b/TODO
@@ -25,9 +25,6 @@ If you are interested in working on any of these, email 
bug-texinfo@gnu.org.
     Free Software Directory categories but these have changed.
 
 * texi2any:
-  - Support the epub output format, http://en.wikipedia.org/wiki/OEBPS.
-    Suggested by Sean Young, 30 Nov 2008 20:13:11 (Savannah bug tracker)
-      (IN PROGRESS - documentation required)
   - give a warning for "makeinfo FOO.info" when "makeinfo FOO.texi" was meant
   - Review and Improve the HTML customization API.  Missing from the API is
     a possibility to customize the translated strings and the translations.
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 28410b7d5c..f1e78b5d2e 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -733,11 +733,12 @@ the behavior is identical, and does not depend on the 
installed name.\n")
     get_conf('ERROR_LIMIT'))
 ."\n";
   $makeinfo_help .= __("Output format selection (default is to produce 
Info):")."\n"
-.__("      --docbook               output Docbook XML rather than Info.")."\n"
-.__("      --html                  output HTML rather than Info.")."\n"
-.__("      --latex                 output LaTeX rather than Info.")."\n"
+.__("      --docbook               output Docbook XML.")."\n"
+.__("      --html                  output HTML.")."\n"
+.__("      --epub3                 output EPUB3.")."\n"
+.__("      --latex                 output LaTeX.")."\n"
 .__("      --plaintext             output plain text rather than Info.")."\n"
-.__("      --xml                   output Texinfo XML rather than Info.")."\n"
+.__("      --xml                   output Texinfo XML.")."\n"
 .__("      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given 
output,
                                 after checking validity of TEXINFO-FILE.")."\n"
 ."\n";