Merge branch 'master' into ofop

diff --cc librarian/cover.py
Simple merge

diff --cc librarian/packagers.py
Simple merge

diff --cc librarian/xslt/book2html.xslt
Simple merge

diff --cc scripts/book2partner
index dcc8919,4b84c2f..338b263
--- 1/scripts/book2partner
--- 2/scripts/book2partner
+++ b/scripts/book2partner
@@@ -49,12 -45,8 +49,12 @@@ if __name__ == '__main__'
          packagers.GandalfEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.gandalf_pdf:
          packagers.GandalfPdfPackager.prepare(input_filenames, options.output_dir, options.verbose)
 +    if options.artatech:
 +        packagers.ArtaTechEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
 +    if options.artatech_pdf:
 +        packagers.ArtaTechPdfPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.virtualo:
-         packagers.VirtualoEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
+         packagers.VirtualoPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.prestigio:
          packagers.PrestigioEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
      if options.prestigio_pdf: