From: Radek Czajka Date: Wed, 19 Jan 2011 14:15:48 +0000 (+0100) Subject: book2html generates full page X-Git-Tag: 1.7~218 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/6d65ed2b0c5f9f6df14de211ea2bf1de0a5dac70?ds=inline;hp=f0c23b2e3a1a1d7f37d9f00118632d116b3c8582 book2html generates full page --- diff --git a/librarian/html.py b/librarian/html.py index 9401a01..4e9abd0 100644 --- a/librarian/html.py +++ b/librarian/html.py @@ -30,7 +30,7 @@ def html_has_content(text): return etree.ETXPath('//p|//{%(ns)s}p|//h1|//{%(ns)s}h1' % {'ns': str(XHTMLNS)})(text) def transform(input, output_filename=None, is_file=True, \ - parse_dublincore=True, stylesheet='legacy', options={}): + parse_dublincore=True, stylesheet='legacy', options={}, flags=None): """Transforms file input_filename in XML to output_filename in XHTML. If output_filename is None, returns an XML, @@ -49,6 +49,10 @@ def transform(input, output_filename=None, is_file=True, \ document = WLDocument.from_string(input, True, \ parse_dublincore=parse_dublincore) + if flags: + for flag in flags: + document.edoc.getroot().set(flag, 'yes') + document.clean_ed_note() result = document.transform(style, **options) diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt index 752eade..0f9b665 100755 --- a/librarian/xslt/book2html.xslt +++ b/librarian/xslt/book2html.xslt @@ -1,408 +1,419 @@ - -
- - -
-

Przypisy

- -
- - [] - - -

- - - - - -
- -
- -
- + + + + + Książka z serwisu WolneLektury.pl + + + + + + + + + + + + + + + +
+ + +
+

Przypisy

+ +
+ + [] + + +

+ + + + + +
+ +
+ +
@@ -511,16 +522,16 @@
- + - + - @@ -530,7 +541,7 @@ - +
diff --git a/scripts/book2html b/scripts/book2html index f7eaf63..a48aa64 100755 --- a/scripts/book2html +++ b/scripts/book2html @@ -35,7 +35,7 @@ if __name__ == '__main__': output_filename = os.path.splitext(input_filename)[0] + '.html' try: - html.transform(input_filename, output_filename, parse_dublincore=options.parse_dublincore) + html.transform(input_filename, output_filename, parse_dublincore=options.parse_dublincore, flags=('full-page',)) except ParseError, e: print '%(file)s:%(name)s:%(message)s' % { 'file': input_filename,