Merge from trunk

This commit is contained in:
Sengian 2010-08-10 12:38:59 +02:00
parent 1f576fea11
commit 2eb2024931
10 changed files with 871 additions and 769 deletions

View File

@ -1,4 +1,6 @@
body { background-color: white; }
body {
background-color: white;
}
p.title {
margin-top: 0em;

View File

@ -4,7 +4,8 @@ body {
#banner {
position: absolute;
left: 5px; top: 0px;
left: 5px;
top: 0px;
}
/*
@ -14,9 +15,11 @@ Search bar
width: 201px;
height: 31px;
background: url(bg_search_box.png);
top: 5px; right: 20px;
top: 5px;
right: 20px;
position: absolute;
}
#search_box #s {
float: left;
padding: 0;
@ -26,6 +29,7 @@ Search bar
width: 159px;
background: transparent;
}
#search_box #go {
float: right;
margin: 3px 4px 0 0;
@ -46,7 +50,9 @@ Count bar
cursor: pointer;
}
#count { cursor: default;}
#count {
cursor: default;
}
/*
Styles for the book list
@ -56,13 +62,15 @@ Styles for the book list
overflow: auto;
border: solid thin black;
position: absolute;
top: 115px; left: 10px;
top: 115px;
left: 10px;
z-index: 1;
}
table#book_list thead tr td {
width: 100%;
padding-right: 1em; padding-left: 1em;
padding-right: 1em;
padding-left: 1em;
text-align: center;
font-weight: bold;
font-size: 130%;
@ -70,16 +78,18 @@ table#book_list thead tr td {
border-top: thick solid black;
cursor: pointer;
font-family: serif;
padding-top: 0.5ex; padding-bottom: 0.5ex;
padding-top: 0.5ex;
padding-bottom: 0.5ex;
}
table#book_list tbody tr td {
padding-right: 1em; padding-left: 1em;
padding-right: 1em;
padding-left: 1em;
/*border-bottom: thin solid black;*/
padding-bottom: 0.7ex; padding-top: 0.7ex;
padding-bottom: 0.7ex;
padding-top: 0.7ex;
margin: 0pt;
cursor: pointer;
}
table#book_list * .sort_indicator {
@ -113,23 +123,26 @@ table#book_list * .comments {
font-size: smaller;
display: none;
}
/*
Loading message
*/
#loading {
top: 10px; left: 10px;
top: 10px;
left: 10px;
position: absolute;
font-size: 160%; font-family: monospace;
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 {
@ -138,5 +151,7 @@ Loading message
visibility: hidden;
text-align: right;
z-index: 2;
margin: 0pt; padding: 0pt; border-width: 0pt;
margin: 0pt;
padding: 0pt;
border-width: 0pt;
}

View File

