From 32676cbecfa28980b77426da56bfc1b8429ccb7d Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Tue, 8 Oct 2013 12:12:21 +0200 Subject: - minor change to the SCons Docbook XSD: stricter handling of para within the special tags "tool", "builder" and "cvar" - fixed current docs accordingly --- doc/editor_configs/serna/scons/xsd/dbpoolx.xsd | 3 --- doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd | 3 --- doc/xsd/dbpoolx.xsd | 3 --- src/engine/SCons/Tool/msginit.xml | 4 +++- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd b/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd index f0a3f1c..0ce5cb7 100644 --- a/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd +++ b/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd @@ -2589,7 +2589,6 @@ - @@ -2616,7 +2615,6 @@ - @@ -2644,7 +2642,6 @@ - diff --git a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd index f0a3f1c..0ce5cb7 100644 --- a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd +++ b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd @@ -2589,7 +2589,6 @@ - @@ -2616,7 +2615,6 @@ - @@ -2644,7 +2642,6 @@ - diff --git a/doc/xsd/dbpoolx.xsd b/doc/xsd/dbpoolx.xsd index f0a3f1c..0ce5cb7 100644 --- a/doc/xsd/dbpoolx.xsd +++ b/doc/xsd/dbpoolx.xsd @@ -2589,7 +2589,6 @@ - @@ -2616,7 +2615,6 @@ - @@ -2644,7 +2642,6 @@ - diff --git a/src/engine/SCons/Tool/msginit.xml b/src/engine/SCons/Tool/msginit.xml index 0f89020..7ce785c 100644 --- a/src/engine/SCons/Tool/msginit.xml +++ b/src/engine/SCons/Tool/msginit.xml @@ -216,8 +216,10 @@ See &t-link-msginit; tool and &b-link-POInit; builder. Internal ``macro''. Computes locale (language) name based on target filename (default: '${TARGET.filebase}' ). - + See &t-link-msginit; tool and &b-link-POInit; builder. + + \ No newline at end of file -- cgit v0.12 From 3bebac3d0e8f24065ecda4abb2a2dad7b1d57164 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Tue, 8 Oct 2013 12:54:45 +0200 Subject: - added an explicit Gs() Builder to the gs.py Tool - updated documentation accordingly and added a (very) simple test --- doc/generated/builders.gen | 21 +++++++++++++++++++++ doc/generated/builders.mod | 4 ++++ doc/generated/tools.gen | 7 ++++++- doc/generated/variables.gen | 18 +++++++++++------- src/engine/SCons/Tool/gs.py | 31 +++++++++++++++++++++---------- src/engine/SCons/Tool/gs.xml | 38 ++++++++++++++++++++++++++++++-------- test/Ghostscript/GS.py | 2 ++ 7 files changed, 95 insertions(+), 26 deletions(-) diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index 3fdafb6..5cd92f2 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -397,6 +397,27 @@ env.DVI(target = 'ccc.dvi', source = 'ccc.latex') + + + Gs() + + + env.Gs() + + + +A Builder for explicitly calling the gs executable. +Depending on the underlying OS, the different names gs, +gsos2 and gswin32c +are tried. + +env = Environment(tools=['gs']) +env.Gs('cover.jpg','scons-scons.pdf', + GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -q') + ) + + + Install() diff --git a/doc/generated/builders.mod b/doc/generated/builders.mod index 59900cc..b8c7d80 100644 --- a/doc/generated/builders.mod +++ b/doc/generated/builders.mod @@ -21,6 +21,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. DocbookXInclude"> DocbookXslt"> DVI"> +Gs"> Install"> InstallAs"> InstallVersionedLib"> @@ -74,6 +75,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.DocbookXInclude"> env.DocbookXslt"> env.DVI"> +env.Gs"> env.Install"> env.InstallAs"> env.InstallVersionedLib"> @@ -137,6 +139,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. DocbookXInclude"> DocbookXslt"> DVI"> +Gs"> Install"> InstallAs"> InstallVersionedLib"> @@ -190,6 +193,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.DocbookXInclude"> env.DocbookXslt"> env.DVI"> +env.Gs"> env.Install"> env.InstallAs"> env.InstallVersionedLib"> diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index 57bb0a2..7d75638 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -444,7 +444,12 @@ Set construction variables for GNU linker/loader. gs -Set construction variables for Ghostscript. +This Tool sets the required construction variables for working with +the Ghostscript command. It also registers an appropriate Action +with the PDF Builder (PDF), such that the conversion from +PS/EPS to PDF happens automatically for the TeX/LaTeX toolchain. +Finally, it adds an explicit Ghostscript Builder (Gs) to the +environment. Sets: &cv-link-GS;, &cv-link-GSCOM;, &cv-link-GSFLAGS;.Uses: &cv-link-GSCOMSTR;. diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 784cd28..ee5a0dd 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -2324,7 +2324,7 @@ described above.) GS -The Ghostscript program used to convert PostScript to PDF files. +The Ghostscript program used, e.g. to convert PostScript to PDF files. @@ -2332,7 +2332,8 @@ The Ghostscript program used to convert PostScript to PDF files. GSCOM -The Ghostscript command line used to convert PostScript to PDF files. +The full Ghostscript command line used for the conversion process. Its default +value is $GS $GSFLAGS -sOutputFile=$TARGET $SOURCES. @@ -2341,9 +2342,8 @@ The Ghostscript command line used to convert PostScript to PDF files. The string displayed when -Ghostscript is used to convert -a PostScript file to a PDF file. -If this is not set, then $GSCOM (the command line) is displayed. +Ghostscript is called for the conversion process. +If this is not set (the default), then $GSCOM (the command line) is displayed. @@ -2351,8 +2351,9 @@ If this is not set, then -General options passed to the Ghostscript program -when converting PostScript to PDF files. +General options passed to the Ghostscript program, +when converting PostScript to PDF files for example. Its default value +is -dNOPAUSE -dBATCH -sDEVICE=pdfwrite @@ -3548,6 +3549,9 @@ See m Internal ``macro''. Computes locale (language) name based on target filename (default: '${TARGET.filebase}' ). + +See msginit tool and POInit builder. + diff --git a/src/engine/SCons/Tool/gs.py b/src/engine/SCons/Tool/gs.py index ada169a..a8fddde 100644 --- a/src/engine/SCons/Tool/gs.py +++ b/src/engine/SCons/Tool/gs.py @@ -34,6 +34,7 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import SCons.Action +import SCons.Builder import SCons.Platform import SCons.Util @@ -52,17 +53,27 @@ GhostscriptAction = None def generate(env): """Add Builders and construction variables for Ghostscript to an Environment.""" - global GhostscriptAction - if GhostscriptAction is None: - GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR') - - import pdf - pdf.generate(env) - - bld = env['BUILDERS']['PDF'] - bld.add_action('.ps', GhostscriptAction) - + # The following try-except block enables us to use the Tool + # in standalone mode (without the accompanying pdf.py), + # whenever we need an explicit call of gs via the Gs() + # Builder ... + try: + if GhostscriptAction is None: + GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR') + + import pdf + pdf.generate(env) + + bld = env['BUILDERS']['PDF'] + bld.add_action('.ps', GhostscriptAction) + except ImportError, e: + pass + + gsbuilder = SCons.Builder.Builder(action = SCons.Action.Action('$GSCOM', '$GSCOMSTR'), + env = env) + env['BUILDERS']['Gs'] = gsbuilder + env['GS'] = gs env['GSFLAGS'] = SCons.Util.CLVar('-dNOPAUSE -dBATCH -sDEVICE=pdfwrite') env['GSCOM'] = '$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES' diff --git a/src/engine/SCons/Tool/gs.xml b/src/engine/SCons/Tool/gs.xml index c34f004..3fe5165 100644 --- a/src/engine/SCons/Tool/gs.xml +++ b/src/engine/SCons/Tool/gs.xml @@ -26,7 +26,12 @@ See its __doc__ string for a discussion of the format. -Set construction variables for Ghostscript. +This Tool sets the required construction variables for working with +the Ghostscript command. It also registers an appropriate Action +with the PDF Builder (&b-link-PDF;), such that the conversion from +PS/EPS to PDF happens automatically for the TeX/LaTeX toolchain. +Finally, it adds an explicit Ghostscript Builder (&b-link-Gs;) to the +environment. @@ -42,7 +47,7 @@ Set construction variables for Ghostscript. -The Ghostscript program used to convert PostScript to PDF files. +The Ghostscript program used, e.g. to convert PostScript to PDF files. @@ -50,7 +55,8 @@ The Ghostscript program used to convert PostScript to PDF files. -The Ghostscript command line used to convert PostScript to PDF files. +The full Ghostscript command line used for the conversion process. Its default +value is $GS $GSFLAGS -sOutputFile=$TARGET $SOURCES. @@ -59,9 +65,8 @@ The Ghostscript command line used to convert PostScript to PDF files. The string displayed when -Ghostscript is used to convert -a PostScript file to a PDF file. -If this is not set, then &cv-link-GSCOM; (the command line) is displayed. +Ghostscript is called for the conversion process. +If this is not set (the default), then &cv-link-GSCOM; (the command line) is displayed. @@ -69,10 +74,27 @@ If this is not set, then &cv-link-GSCOM; (the command line) is displayed. -General options passed to the Ghostscript program -when converting PostScript to PDF files. +General options passed to the Ghostscript program, +when converting PostScript to PDF files for example. Its default value +is -dNOPAUSE -dBATCH -sDEVICE=pdfwrite + + + +A Builder for explicitly calling the gs executable. +Depending on the underlying OS, the different names gs, +gsos2 and gswin32c +are tried. + +env = Environment(tools=['gs']) +env.Gs('cover.jpg','scons-scons.pdf', + GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -q') + ) + + + + \ No newline at end of file diff --git a/test/Ghostscript/GS.py b/test/Ghostscript/GS.py index 2cae8b8..daeea09 100644 --- a/test/Ghostscript/GS.py +++ b/test/Ghostscript/GS.py @@ -51,6 +51,7 @@ env = Environment(GS = r'%(_python_)s mygs.py', GSCOM = r'$GS $TARGET $SOURCE', tools=['gs']) env.PDF(target = 'test1.pdf', source = 'test1.ps') +env.Gs(target = 'test2.pdf', source = 'test1.ps') """ % locals()) test.write('test1.ps', r"""This is a .ps test. @@ -60,6 +61,7 @@ test.write('test1.ps', r"""This is a .ps test. test.run(arguments = '.', stderr = None) test.fail_test(test.read('test1.pdf') != "This is a .ps test.\n") +test.fail_test(test.read('test2.pdf') != "This is a .ps test.\n") -- cgit v0.12 From ef9d8a0031b3ca6faabb0746eeb2a7da519fb805 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Tue, 8 Oct 2013 15:45:37 +0200 Subject: - added EPUB as output format for documentation ("user" and "man" targets) --- doc/SConscript | 30 ++++++++++++++++++++++++++++-- doc/man/MANIFEST | 3 ++- doc/man/SConstruct | 22 +++++++++++++++++++++- doc/man/cover.jpg | Bin 0 -> 306 bytes doc/man/epub.css | 33 +++++++++++++++++++++++++++++++++ doc/man/epub.xsl | 35 +++++++++++++++++++++++++++++++++++ doc/man/html.xsl | 4 ++++ doc/man/pdf.xsl | 5 ++++- doc/man/scons.xml | 3 +++ doc/user/MANIFEST | 2 +- doc/user/SConstruct | 22 +++++++++++++++++++++- doc/user/chtml.xsl | 4 ++++ doc/user/cover.jpg | Bin 0 -> 306 bytes doc/user/epub.css | 33 +++++++++++++++++++++++++++++++++ doc/user/epub.xsl | 36 ++++++++++++++++++++++++++++++++++++ doc/user/html.xsl | 4 ++++ doc/user/main.xml | 1 + doc/user/pdf.xsl | 4 ++++ 18 files changed, 234 insertions(+), 7 deletions(-) create mode 100644 doc/man/cover.jpg create mode 100644 doc/man/epub.css create mode 100644 doc/man/epub.xsl create mode 100644 doc/user/cover.jpg create mode 100644 doc/user/epub.css create mode 100644 doc/user/epub.xsl diff --git a/doc/SConscript b/doc/SConscript index 8dcf697..c731dab 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -41,6 +41,7 @@ build = os.path.join(build_dir, 'doc') fop = whereis('fop') xep = whereis('xep') epydoc_cli = whereis('epydoc') +gs = whereis('gs') # # @@ -158,6 +159,8 @@ else: env.Execute(Mkdir(os.path.join(build_dir, *(dbpath + ['html'])))) env.Execute(Mkdir(os.path.join(build_dir, *(dbpath + ['fo'])))) env.Execute(Mkdir(os.path.join(build_dir, *(dbpath + ['manpages'])))) + env.Execute(Mkdir(os.path.join(build_dir, *(dbpath + ['epub'])))) + env.Execute(Mkdir(os.path.join(build_dir, *(dbpath + ['xhtml-1_1'])))) env.Execute(Copy(os.path.join(build_dir, *dbpath), os.path.join('..', *(dbpath + ['VERSION'])))) for g in glob.glob(os.path.join('..', *(dbpath + ['common', '*.*']))): @@ -170,6 +173,20 @@ else: env.Execute(Copy(os.path.join(build_dir, *(dbpath + ['fo'])), g)) for g in glob.glob(os.path.join('..', *(dbpath + ['manpages', '*.*']))): env.Execute(Copy(os.path.join(build_dir, *(dbpath + ['manpages'])), g)) + for g in glob.glob(os.path.join('..', *(dbpath + ['epub', '*.xsl']))): + env.Execute(Copy(os.path.join(build_dir, *(dbpath + ['epub'])), g)) + for g in glob.glob(os.path.join('..', *(dbpath + ['xhtml-1_1', '*.*']))): + env.Execute(Copy(os.path.join(build_dir, *(dbpath + ['xhtml-1_1'])), g)) + + # + # Copy additional Tools (gs, zip) + # + toolpath = ['src', 'engine', 'SCons', 'Tool'] + env.Execute(Copy(os.path.join(build_dir, *toolpath), + os.path.join('..', *(toolpath + ['gs.py'])))) + env.Execute(Copy(os.path.join(build_dir, *toolpath), + os.path.join('..', *(toolpath + ['zip.py'])))) + # # Each document will live in its own subdirectory. List them here @@ -182,8 +199,8 @@ else: #'python10' : ['chtml','html','pdf'], 'reference' : ['chtml','html','pdf'], #'developer' : ['chtml','html','pdf'], - 'user' : ['chtml','html','pdf'], - 'man' : ['man'] + 'user' : ['chtml','html','pdf','epub'], + 'man' : ['man','epub'] } # The names of the target files for the MAN pages man_page_list = ['scons.1','scons-time.1','sconsign.1'] @@ -247,6 +264,7 @@ else: htmlindex = os.path.join(htmldir, 'index.html') html = os.path.join(build, 'HTML', 'scons-%s.html' % doc) pdf = os.path.join(build, 'PDF', 'scons-%s.pdf' % doc) + epub = os.path.join(build, 'EPUB', 'scons-%s.epub' % doc) if 'chtml' in docs[doc]: env.Install(htmldir, Glob(os.path.join(build, doc,'scons-%s' % doc, '*.html'))) tar_deps.extend([htmlindex]) @@ -268,6 +286,14 @@ else: tar_deps.append(pdf) tar_list.append(pdf) + + if 'epub' in docs[doc] and gs: + env.InstallAs(epub, os.path.join(build, doc,'scons-%s.epub' % doc)) + Local(epub) + env.Ignore(epub, version_xml) + + tar_deps.append(epub) + tar_list.append(epub) if 'man' in docs[doc]: # diff --git a/doc/man/MANIFEST b/doc/man/MANIFEST index 7f0ad45..4b3ce9f 100644 --- a/doc/man/MANIFEST +++ b/doc/man/MANIFEST @@ -5,8 +5,9 @@ scons.xml sconsign.xml scons-time.xml *.xsl -scons.css +*.css SConstruct +cover.jpg titlepage/bricks.jpg titlepage/mapnik_final_colors.svg titlepage/SCons_path.svg diff --git a/doc/man/SConstruct b/doc/man/SConstruct index cd94021..cfdbb2d 100644 --- a/doc/man/SConstruct +++ b/doc/man/SConstruct @@ -27,7 +27,7 @@ import os env = Environment(ENV={'PATH' : os.environ['PATH']}, - tools=['docbook'], + tools=['docbook','gs','zip'], toolpath=['../../src/engine/SCons/Tool'], DOCBOOK_DEFAULT_XSL_HTML='html.xsl', DOCBOOK_DEFAULT_XSL_PDF='pdf.xsl') @@ -53,3 +53,23 @@ def createManPages(env, target): createManPages(env, "scons") createManPages(env, "sconsign") createManPages(env, "scons-time") + +has_gs = False +if env.WhereIs('gs'): + has_gs = True + +# +# Create the EPUB format +# +if has_gs and has_pdf: + metainf = env.Command('META-INF','',[Mkdir('META-INF'), Mkdir('OEBPS')]) + css = env.Command('OEBPS/epub.css','epub.css',[Copy('OEBPS/epub.css','epub.css')]) + env.Depends(css, metainf) + jpg = env.Gs('OEBPS/cover.jpg','scons-scons.pdf', + GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -dJPEGQ=100 -r72x72 -q') + env.Depends(jpg, metainf) + oebps = env.DocbookXslt('OEBPS/toc.ncx', 'scons_db.xml', xsl='epub.xsl') + env.Depends(oebps, jpg) + env.Zip('scons-man.epub', 'OEBPS', ZIPFLAGS='-Xr9D') + env.Clean(oebps, Glob('OEBPS/*.*')) + env.Clean(oebps, Glob('META-INF/*.*')) diff --git a/doc/man/cover.jpg b/doc/man/cover.jpg new file mode 100644 index 0000000..e2c2cb3 Binary files /dev/null and b/doc/man/cover.jpg differ diff --git a/doc/man/epub.css b/doc/man/epub.css new file mode 100644 index 0000000..31cebe5 --- /dev/null +++ b/doc/man/epub.css @@ -0,0 +1,33 @@ +/* This defines styles and classes used in the book */ +body { } +code { font-family: monospace; } +h1, h2, h3, h4, h5, h6 { text-align: center; margin-bottom:2em;} +h1.title { } +h2.author { } +p{ + padding:0; + margin:0; + text-indent:2em; +} +blockquote{ + margin-left:3em; + margin-right:3em; +} +.caption{ + text-align:center; + font-style:italic; + margin-bottom:1em; + margin-top:.2em; + font-size:.8em; +} +blockquote > p{ + text-indent:0; + margin-bottom:1em; +} +img{ + display:block; + margin-left: auto; + margin-right: auto; + text-align:center; + margin-top:1em; +} diff --git a/doc/man/epub.xsl b/doc/man/epub.xsl new file mode 100644 index 0000000..bc1d4b3 --- /dev/null +++ b/doc/man/epub.xsl @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/doc/man/html.xsl b/doc/man/html.xsl index 71a847a..864af88 100644 --- a/doc/man/html.xsl +++ b/doc/man/html.xsl @@ -51,5 +51,9 @@ reference title set toc,title + + + + diff --git a/doc/man/pdf.xsl b/doc/man/pdf.xsl index 652975f..f314103 100644 --- a/doc/man/pdf.xsl +++ b/doc/man/pdf.xsl @@ -67,5 +67,8 @@ set toc,title - + + + + diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 3f47b47..82c782d 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -60,6 +60,9 @@ version &buildversion; + + + SCons &buildversion; diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST index e5f8988..62da288 100644 --- a/doc/user/MANIFEST +++ b/doc/user/MANIFEST @@ -51,7 +51,7 @@ variants.xml variables.xml *.jpg *.xsl -scons.css +*.css SConstruct titlepage/bricks.jpg titlepage/mapnik_final_colors.svg diff --git a/doc/user/SConstruct b/doc/user/SConstruct index 002aea4..5d36a5e 100644 --- a/doc/user/SConstruct +++ b/doc/user/SConstruct @@ -27,7 +27,7 @@ import os env = Environment(ENV={'PATH' : os.environ['PATH']}, - tools=['docbook'], + tools=['docbook','gs','zip'], toolpath=['../../src/engine/SCons/Tool'], DOCBOOK_DEFAULT_XSL_HTML='html.xsl', DOCBOOK_DEFAULT_XSL_HTMLCHUNKED='chtml.xsl', @@ -51,3 +51,23 @@ env.DocbookHtml('index.html','scons_db.xml') env.DocbookHtmlChunked('index.html', 'scons_db.xml', base_dir='scons-user/') if has_pdf: env.DocbookPdf('scons-user.pdf','scons_db.xml') + +has_gs = False +if env.WhereIs('gs'): + has_gs = True + +# +# Create the EPUB format +# +if has_gs and has_pdf: + metainf = env.Command('META-INF','',[Mkdir('META-INF'), Mkdir('OEBPS')]) + css = env.Command('OEBPS/epub.css','epub.css',[Copy('OEBPS/epub.css','epub.css')]) + env.Depends(css, metainf) + jpg = env.Gs('OEBPS/cover.jpg','scons-user.pdf', + GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -dJPEGQ=100 -r72x72 -q') + env.Depends(jpg, metainf) + oebps = env.DocbookXslt('OEBPS/toc.ncx', 'scons_db.xml', xsl='epub.xsl') + env.Depends(oebps, jpg) + env.Zip('scons-user.epub', 'OEBPS', ZIPFLAGS='-Xr9D') + env.Clean(oebps, Glob('OEBPS/*.*')) + env.Clean(oebps, Glob('META-INF/*.*')) diff --git a/doc/user/chtml.xsl b/doc/user/chtml.xsl index fa01b46..e292c88 100644 --- a/doc/user/chtml.xsl +++ b/doc/user/chtml.xsl @@ -52,5 +52,9 @@ reference toc,title set toc,title + + + + diff --git a/doc/user/cover.jpg b/doc/user/cover.jpg new file mode 100644 index 0000000..e2c2cb3 Binary files /dev/null and b/doc/user/cover.jpg differ diff --git a/doc/user/epub.css b/doc/user/epub.css new file mode 100644 index 0000000..31cebe5 --- /dev/null +++ b/doc/user/epub.css @@ -0,0 +1,33 @@ +/* This defines styles and classes used in the book */ +body { } +code { font-family: monospace; } +h1, h2, h3, h4, h5, h6 { text-align: center; margin-bottom:2em;} +h1.title { } +h2.author { } +p{ + padding:0; + margin:0; + text-indent:2em; +} +blockquote{ + margin-left:3em; + margin-right:3em; +} +.caption{ + text-align:center; + font-style:italic; + margin-bottom:1em; + margin-top:.2em; + font-size:.8em; +} +blockquote > p{ + text-indent:0; + margin-bottom:1em; +} +img{ + display:block; + margin-left: auto; + margin-right: auto; + text-align:center; + margin-top:1em; +} diff --git a/doc/user/epub.xsl b/doc/user/epub.xsl new file mode 100644 index 0000000..6ff435c --- /dev/null +++ b/doc/user/epub.xsl @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/doc/user/html.xsl b/doc/user/html.xsl index 74ea529..c275c3d 100644 --- a/doc/user/html.xsl +++ b/doc/user/html.xsl @@ -51,5 +51,9 @@ reference toc,title set toc,title + + + + diff --git a/doc/user/main.xml b/doc/user/main.xml index cb516e1..60dd8c9 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -85,6 +85,7 @@ version &buildversion; + diff --git a/doc/user/pdf.xsl b/doc/user/pdf.xsl index 652975f..9c54592 100644 --- a/doc/user/pdf.xsl +++ b/doc/user/pdf.xsl @@ -67,5 +67,9 @@ set toc,title + + + + -- cgit v0.12