From 2eb20249319e551f41d4d721c831e3e64abaf72c Mon Sep 17 00:00:00 2001 From: Sengian Date: Tue, 10 Aug 2010 12:38:59 +0200 Subject: [PATCH] Merge from trunk --- resources/catalog/stylesheet.css | 142 +++---- resources/content_server/gui.css | 163 ++++---- resources/content_server/index.html | 103 ++--- resources/content_server/mobile.css | 91 ++--- resources/templates/html.css | 361 ++++++++--------- setup/installer/windows/en-us.xml | 19 +- setup/installer/windows/wix-template.xml | 267 ++++++------- src/calibre/ebooks/lrf/html/demo/demo.html | 440 +++++++++++++-------- src/calibre/manual/templates/layout.html | 24 +- src/calibre/manual/xpath.xhtml | 30 +- 10 files changed, 871 insertions(+), 769 deletions(-) diff --git a/resources/catalog/stylesheet.css b/resources/catalog/stylesheet.css index 4f9ca9ac41..ea01aeb43b 100644 --- a/resources/catalog/stylesheet.css +++ b/resources/catalog/stylesheet.css @@ -1,102 +1,104 @@ -body { background-color: white; } +body { + background-color: white; +} -p.title { - margin-top:0em; - margin-bottom:1em; - text-align:center; - font-style:italic; - font-size:xx-large; - border-bottom: solid black 4px; - } +p.title { + margin-top: 0em; + margin-bottom: 1em; + text-align: center; + font-style: italic; + font-size: xx-large; + border-bottom: solid black 4px; +} p.author { - margin-top:0em; - margin-bottom:0em; + margin-top: 0em; + margin-bottom: 0em; text-align: left; text-indent: 1em; - font-size:large; - } + font-size: large; +} p.tags { - margin-top:0em; - margin-bottom:0em; + margin-top: 0em; + margin-bottom: 0em; text-align: left; text-indent: 1em; - font-size:small; - } + font-size: small; +} p.description { - text-align:left; - font-style:normal; + text-align: left; + font-style: normal; margin-top: 0em; - } +} p.date_index { - font-size:x-large; - text-align:center; - font-weight:bold; - margin-top:1em; - margin-bottom:0px; - } + font-size: x-large; + text-align: center; + font-weight: bold; + margin-top: 1em; + margin-bottom: 0px; +} p.letter_index { - font-size:x-large; - text-align:center; - font-weight:bold; - margin-top:1em; - margin-bottom:0px; - } + font-size: x-large; + text-align: center; + font-weight: bold; + margin-top: 1em; + margin-bottom: 0px; +} p.author_index { - font-size:large; - text-align:left; - margin-top:0px; - margin-bottom:0px; + font-size: large; + text-align: left; + margin-top: 0px; + margin-bottom: 0px; text-indent: 0em; - } +} p.series { text-align: left; - margin-top:0px; - margin-bottom:0px; - margin-left:2em; - text-indent:-2em; - } + margin-top: 0px; + margin-bottom: 0px; + margin-left: 2em; + text-indent: -2em; +} p.read_book { - text-align:left; - margin-top:0px; - margin-bottom:0px; - margin-left:2em; - text-indent:-2em; - } + text-align: left; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 2em; + text-indent: -2em; +} p.unread_book { - text-align:left; - margin-top:0px; - margin-bottom:0px; - margin-left:2em; - text-indent:-2em; - } + text-align: left; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 2em; + text-indent: -2em; +} p.date_read { - text-align:left; - margin-top:0px; - margin-bottom:0px; - margin-left:6em; - text-indent:-6em; - } + text-align: left; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 6em; + text-indent: -6em; +} hr.series_divider { - width:50%; - margin-left:1em; - margin-top:0em; - margin-bottom:0em; - } + width: 50%; + margin-left: 1em; + margin-top: 0em; + margin-bottom: 0em; +} hr.annotations_divider { - width:50%; - margin-left:1em; - margin-top:0em; - margin-bottom:0em; - } + width: 50%; + margin-left: 1em; + margin-top: 0em; + margin-bottom: 0em; +} \ No newline at end of file diff --git a/resources/content_server/gui.css b/resources/content_server/gui.css index 1bcc4e1eb0..d7a3eda51e 100644 --- a/resources/content_server/gui.css +++ b/resources/content_server/gui.css @@ -1,142 +1,157 @@ body { - background-color: white; + background-color: white; } #banner { - position: absolute; - left: 5px; top: 0px; + position: absolute; + left: 5px; + top: 0px; } /* Search bar */ #search_box { - width: 201px; - height: 31px; - background: url(bg_search_box.png); - top: 5px; right: 20px; - position: absolute; + width: 201px; + height: 31px; + background: url(bg_search_box.png); + top: 5px; + right: 20px; + position: absolute; } + #search_box #s { - float: left; - padding: 0; - margin: 6px 0 0 6px; - border-width: 0px; - font-size: 16px; - width: 159px; - background: transparent; + float: left; + padding: 0; + margin: 6px 0 0 6px; + border-width: 0px; + font-size: 16px; + width: 159px; + background: transparent; } + #search_box #go { - float: right; - margin: 3px 4px 0 0; + float: right; + margin: 3px 4px 0 0; } /* Count bar */ #count_bar { - position: absolute; - right: 30px; - top: 80px; - font-size:smaller; - padding-bottom: 5px; + position: absolute; + right: 30px; + top: 80px; + font-size: smaller; + padding-bottom: 5px; } #count_bar * img { - cursor: pointer; + cursor: pointer; } -#count { cursor: default;} +#count { + cursor: default; +} /* Styles for the book list */ #main { - width:95%; - overflow: auto; - border: solid thin black; - position: absolute; - top: 115px; left: 10px; - z-index: 1; + width: 95%; + overflow: auto; + border: solid thin black; + position: absolute; + top: 115px; + left: 10px; + z-index: 1; } table#book_list thead tr td { - width: 100%; - padding-right: 1em; padding-left: 1em; - text-align: center; - font-weight: bold; - font-size: 130%; - border-bottom: thick solid black; - border-top: thick solid black; - cursor: pointer; - font-family: serif; - padding-top: 0.5ex; padding-bottom: 0.5ex; + width: 100%; + padding-right: 1em; + padding-left: 1em; + text-align: center; + font-weight: bold; + font-size: 130%; + border-bottom: thick solid black; + border-top: thick solid black; + cursor: pointer; + font-family: serif; + padding-top: 0.5ex; + padding-bottom: 0.5ex; } table#book_list tbody tr td { - padding-right: 1em; padding-left: 1em; - /*border-bottom: thin solid black;*/ - padding-bottom: 0.7ex; padding-top: 0.7ex; - margin: 0pt; - cursor: pointer; - + padding-right: 1em; + padding-left: 1em; + /*border-bottom: thin solid black;*/ + padding-bottom: 0.7ex; + padding-top: 0.7ex; + margin: 0pt; + cursor: pointer; } table#book_list * .sort_indicator { - visibility:hidden; - color: #9f9f9f; + visibility: hidden; + color: #9f9f9f; } table#book_list * .rating { - color: #3fbbe4; + color: #3fbbe4; } table#book_list * span.subtitle { - font-size: smaller; + font-size: smaller; } table#book_list * a.format { - text-decoration: none; - color: blue; - font-family: monospace; + text-decoration: none; + color: blue; + font-family: monospace; } table#book_list * a.format:hover { - color: red; + color: red; } table#book_list * a.format:visited { - color: blue; + color: blue; } table#book_list * .comments { - font-size: smaller; - display: none; + font-size: smaller; + display: none; } + /* Loading message */ #loading { - top: 10px; left: 10px; - position: absolute; - font-size: 160%; font-family: monospace; - text-align: center; - visibility: hidden; - z-index: 10000; - background-color: #aaaaaa; - opacity: 0.8; - + top: 10px; + left: 10px; + position: absolute; + font-size: 160%; + font-family: monospace; + text-align: center; + visibility: hidden; + z-index: 10000; + background-color: #aaaaaa; + opacity: 0.8; } #loading div { - top: 50%; position: relative; + top: 50%; + position: relative; } #cover_pane { - overflow: auto; - position: absolute; - visibility: hidden; - text-align: right; - z-index: 2; - margin: 0pt; padding: 0pt; border-width: 0pt; -} + overflow: auto; + position: absolute; + visibility: hidden; + text-align: right; + z-index: 2; + margin: 0pt; + padding: 0pt; + border-width: 0pt; +} \ No newline at end of file diff --git a/resources/content_server/index.html b/resources/content_server/index.html index f9f0aff491..ff11acc719 100644 --- a/resources/content_server/index.html +++ b/resources/content_server/index.html @@ -1,49 +1,60 @@ - - - calibre library - - - - - - - - - - - -
- Show first set of books Show previous set of books              Show next set of books Show last set of books -
- -
- - - - - - - -
-
- -
-
- Loading... Loading… -
-
- -
- -
- + + +calibre library + + + + + + + + + + + +
Show first set of books Show previous set of books              Show next set of books Show last set of books
+ +
+ + + + + + + +
+
+ +
+
Loading... Loading… +
+
+ +
+ diff --git a/resources/content_server/mobile.css b/resources/content_server/mobile.css index 9be755b954..e3a4b58422 100644 --- a/resources/content_server/mobile.css +++ b/resources/content_server/mobile.css @@ -1,83 +1,78 @@ /* CSS for the mobile version of the content server webpage */ - .navigation table.buttons { - width: 100%; + width: 100%; } .navigation .button { - width: 50%; + width: 50%; } -.button a, .button:visited a { - padding: 0.5em; - font-size: 1.25em; - border: 1px solid black; - text-color: black; - background-color: #ddd; - border-top: 1px solid ThreeDLightShadow; - border-right: 1px solid ButtonShadow; - border-bottom: 1px solid ButtonShadow; - border-left: 1 px solid ThreeDLightShadow; - -moz-border-radius: 0.25em; - -webkit-border-radius: 0.25em; +.button a,.button:visited a { + padding: 0.5em; + font-size: 1.25em; + border: 1px solid black; + text-color: black; + background-color: #ddd; + border-top: 1px solid ThreeDLightShadow; + border-right: 1px solid ButtonShadow; + border-bottom: 1px solid ButtonShadow; + border-left: 1 px solid ThreeDLightShadow; + -moz-border-radius: 0.25em; + -webkit-border-radius: 0.25em; } .button:hover a { - border-top: 1px solid #666; - border-right: 1px solid #CCC; - border-bottom: 1 px solid #CCC; - border-left: 1 px solid #666; - - + border-top: 1px solid #666; + border-right: 1px solid #CCC; + border-bottom: 1 px solid #CCC; + border-left: 1 px solid #666; } div.navigation { - padding-bottom: 1em; - clear: both; + padding-bottom: 1em; + clear: both; } #search_box { - border: 1px solid #393; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - padding: 1em; - margin-bottom: 0.5em; - float: right; + border: 1px solid #393; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + padding: 1em; + margin-bottom: 0.5em; + float: right; } #listing { - width: 100%; - border-collapse: collapse; + width: 100%; + border-collapse: collapse; } + #listing td { - padding: 0.25em; + padding: 0.25em; } #listing td.thumbnail { - height: 60px; - width: 60px; + height: 60px; + width: 60px; } #listing tr:nth-child(even) { - - background: #eee; + background: #eee; } -#listing .button a{ - display: inline-block; - width: 2.5em; - padding-left: 0em; - padding-right: 0em; - overflow: hidden; - text-align: center; +#listing .button a { + display: inline-block; + width: 2.5em; + padding-left: 0em; + padding-right: 0em; + overflow: hidden; + text-align: center; } #logo { - float: left; + float: left; } #spacer { - clear: both; -} - - + clear: both; +} \ No newline at end of file diff --git a/resources/templates/html.css b/resources/templates/html.css index e9b683ca34..448ec596b9 100644 --- a/resources/templates/html.css +++ b/resources/templates/html.css @@ -34,380 +34,367 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ +@ +namespace url (http: //www.w3.org /1999/xhtml); + @namespace svg url (http: //www.w3.org /2000/svg); + /* blocks */ -@namespace url(http://www.w3.org/1999/xhtml); -@namespace svg url(http://www.w3.org/2000/svg); - -/* blocks */ - -html, div, map, dt, isindex, form { - display: block; +html,div,map,dt,isindex,form { + display: block; } body { - display: block; + display: block; } -p, dl, multicol { - display: block; - margin: 1em 0; +p,dl,multicol { + display: block; + margin: 1em 0; } dd { - display: block; - margin-left: 40px; + display: block; + margin-left: 40px; } blockquote { - display: block; - margin: 1em; + display: block; + margin: 1em; } address { - display: block; - font-style: italic; + display: block; + font-style: italic; } center { - display: block; - text-align: center; + display: block; + text-align: center; } blockquote[type=cite] { - display: block; - margin: 1em 0em; - border-color: blue; - border-width: thin; + display: block; + margin: 1em 0em; + border-color: blue; + border-width: thin; } span[_moz_quote=true] { - color: blue; + color: blue; } pre[_moz_quote=true] { - color: blue; + color: blue; } h1 { - display: block; - font-size: 2em; - font-weight: bold; - margin: .67em 0; + display: block; + font-size: 2em; + font-weight: bold; + margin: .67em 0; } h2 { - display: block; - font-size: 1.5em; - font-weight: bold; - margin: .83em 0; + display: block; + font-size: 1.5em; + font-weight: bold; + margin: .83em 0; } h3 { - display: block; - font-size: 1.17em; - font-weight: bold; - margin: 1em 0; + display: block; + font-size: 1.17em; + font-weight: bold; + margin: 1em 0; } h4 { - display: block; - font-weight: bold; - margin: 1.33em 0; + display: block; + font-weight: bold; + margin: 1.33em 0; } h5 { - display: block; - font-size: 0.83em; - font-weight: bold; - margin: 1.67em 0; + display: block; + font-size: 0.83em; + font-weight: bold; + margin: 1.67em 0; } h6 { - display: block; - font-size: 0.67em; - font-weight: bold; - margin: 2.33em 0; + display: block; + font-size: 0.67em; + font-weight: bold; + margin: 2.33em 0; } listing { - display: block; - font-family: monospace; - font-size: medium; - white-space: pre; - margin: 1em 0; + display: block; + font-family: monospace; + font-size: medium; + white-space: pre; + margin: 1em 0; } -xmp, pre, plaintext { - display: block; - font-family: monospace; - white-space: pre; - margin: 1em 0; +xmp,pre,plaintext { + display: block; + font-family: monospace; + white-space: pre; + margin: 1em 0; } /* tables */ - table { - display: table; - border-spacing: 2px; - border-collapse: separate; - margin-top: 0; - margin-bottom: 0; - text-indent: 0; + display: table; + border-spacing: 2px; + border-collapse: separate; + margin-top: 0; + margin-bottom: 0; + text-indent: 0; } table[align="left"] { - float: left; + float: left; } table[align="right"] { - float: right; + float: right; } -table[rules]:not([rules="none"]) { - border-collapse: collapse; +table[rules]:not ([rules="none"] ) { + border-collapse: collapse; } - -/* caption inherits from table not table-outer */ + +/* caption inherits from table not table-outer */ caption { - display: table-caption; - text-align: center; + display: table-caption; + text-align: center; } -table[align="center"] > caption { - margin-left: auto; - margin-right: auto; +table[align="center"]>caption { + margin-left: auto; + margin-right: auto; } -table[align="center"] > caption[align="left"] { - margin-right: 0; +table[align="center"]>caption[align="left"] { + margin-right: 0; } -table[align="center"] > caption[align="right"] { - margin-left: 0; +table[align="center"]>caption[align="right"] { + margin-left: 0; } tr { - display: table-row; - vertical-align: inherit; + display: table-row; + vertical-align: inherit; } col { - display: table-column; + display: table-column; } colgroup { - display: table-column-group; + display: table-column-group; } tbody { - display: table-row-group; - vertical-align: middle; + display: table-row-group; + vertical-align: middle; } thead { - display: table-header-group; - vertical-align: middle; + display: table-header-group; + vertical-align: middle; } tfoot { - display: table-footer-group; - vertical-align: middle; + display: table-footer-group; + vertical-align: middle; } /* for XHTML tables without tbody */ -table > tr { - vertical-align: middle; +table>tr { + vertical-align: middle; } -td { - display: table-cell; - vertical-align: inherit; - text-align: inherit; - padding: 1px; +td { + display: table-cell; + vertical-align: inherit; + text-align: inherit; + padding: 1px; } th { - display: table-cell; - vertical-align: inherit; - font-weight: bold; - padding: 1px; + display: table-cell; + vertical-align: inherit; + font-weight: bold; + padding: 1px; } /* inlines */ - -b, strong { - font-weight: bolder; +b,strong { + font-weight: bolder; } -i, cite, em, var, dfn { - font-style: italic; +i,cite,em,var,dfn { + font-style: italic; } -tt, code, kbd, samp { - font-family: monospace; +tt,code,kbd,samp { + font-family: monospace; } -u, ins { - text-decoration: underline; +u,ins { + text-decoration: underline; } -s, strike, del { - text-decoration: line-through; +s,strike,del { + text-decoration: line-through; } blink { - text-decoration: blink; + text-decoration: blink; } big { - font-size: larger; + font-size: larger; } small { - font-size: smaller; + font-size: smaller; } sub { - vertical-align: sub; - font-size: smaller; - line-height: normal; + vertical-align: sub; + font-size: smaller; + line-height: normal; } sup { - vertical-align: super; - font-size: smaller; - line-height: normal; + vertical-align: super; + font-size: smaller; + line-height: normal; } nobr { - white-space: nowrap; + white-space: nowrap; } /* titles */ -abbr[title], acronym[title] { - border-bottom: dotted 1px; +abbr[title],acronym[title] { + border-bottom: dotted 1px; } /* lists */ - -ul, menu, dir { - display: block; - list-style-type: disc; - margin: 1em 0; +ul,menu,dir { + display: block; + list-style-type: disc; + margin: 1em 0; } ol { - display: block; - list-style-type: decimal; - margin: 1em 0; + display: block; + list-style-type: decimal; + margin: 1em 0; } li { - display: list-item; + display: list-item; } /* nested lists have no top/bottom margins */ -ul ul, ul ol, ul dir, ul menu, ul dl, -ol ul, ol ol, ol dir, ol menu, ol dl, -dir ul, dir ol, dir dir, dir menu, dir dl, -menu ul, menu ol, menu dir, menu menu, menu dl, -dl ul, dl ol, dl dir, dl menu, dl dl { - margin-top: 0; - margin-bottom: 0; +ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl + { + margin-top: 0; + margin-bottom: 0; } /* 2 deep unordered lists use a circle */ -ol ul, ul ul, menu ul, dir ul, -ol menu, ul menu, menu menu, dir menu, -ol dir, ul dir, menu dir, dir dir { - list-style-type: circle; +ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir + { + list-style-type: circle; } /* 3 deep (or more) unordered lists use a square */ -ol ol ul, ol ul ul, ol menu ul, ol dir ul, -ol ol menu, ol ul menu, ol menu menu, ol dir menu, -ol ol dir, ol ul dir, ol menu dir, ol dir dir, -ul ol ul, ul ul ul, ul menu ul, ul dir ul, -ul ol menu, ul ul menu, ul menu menu, ul dir menu, -ul ol dir, ul ul dir, ul menu dir, ul dir dir, -menu ol ul, menu ul ul, menu menu ul, menu dir ul, -menu ol menu, menu ul menu, menu menu menu, menu dir menu, -menu ol dir, menu ul dir, menu menu dir, menu dir dir, -dir ol ul, dir ul ul, dir menu ul, dir dir ul, -dir ol menu, dir ul menu, dir menu menu, dir dir menu, -dir ol dir, dir ul dir, dir menu dir, dir dir dir { - list-style-type: square; +ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir + { + list-style-type: square; } - /* leafs */ - -/*
noshade and color attributes are handled completely by + /*
noshade and color attributes are handled completely by * the nsHTMLHRElement attribute mapping code */ hr { - display: block; - height: 2px; - border: 1px inset; - margin: 0.5em auto 0.5em auto; - color: gray; + display: block; + height: 2px; + border: 1px inset; + margin: 0.5em auto 0.5em auto; + color: gray; } hr[size="1"] { - border-style: solid none none none; + border-style: solid none none none; } -img[usemap], object[usemap] { - color: blue; +img[usemap],object[usemap] { + color: blue; } frameset { - display: block ! important; - position: static ! important; - float: none ! important; - border: none ! important; + display: block ! important; + position: static ! important; + float: none ! important; + border: none ! important; } frame { - border: none ! important; + border: none ! important; } iframe { - border: 2px inset; + border: 2px inset; } noframes { - display: none; + display: none; } spacer { - position: static ! important; - float: none ! important; + position: static ! important; + float: none ! important; } /* hidden elements */ -area, base, basefont, head, meta, script, style, title, -noembed, param, link { - display: none; +area,base,basefont,head,meta,script,style,title,noembed,param,link { + display: none; } /* Page breaks at body tags, to help out with LIT-generation */ body { - page-break-before: always; + page-break-before: always; } /* Explicit line-breaks are blocks, sure... */ br { - display: block; + display: block; } /* Images, embedded object, and SVG size defaults */ -img, object, svg|svg { - width: auto; - height: auto; +img,object,svg |svg { + width: auto; + height: auto; } /* These are needed because ADE renders anchors the same as links */ +a { + text-decoration: inherit; + color: inherit; + cursor: inherit +} -a { text-decoration: inherit; color: inherit; cursor: inherit } -a[href] { text-decoration: underline; color: blue; cursor: pointer } +a[href] { + text-decoration: underline; + color: blue; + cursor: pointer +} \ No newline at end of file diff --git a/setup/installer/windows/en-us.xml b/setup/installer/windows/en-us.xml index 89cc25f0a2..ed181c524b 100644 --- a/setup/installer/windows/en-us.xml +++ b/setup/installer/windows/en-us.xml @@ -1,9 +1,16 @@ - - If you are upgrading from a {app} version older than 0.6.17, please uninstall {app} first. Click Advanced to change installation settings. - Computing space requirements, this may take upto five minutes... - Computing space requirements, this may take upto five minutes... - Computing space requirements, this may take upto five minutes... - Please wait while the installer finishes determining your disk space requirements, this may take upto five minutes... + + If you are upgrading from a {app} version older than + 0.6.17, please uninstall {app} first. Click Advanced to change + installation settings. + Computing space requirements, this may take upto five + minutes... + Computing space requirements, this may take upto five + minutes... + Computing space requirements, this may take upto five + minutes... + Please wait while the installer finishes determining + your disk space requirements, this may take upto five minutes... diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml index 37dd8b25a8..1300eba956 100644 --- a/setup/installer/windows/wix-template.xml +++ b/setup/installer/windows/wix-template.xml @@ -1,164 +1,157 @@ - + - - - + - - - - - - - + - - - - - - - - - - + - - {app_components} - - - - - + + + + + - - - - - - - + + + + + + + + + + - - - - + + {app_components} + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + - - - + + - - - + + + - - - + + + - - - - + + + - - - + + + + - + + + + + = 501)]]> - - - NEWPRODUCTFOUND - - - - NEWPRODUCTFOUND - + + + NEWPRODUCTFOUND + + + + NEWPRODUCTFOUND + - - - WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed + + + WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - + - - - - + + + + - - - - - + + + + + - - - + + + - + diff --git a/src/calibre/ebooks/lrf/html/demo/demo.html b/src/calibre/ebooks/lrf/html/demo/demo.html index 7d2f783ccc..37bed69b88 100644 --- a/src/calibre/ebooks/lrf/html/demo/demo.html +++ b/src/calibre/ebooks/lrf/html/demo/demo.html @@ -1,187 +1,279 @@ -

Demo of html2lrf

-

- This document contains a demonstration of the capabilities of html2lrf, the HTML to LRF converter from calibre. To obtain calibre visit
http://calibre-ebook.com -

-
-

Table of Contents

- +

Demo of html2lrf

+

This document contains a demonstration of the capabilities of html2lrf, the HTML to LRF +converter from calibre. To obtain calibre visit
+http://calibre-ebook.com

+
+

Table of Contents

+ -

Lists

- -

Nested lists

-
    -
  1. Item 1
    2. -
      -
    • Sub item 1
      • -
    • Sub item 2
      • -
        -
      1. Sub sub item 1. This is a multiline item with almost correct blocking.
        2. -
      2. Sub sub item 2
        3. -
      -
    -
  2. Item 2
    3. -
-

-

Definition Lists

-
-
Term 1
-
Definition of Term 1. A multi line definition showing correct blocking.
-
Term 2
-
Definition of Term 2
-
-

-

- Table of Contents -

+

Lists

-

Tables

- - - - - - -

A matrix

Column 1Column 2Column 3
Row 1

(1, 1)

Row 2

(2, 2)

Row 3

(3, 3)

-
-

- html2lrf supports both rowspan and colspan, but no other HTML table attributes, as it uses its own algorithm to determine optimal placement of cells. -

-

- Note that if you have custom fonts on your reader, the table may not be properly aligned. Also html2lrf does not support nested tables. -

-

- On the next page you'll see a real life example taken from a Project Gutenberg text with no modifications. It shows off html2lrf's handling of rowspan and colspan. -

-

Sample Complex Table of Contents

- - - - - - - - - - - - - - -
 PAGE
Prefacev
List of Works of Referencevii
List of Illustrationsxi
ChapterI.History of the Foundation3
II.Exterior of the Church25
III.Interior of the Church33
IV.St. Bartholomew-the-Less and the Hospital63
AppendixI.The Priory Seals73
II.The Priors and Rectors77
III.Inventory of Vestments, etc.79
IV.The Organ80
Index83
- -

-

- Table of Contents -

- -

Text formatting

-

- A simple paragraph of formatted - text, with a ruled line following it. - Superscripts and Subscripts. -

-
-
-

A - similar - paragraph, but now using - CSS - to perform the text formatting.

-
-
A centered phrase
- A right aligned phrase - A normal phrase -
-

A paragraph containing a <blockquote> -

This is blockquoted text. It is rendered in a separate block with margins.
The above text should be distinct from the rest of the paragraph. -

-
-

A very indented paragraph

-

An unindented paragraph

-

A default indented paragraph

-

-

- Table of Contents -

- - -

Inline images

-

- Here I demonstrate the use of inline images in the midst of text. Here is a small image embedded in a sentence. Now we have a slightly larger image that is automatically put in its own block and finally we have a large image which is put on a page by itself. Try changing sizes from S to M to L and see how the images behave. -

+

Nested lists

+
    +
  1. Item 1
    2. +
      +
    • Sub item 1
      • +
    • Sub item 2
      • +
        +
      1. Sub sub item 1. This is a multiline item with almost + correct blocking.
        2. +
      2. Sub sub item 2
        3. +
      +
    +
  2. Item 2
    3. +
+

+

Definition Lists

+
+
Term 1
+
Definition of Term 1. A multi line definition showing correct + blocking.
+
Term 2
+
Definition of Term 2
+

-

- Table of Contents -

+
+Table of Contents

-

Embedded fonts

-

This LRF file has been prepared by embedding Times New Roman and Andale Mono - as the default serif and monospace fonts. This allows it to correctly display - non English characters such as:

-
    -
  • mouse in German: mūs
    • -
  • mouse in Russian: мышь
    • -
-

- Note that embedding fonts in LRF files slows down page turns slightly. -
-

- -

-

- Table of Contents -

- -

Paragraph Emphasis

-
-

beautiful image based dropcaps to emphasize this - paragraph. Image based dropcaps are specified by adding the class = 'libprs500_dropcaps' - attribute to an <img> tag.

-
- -

This is a plain text based dropcaps. It - is not nearly as dramatic, but easier to code ;-) -