@ -1,32 +1,45 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML 1.1" xml:lang="en">
<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML 1.1"
xml:lang="en">
<head>
<title>calibre library</title>
<link rel="stylesheet" type="text/css" href="/static/gui.css" charset="utf-8" />
<link rel="stylesheet" type="text/css" href="/static/gui.css"
charset="utf-8" />
<script type="text/javascript" src="/static/date.js" charset="utf-8"></script>
<script type="text/javascript" src="/static/jquery.js" charset="utf-8"></script>
<script type="text/javascript" src="/static/gui.js" charset="utf-8"></script>
<link rel="icon" href="http://calibre-ebook.com/favicon.ico" type="image/x-icon" />
<link rel="icon" href="http://calibre-ebook.com/favicon.ico"
type="image/x-icon" />
</head>
<body>
<div id="banner">
<a style="border: 0pt" href="http://calibre-ebook.com" alt="calibre" title="calibre"><img style="border:0pt" src="/static/calibre_banner.png" alt="calibre" /></a>
<div id="banner"><a style="border: 0pt"
href="http://calibre-ebook.com" alt="calibre" title="calibre"><img
style="border: 0pt" src="/static/calibre_banner.png" alt="calibre" /></a>
</div>
<div id="search_box">
<form name="search_form" onsubmit="search();return false;" action="./" method="get">
<form name="search_form" onsubmit="search();return false;" action="./"
method="get">
<input value="" id="s" type="text" />
<input type="image" src="/static/btn_search_box.png" width="27" height="24" id="go" alt="Search" title="Search" />
<input type="image" src="/static/btn_search_box.png" width="27"
height="24" id="go" alt="Search" title="Search" />
</form>
</div>
<div id="count_bar">
<span id="left"><img src="/static/first.png" alt="Show first set of books" title="Show first set of books"/>&nbsp;<img src="/static/previous.png" alt="Show previous set of books" title="Show previous set of books"/>&nbsp;</span><span id="count">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<span id="right"><img src="/static/next.png" alt="Show next set of books" title="Show next set of books"/>&nbsp;<img src="/static/last.png" alt="Show last set of books" title="Show last set of books" /></span>
</div>
<div id="count_bar"><span id="left"><img
src="/static/first.png" alt="Show first set of books"
title="Show first set of books" />&nbsp;<img src="/static/previous.png"
alt="Show previous set of books" title="Show previous set of books" />&nbsp;</span><span
id="count">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<span
id="right"><img src="/static/next.png"
alt="Show next set of books" title="Show next set of books" />&nbsp;<img
src="/static/last.png" alt="Show last set of books"
title="Show last set of books" /></span></div>
<div id="main">
<table id="book_list" summary="Book list" cellspacing="0" cellpadding="0">
<table id="book_list" summary="Book list" cellspacing="0"
cellpadding="0">
<thead>
<tr></tr>
</thead>
@ -37,13 +50,11 @@
</div>
<div id="loading">
<div>
<img align="top" src="/static/loading.gif" alt="Loading..." title="Loading..."/>&nbsp;<span id="loading_msg">Loading&hellip;</span>
<div><img align="top" src="/static/loading.gif" alt="Loading..."
title="Loading..." />&nbsp;<span id="loading_msg">Loading&hellip;</span>
</div>
</div>
<div id="cover_pane">
<img title="Cover" src="" />
</div>
<div id="cover_pane"><img title="Cover" src="" /></div>
</body>
</html>

View File

@ -1,5 +1,4 @@
/* CSS for the mobile version of the content server webpage */
.navigation table.buttons {
width: 100%;
}
@ -27,8 +26,6 @@
border-right: 1px solid #CCC;
border-bottom: 1 px solid #CCC;
border-left: 1 px solid #666;
}
div.navigation {
@ -49,6 +46,7 @@ div.navigation {
width: 100%;
border-collapse: collapse;
}
#listing td {
padding: 0.25em;
}
@ -59,7 +57,6 @@ div.navigation {
}
#listing tr:nth-child(even) {
background: #eee;
}
@ -79,5 +76,3 @@ div.navigation {
#spacer {
clear: both;
}

View File

@ -34,10 +34,9 @@
* 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 url (http: //www.w3.org /1999/xhtml);
@namespace svg url (http: //www.w3.org /2000/svg);
/* blocks */
html,div,map,dt,isindex,form {
@ -145,7 +144,6 @@ xmp, pre, plaintext {
}
/* tables */
table {
display: table;
border-spacing: 2px;
@ -234,7 +232,6 @@ th {
}
/* inlines */
b,strong {
font-weight: bolder;
}
@ -289,7 +286,6 @@ abbr[title], acronym[title] {
}
/* lists */
ul,menu,dir {
display: block;
list-style-type: disc;
@ -307,41 +303,25 @@ li {
}
/* 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 {
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 {
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 {
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 */
/* <hr> noshade and color attributes are handled completely by
* the nsHTMLHRElement attribute mapping code
*/
@ -386,8 +366,7 @@ spacer {
}
/* hidden elements */
area, base, basefont, head, meta, script, style, title,
noembed, param, link {
area,base,basefont,head,meta,script,style,title,noembed,param,link {
display: none;
}
@ -408,6 +387,14 @@ img, object, svg|svg {
}
/* 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
}

View File

@ -1,9 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="AdvancedWelcomeEulaDlgDescriptionPerUser">If you are upgrading from a {app} version older than 0.6.17, please uninstall {app} first. Click Advanced to change installation settings.</String>
<String Id="ProgressTextFileCost">Computing space requirements, this may take upto five minutes...</String>
<String Id="ProgressTextCostInitialize">Computing space requirements, this may take upto five minutes...</String>
<String Id="ProgressTextCostFinalize">Computing space requirements, this may take upto five minutes...</String>
<String Id="WaitForCostingDlgText">Please wait while the installer finishes determining your disk space requirements, this may take upto five minutes...</String>
<WixLocalization Culture="en-us"
xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="AdvancedWelcomeEulaDlgDescriptionPerUser">If you are upgrading from a {app} version older than
0.6.17, please uninstall {app} first. Click Advanced to change
installation settings.</String>
<String Id="ProgressTextFileCost">Computing space requirements, this may take upto five
minutes...</String>
<String Id="ProgressTextCostInitialize">Computing space requirements, this may take upto five
minutes...</String>
<String Id="ProgressTextCostFinalize">Computing space requirements, this may take upto five
minutes...</String>
<String Id="WaitForCostingDlgText">Please wait while the installer finishes determining
your disk space requirements, this may take upto five minutes...</String>
</WixLocalization>

View File

@ -1,33 +1,28 @@
<?xml version='1.0' encoding='utf-8'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name='{app}' Id='*' UpgradeCode='{upgrade_code}'
Language='1033' Codepage='1252' Version='{version}' Manufacturer='Kovid Goyal'>
<Package Id='*' Keywords='Installer' Description="{app} Installer"
Comments='{app} is a registered trademark of Kovid Goyal' Manufacturer='Kovid Goyal'
InstallerVersion='300' Languages='1033' Compressed='yes'
SummaryCodepage='1252' />
Comments='{app} is a registered trademark of Kovid Goyal'
Manufacturer='Kovid Goyal' InstallerVersion='300' Languages='1033'
Compressed='yes' SummaryCodepage='1252' />
<Media Id="1" Cabinet="{app}.cab" CompressionLevel="{compression}" EmbedCab="yes" />
<Media Id="1" Cabinet="{app}.cab" CompressionLevel="{compression}"
EmbedCab="yes" />
<Upgrade Id="{upgrade_code}">
<UpgradeVersion Maximum="{version}"
IncludeMaximum="yes"
OnlyDetect="no"
Language="1033"
Property="OLDPRODUCTFOUND"/>
<UpgradeVersion Minimum="{version}"
IncludeMinimum="no"
OnlyDetect="yes"
Language="1033"
Property="NEWPRODUCTFOUND"/>
<UpgradeVersion Maximum="{version}" IncludeMaximum="yes"
OnlyDetect="no" Language="1033" Property="OLDPRODUCTFOUND" />
<UpgradeVersion Minimum="{version}" IncludeMinimum="no"
OnlyDetect="yes" Language="1033" Property="NEWPRODUCTFOUND" />
</Upgrade>
<CustomAction Id="PreventDowngrading" Error="Newer version already installed." />
<Directory Id='TARGETDIR' Name='SourceDir'>
<Merge Id="VCRedist" SourceFile="{crt_msm}" DiskId="1" Language="0"/>
<Merge Id="VCRedist" SourceFile="{crt_msm}" DiskId="1"
Language="0" />
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='APPLICATIONFOLDER' Name='{app}' />
</Directory>
@ -40,8 +35,10 @@
<DirectoryRef Id="APPLICATIONFOLDER">
{app_components}
<Component Id="AddToPath" Guid="*">
<Environment Id='UpdatePath' Name='PATH' Action='set' System='yes' Part='last' Value='[APPLICATIONFOLDER]' />
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="system_path_updated" Type="integer" Value="1" KeyPath="yes"/>
<Environment Id='UpdatePath' Name='PATH' Action='set'
System='yes' Part='last' Value='[APPLICATIONFOLDER]' />
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}"
Name="system_path_updated" Type="integer" Value="1" KeyPath="yes" />
</Component>
</DirectoryRef>
@ -49,25 +46,21 @@
<Component Id="StartMenuShortcuts" Guid="*">
<Shortcut Id="s1" Name="{app} - E-book management"
Description="Manage your e-book collection and download news"
Target="[#{exe_map[calibre]}]"
WorkingDirectory="APPLICATIONROOTDIRECTORY" />
Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<Shortcut Id="s2" Name="E-book viewer"
Description="Viewer for all the major e-book formats"
Target="[#{exe_map[ebook-viewer]}]"
WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<Shortcut Id="s3" Name="LRF viewer"
Description="Viewer for LRF format e-books"
Target="[#{exe_map[lrfviewer]}]"
Description="Viewer for all the major e-book formats" Target="[#{exe_map[ebook-viewer]}]"
WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<Shortcut Id="s3" Name="LRF viewer" Description="Viewer for LRF format e-books"
Target="[#{exe_map[lrfviewer]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<util:InternetShortcut Id="OnlineDocumentationShortcut"
Name="User Manual" Type="url"
Target="http://calibre-ebook.com/user_manual"/>
<util:InternetShortcut Id="GetInvolvedS"
Name="Get Involved" Type="url"
Target="http://calibre-ebook.com/get-involved"/>
Name="User Manual" Type="url" Target="http://calibre-ebook.com/user_manual" />
<util:InternetShortcut Id="GetInvolvedS" Name="Get Involved"
Type="url" Target="http://calibre-ebook.com/get-involved" />
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="start_menu_shortcuts_installed" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}"
Name="start_menu_shortcuts_installed" Type="integer" Value="1"
KeyPath="yes" />
</Component>
</DirectoryRef>
@ -75,9 +68,9 @@
<Component Id="DesktopShortcut" Guid="*">
<Shortcut Id="ds1" Name="{app} - E-book management"
Description="Manage your e-book collection and download news"
Target="[#{exe_map[calibre]}]"
WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="desktop_shortcut_installed" Type="integer" Value="1" KeyPath="yes"/>
Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
<RegistryValue Root="HKCU" Key="Software\Microsoft\{app}"
Name="desktop_shortcut_installed" Type="integer" Value="1" KeyPath="yes" />
</Component>
</DirectoryRef>
@ -90,7 +83,8 @@
Description="All the files need to run {app}" Absent="disallow">
</Feature>
<Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime"
AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist" />
</Feature>
@ -104,7 +98,8 @@
<ComponentRef Id="DesktopShortcut" />
</Feature>
<Feature Id="FAddToPath" Title="Add install directory to path" Level="1"
<Feature Id="FAddToPath" Title="Add install directory to path"
Level="1"
Description="Add installation directory to PATH. Makes using command line tools easier">
<ComponentRef Id="AddToPath" />
</Feature>
@ -128,20 +123,18 @@
<UI>
<UIRef Id="WixUI_Advanced" />
<Publish Dialog="ExitDialog"
Control="Finish"
Event="DoAction"
<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI>
<!--
Set default folder name and allow only per machine installs.
For a per-machine installation, the default installation location
will be [ProgramFilesFolder][ApplicationFolderName] and the user
will be able to change it in the setup UI. This is because the installer
has to install the VC90 merge module into the system winsxs folder for python
to work, so per user installs are impossible anyway.
Set default folder name and allow only per machine installs. For a
per-machine installation, the default installation location will be
[ProgramFilesFolder][ApplicationFolderName] and the user will be able
to change it in the setup UI. This is because the installer has to
install the VC90 merge module into the system winsxs folder for
python to work, so per user installs are impossible anyway.
-->
<Property Id="ApplicationFolderName" Value="Calibre2" />
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />

View File

@ -1,18 +1,38 @@
<html>
<head>
<style type='text/css'>
.toc { page-break-after: always; text-indent: 0em; }
.tocpn {text-align: right; }
.tocchr {text-align: right;}
.hanging_indent { padding-left:4em; text-indent:-4em }
.drop { text-indent: 0pt}
.drop:first-letter { font-size:xx-large}
.toc {
page-break-after: always;
text-indent: 0em;
}
.tocpn {
text-align: right;
}
.tocchr {
text-align: right;
}
.hanging_indent {
padding-left: 4em;
text-indent: -4em
}
.drop {
text-indent: 0pt
}
.drop:first-letter {
font-size: xx-large
}
</style>
</head>
<h1>Demo of <span style='font-family: monospace'>html2lrf</span></h1>
<p>
This document contains a demonstration of the capabilities of <span style='font-family:monospace'>html2lrf</span>, the HTML to LRF converter from <em>calibre.</em> To obtain calibre visit<br/><span style='font:sans-serif'>http://calibre-ebook.com</span>
</p>
<p>This document contains a demonstration of the capabilities of <span
style='font-family: monospace'>html2lrf</span>, the HTML to LRF
converter from <em>calibre.</em> To obtain calibre visit<br />
<span style='font: sans-serif'>http://calibre-ebook.com</span></p>
<br />
<h2 id="toc">Table of Contents</h2>
<ul style='page-break-after: always'>
@ -34,7 +54,8 @@
<li>Sub item 1</li>
<li>Sub item 2</li>
<ol>
<li>Sub sub item 1. This is a multiline item with <i>almost</i> correct blocking.</li>
<li>Sub sub item 1. This is a multiline item with <i>almost</i>
correct blocking.</li>
<li>Sub sub item 2</li>
</ol>
</ul>
@ -44,144 +65,215 @@
<h3>Definition Lists</h3>
<dl>
<dt>Term 1</dt>
<dd>Definition of Term 1. A multi line definition showing correct blocking.</dd>
<dd>Definition of Term 1. A multi line definition showing correct
blocking.</dd>
<dt>Term 2</dt>
<dd>Definition of Term 2</dd>
</dl>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='tables'>Tables</a></h2>
<table>
<tr><td colspan=4><h3 style="text-align:center">A matrix</h3></td></tr>
<tr><td></td><td style="text-align:center"><b>Column 1</b></td><td style="text-align:center"><b>Column 2</b></td><td style="text-align:center"><b>Column 3</b></td></tr>
<tr><td><b>Row 1</b></td><td><p style="text-align:center">(1, 1)</p></tr>
<tr><td><b>Row 2</b></td><td></td><td style="text-align:center"><p>(2, 2)</p></td><td></td></tr>
<tr><td><b>Row 3</b></td><td></td><td></td><td><p style="text-align:center">(3, 3)</p></td></tr>
<tr>
<td colspan=4>
<h3 style="text-align: center">A matrix</h3>
</td>
</tr>
<tr>
<td></td>
<td style="text-align: center"><b>Column 1</b></td>
<td style="text-align: center"><b>Column 2</b></td>
<td style="text-align: center"><b>Column 3</b></td>
</tr>
<tr>
<td><b>Row 1</b></td>
<td>
<p style="text-align: center">(1, 1)</p>
</tr>
<tr>
<td><b>Row 2</b></td>
<td></td>
<td style="text-align: center">
<p>(2, 2)</p>
</td>
<td></td>
</tr>
<tr>
<td><b>Row 3</b></td>
<td></td>
<td></td>
<td>
<p style="text-align: center">(3, 3)</p>
</td>
</tr>
</table>
<br />
<p>
html2lrf supports both rowspan and colspan, but no other HTML table attributes, as it uses its own algorithm to determine optimal placement of cells.
</p>
<p>
Note that if you have custom fonts on your reader, the table may not be properly aligned. Also html2lrf does not support nested tables.
</p>
<p style="page-break-after:always">
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.
<p>html2lrf supports both rowspan and colspan, but no other HTML
table attributes, as it uses its own algorithm to determine optimal
placement of cells.</p>
<p>Note that if you have custom fonts on your reader, the table may
not be properly aligned. Also html2lrf does not support nested tables.</p>
<p style="page-break-after: always">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.
</p>
<h3 align="center">Sample Complex Table of Contents</h3>
<table summary="TOC">
<tr><td colspan="3">&nbsp;</td><td align="right">PAGE</td></tr>
<tr><td class="tocch" colspan="3">Preface</td><td class="tocpn">v</td></tr>
<tr><td class="tocch" colspan="3">List of Works of Reference</td><td class="tocpn">vii</td></tr>
<tr><td class="tocch" colspan="3">List of Illustrations</td><td class="tocpn">xi</td></tr>
<tr><td class="tocch">Chapter</td><td class="tocchr">I.</td><td class="tocch">History of the Foundation</td><td class="tocpn">3</td></tr>
<tr><td class="tocchr" colspan="2">II.</td><td class="tocch">Exterior of the Church</td><td class="tocpn">25</td></tr>
<tr><td class="tocchr" colspan="2">III.</td><td class="tocch">Interior of the Church</td><td class="tocpn">33</td></tr>
<tr><td class="tocchr" colspan="2">IV.</td><td class="tocch">St. Bartholomew-the-Less and the Hospital</td><td class="tocpn">63</td></tr>
<tr><td class="tocch">Appendix</td><td class="tocchr">I.</td><td class="tocch">The Priory Seals</td><td class="tocpn">73</td></tr>
<tr><td class="tocchr" colspan="2">II.</td><td class="tocch">The Priors and Rectors</td><td class="tocpn">77</td></tr>
<tr><td class="tocchr" colspan="2">III.</td><td class="tocch">Inventory of Vestments, etc.</td><td class="tocpn">79</td></tr>
<tr><td class="tocchr" colspan="2">IV.</td><td class="tocch">The Organ</td><td class="tocpn">80</td></tr>
<tr><td class="tocch" colspan="3">Index</td><td class="tocpn">83</td></tr>
<tr>
<td colspan="3">&nbsp;</td>
<td align="right">PAGE</td>
</tr>
<tr>
<td class="tocch" colspan="3">Preface</td>
<td class="tocpn">v</td>
</tr>
<tr>
<td class="tocch" colspan="3">List of Works of Reference</td>
<td class="tocpn">vii</td>
</tr>
<tr>
<td class="tocch" colspan="3">List of Illustrations</td>
<td class="tocpn">xi</td>
</tr>
<tr>
<td class="tocch">Chapter</td>
<td class="tocchr">I.</td>
<td class="tocch">History of the Foundation</td>
<td class="tocpn">3</td>
</tr>
<tr>
<td class="tocchr" colspan="2">II.</td>
<td class="tocch">Exterior of the Church</td>
<td class="tocpn">25</td>
</tr>
<tr>
<td class="tocchr" colspan="2">III.</td>
<td class="tocch">Interior of the Church</td>
<td class="tocpn">33</td>
</tr>
<tr>
<td class="tocchr" colspan="2">IV.</td>
<td class="tocch">St. Bartholomew-the-Less and the Hospital</td>
<td class="tocpn">63</td>
</tr>
<tr>
<td class="tocch">Appendix</td>
<td class="tocchr">I.</td>
<td class="tocch">The Priory Seals</td>
<td class="tocpn">73</td>
</tr>
<tr>
<td class="tocchr" colspan="2">II.</td>
<td class="tocch">The Priors and Rectors</td>
<td class="tocpn">77</td>
</tr>
<tr>
<td class="tocchr" colspan="2">III.</td>
<td class="tocch">Inventory of Vestments, etc.</td>
<td class="tocpn">79</td>
</tr>
<tr>
<td class="tocchr" colspan="2">IV.</td>
<td class="tocch">The Organ</td>
<td class="tocpn">80</td>
</tr>
<tr>
<td class="tocch" colspan="3">Index</td>
<td class="tocpn">83</td>
</tr>
</table>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='text'>Text formatting</a></h2>
<p>
A simple <i>paragraph</i> of <b>formatted
<i>text</i></b>, with a <u>ruled line</u> following it.
Super<sup>scripts</sup> and Sub<sub>scripts</sub>.
<p>A simple <i>paragraph</i> of <b>formatted <i>text</i></b>, with a
<u>ruled line</u> following it. Super<sup>scripts</sup> and Sub<sub>scripts</sub>.
</p>
<hr />
<br />
<p> A
<span style='font-style:italic'>similar</span>
paragraph, but now <span style="text-decoration:overline">using</span>
<span style='font-weight:bold'><i>CSS</i></span>
to perform the text formatting.</p>
<p>A <span style='font-style: italic'>similar</span> paragraph, but
now <span style="text-decoration: overline">using</span> <span
style='font-weight: bold'><i>CSS</i></span> to perform the text
formatting.</p>
<hr />
<center>A centered phrase</center>
<span style='text-align: right'>A right aligned phrase</span>
A normal phrase
<hr />
<p>A paragraph containing a <em>&lt;blockquote&gt;</em>
<blockquote>This is blockquoted text. It is rendered in a separate block with margins.</blockquote>The above text should be distinct from the rest of the paragraph.
</p>
<blockquote>This is blockquoted text. It is rendered in a
separate block with margins.</blockquote>
The above text should be distinct from the rest of the paragraph.</p>
<hr />
<p style='text-indent: 10em'>A very indented paragraph</p>
<p style='text-indent: 0em'>An unindented paragraph</p>
<p>A default indented paragraph</p>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='images'>Inline images</a></h2>
<p>
Here I demonstrate the use of inline images in the midst of text. Here is a small image <img src='small.jpg' /> embedded in a sentence. Now we have a slightly larger image that is automatically put in its own block <img style="text-align:center" src='medium.jpg' /> 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. <img align='center' src='large.jpg' />
</p>
<p>Here I demonstrate the use of inline images in the midst of text.
Here is a small image <img src='small.jpg' /> embedded in a sentence.
Now we have a slightly larger image that is automatically put in its own
block <img style="text-align: center" src='medium.jpg' /> 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. <img
align='center' src='large.jpg' /></p>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='fonts'>Embedded fonts</a></h2>
<p>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: </p>
<p>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:</p>
<ul>
<li>mouse in German: mūs</li>
<li>mouse in Russian: мышь</li>
</ul>
<p>
Note that embedding fonts in LRF files slows down page turns slightly.
<br />
<p>Note that embedding fonts in LRF files slows down page turns
slightly. <br />
</p>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='dropcaps'>Paragraph Emphasis</a></h2>
<br />
<p><img class='libprs500_dropcaps' src='a.png' /> beautiful image based dropcaps to emphasize this
paragraph. Image based dropcaps are specified by adding the <code>class = 'libprs500_dropcaps'</code>
attribute to an <code>&lt;img&gt;</code> tag.<p/>
<p><img class='libprs500_dropcaps' src='a.png' /> beautiful image
based dropcaps to emphasize this paragraph. Image based dropcaps are
specified by adding the <code>class = 'libprs500_dropcaps'</code>
attribute to an <code>&lt;img&gt;</code> tag.
<p /><br />
<p class="drop">This is a plain text based dropcaps. It is not
nearly as dramatic, but easier to code ;-)</p>
<br />
<p class="drop">This is a plain text based dropcaps. It
is not nearly as dramatic, but easier to code ;-)
</p>
<p><span style="font-variant: small-caps">This is an Example</span>
of small-caps. It can also be used to highlight the start of a paragraph
very effectively.</p>
<br />
<p><span style="font-variant: small-caps">This is an Example</span> of small-caps.
It can also be used to highlight the start of a paragraph very effectively.
<p class='hanging_indent'>A paragraph with a hanging indent. This is
especially useful for highly structured text like verse, or dialogue.<br />
</p>
<br/>
<p class='hanging_indent'>A paragraph with a hanging indent. This is especially
useful for highly structured text like verse, or dialogue.<br/></p>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
<h2><a name='recursive'>Recursive link following</a></h2>
<p>
<span style='font:monospace'>html2lrf</span> 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.
<br />
<p><span style='font: monospace'>html2lrf</span> 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. <br />
</p>
<p class='toc'>
<hr />
<a href='#toc'>Table of Contents</a>
</p>
<a href='#toc'>Table of Contents</a></p>
</html>

View File

@ -1,13 +1,13 @@
{% extends "!layout.html" %}
{% block sidebarlogo %}
<p class="logo">
<a href="http://calibre-ebook.com"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
</p>
{% extends "!layout.html" %} {% block sidebarlogo %}
<p class="logo"><a href="http://calibre-ebook.com"><img
class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo" /></a></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick" />
<input type="hidden" name="hosted_button_id" value="3028915" />
<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="Donate to support calibre development" style="border:0pt" />
<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"/>
<input type="hidden" name="cmd" value="_s-xclick" /> <input
type="hidden" name="hosted_button_id" value="3028915" /> <input
type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"
border="0" name="submit" alt="Donate to support calibre development"
style="border: 0pt" /> <img alt="" border="0"
src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
</form>
<hr />
{% endblock %}