footnotes, cleanups, top margin

[librarian.git] / librarian / book2anything.py

diff --git a/librarian/book2anything.py b/librarian/book2anything.py
index 7660ec7..d76177c 100755 (executable)
--- a/librarian/book2anything.py
+++ b/librarian/book2anything.py
@@ -10,7 +10,7 @@ import optparse
 
 from librarian import DirDocProvider, ParseError
 from librarian.parser import WLDocument
 
 from librarian import DirDocProvider, ParseError
 from librarian.parser import WLDocument

-from librarian.cover import WLCover
+from librarian.cover import WLCover, FutureOfCopyrightCover, CoverFromFile

 
 
 class Option(object):
 
 
 class Option(object):


@@ -99,9 +99,15 @@ class Book2Anything(object):
         # Add cover support, if any.
         if cls.uses_cover:
             if options.image_cache:
         # Add cover support, if any.
         if cls.uses_cover:
             if options.image_cache:

-                transform_args['cover'] = lambda x: WLCover(x, image_cache = options.image_cache)
+                def cover_class(*args, **kwargs):
+                    return FutureOfCopyrightCover(image_cache=options.image_cache, *args, **kwargs)
+                transform_args['cover'] = cover_class
+            elif options.cover_file:
+                def cover_class(*args, **kwargs):
+                    return CoverFromFile(options.cover_file, *args, **kwargs)
+                transform_args['cover'] = cover_class

             elif not cls.cover_optional or options.with_cover:
             elif not cls.cover_optional or options.with_cover:

-                transform_args['cover'] = WLCover
+                transform_args['cover'] = FutureOfCopyrightCover

 
 
         # Do some real work
 
 
         # Do some real work