-
- -

This is an Example of small-caps. - It can also be used to highlight the start of a paragraph very effectively. -

-
-

A paragraph with a hanging indent. This is especially - useful for highly structured text like verse, or dialogue.

-

-

- Table of Contents -

+

Tables

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+

A matrix

+
Column 1Column 2Column 3
Row 1 +

(1, 1)

+
Row 2 +

(2, 2)

+
Row 3 +

(3, 3)

+
+
+

html2lrf supports both rowspan and colspan, but no other HTML +table attributes, as it uses its own algorithm to determine optimal +placement of cells.

+

Note that if you have custom fonts on your reader, the table may +not be properly aligned. Also html2lrf does not support nested tables.

+

On the next page you'll see a +real life example taken from a Project Gutenberg text with no +modifications. It shows off html2lrf's handling of rowspan and colspan. +

+

Sample Complex Table of Contents

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PAGE
Prefacev
List of Works of Referencevii
List of Illustrationsxi
ChapterI.History of the Foundation3
II.Exterior of the Church25
III.Interior of the Church33
IV.St. Bartholomew-the-Less and the Hospital63
AppendixI.The Priory Seals73
II.The Priors and Rectors77
III.Inventory of Vestments, etc.79
IV.The Organ80
Index83
-

Recursive link following

-

- html2lrf follows links in HTML files that point to other files, recursively. Thus it can be used to convert a whole tree of HTML files into a single LRF file. -
-

-

- Table of Contents -

+
+Table of Contents

+

Text formatting

+

A simple paragraph of formatted text, with a +ruled line following it. Superscripts and Subscripts. +

+
+
+

A similar paragraph, but +now using CSS to perform the text +formatting.

+
+
A centered phrase
+A right aligned phrase +A normal phrase +
+

A paragraph containing a <blockquote> +

This is blockquoted text. It is rendered in a +separate block with margins.
+The above text should be distinct from the rest of the paragraph.

+
+

A very indented paragraph

+

An unindented paragraph

+

A default indented paragraph

+

+

+Table of Contents

+ + +

Inline images

+

Here I demonstrate the use of inline images in the midst of text. +Here is a small image embedded in a sentence. +Now we have a slightly larger image that is automatically put in its own +block and finally +we have a large image which is put on a page by itself. Try changing +sizes from S to M to L and see how the images behave.

+

+

+Table of Contents

+ +

Embedded fonts

+

This LRF file has been prepared by embedding Times New Roman and +Andale Mono as the default serif and monospace fonts. This allows it to +correctly display non English characters such as:

+
    +
  • mouse in German: mūs
    • +
  • mouse in Russian: мышь
    • +
+

Note that embedding fonts in LRF files slows down page turns +slightly.
+

+ +

+

+Table of Contents

+ +

Paragraph Emphasis

+
+

beautiful image +based dropcaps to emphasize this paragraph. Image based dropcaps are +specified by adding the class = 'libprs500_dropcaps' +attribute to an <img> tag. +


+ +

This is a plain text based dropcaps. It is not +nearly as dramatic, but easier to code ;-)

+
+ +

This is an Example +of small-caps. It can also be used to highlight the start of a paragraph +very effectively.

+
+

A paragraph with a hanging indent. This is +especially useful for highly structured text like verse, or dialogue.
+

+

+

+Table of Contents

+ +

Recursive link following

+

html2lrf follows links in +HTML files that point to other files, recursively. Thus it can be used +to convert a whole tree of HTML files into a single LRF file.
+

+

+

+Table of Contents

diff --git a/src/calibre/manual/templates/layout.html b/src/calibre/manual/templates/layout.html index c5a857650f..8ec8c949e8 100644 --- a/src/calibre/manual/templates/layout.html +++ b/src/calibre/manual/templates/layout.html @@ -1,14 +1,14 @@ -{% extends "!layout.html" %} -{% block sidebarlogo %} - -
- - - - -
-
+{% extends "!layout.html" %} {% block sidebarlogo %} + +
+ +
+
{% endblock %} diff --git a/src/calibre/manual/xpath.xhtml b/src/calibre/manual/xpath.xhtml index 7468e3d856..3a78863236 100644 --- a/src/calibre/manual/xpath.xhtml +++ b/src/calibre/manual/xpath.xhtml @@ -1,19 +1,19 @@ - - A very short ebook - - - -

A very short ebook

-

Written by Kovid Goyal

-
-

A very short ebook to demonstrate the use of XPath.

-
+ +A very short ebook + + + +

A very short ebook

+

Written by Kovid Goyal

+
+

A very short ebook to demonstrate the use of XPath.

+
-

Chapter One

-

This is a truly fascinating chapter.

+

Chapter One

+

This is a truly fascinating chapter.

-

Chapter Two

-

A worthy continuation of a fine tradition.

- +

Chapter Two

+

A worthy continuation of a fine tradition.

+