mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
parent
9590ba6234
commit
19288b38ac
@ -1,102 +1,104 @@
|
|||||||
body { background-color: white; }
|
body {
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
|
||||||
p.title {
|
p.title {
|
||||||
margin-top:0em;
|
margin-top: 0em;
|
||||||
margin-bottom:1em;
|
margin-bottom: 1em;
|
||||||
text-align:center;
|
text-align: center;
|
||||||
font-style:italic;
|
font-style: italic;
|
||||||
font-size:xx-large;
|
font-size: xx-large;
|
||||||
border-bottom: solid black 4px;
|
border-bottom: solid black 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.author {
|
p.author {
|
||||||
margin-top:0em;
|
margin-top: 0em;
|
||||||
margin-bottom:0em;
|
margin-bottom: 0em;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
text-indent: 1em;
|
text-indent: 1em;
|
||||||
font-size:large;
|
font-size: large;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.tags {
|
p.tags {
|
||||||
margin-top:0em;
|
margin-top: 0em;
|
||||||
margin-bottom:0em;
|
margin-bottom: 0em;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
text-indent: 1em;
|
text-indent: 1em;
|
||||||
font-size:small;
|
font-size: small;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.description {
|
p.description {
|
||||||
text-align:left;
|
text-align: left;
|
||||||
font-style:normal;
|
font-style: normal;
|
||||||
margin-top: 0em;
|
margin-top: 0em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.date_index {
|
p.date_index {
|
||||||
font-size:x-large;
|
font-size: x-large;
|
||||||
text-align:center;
|
text-align: center;
|
||||||
font-weight:bold;
|
font-weight: bold;
|
||||||
margin-top:1em;
|
margin-top: 1em;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.letter_index {
|
p.letter_index {
|
||||||
font-size:x-large;
|
font-size: x-large;
|
||||||
text-align:center;
|
text-align: center;
|
||||||
font-weight:bold;
|
font-weight: bold;
|
||||||
margin-top:1em;
|
margin-top: 1em;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.author_index {
|
p.author_index {
|
||||||
font-size:large;
|
font-size: large;
|
||||||
text-align:left;
|
text-align: left;
|
||||||
margin-top:0px;
|
margin-top: 0px;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
text-indent: 0em;
|
text-indent: 0em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.series {
|
p.series {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin-top:0px;
|
margin-top: 0px;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
margin-left:2em;
|
margin-left: 2em;
|
||||||
text-indent:-2em;
|
text-indent: -2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.read_book {
|
p.read_book {
|
||||||
text-align:left;
|
text-align: left;
|
||||||
margin-top:0px;
|
margin-top: 0px;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
margin-left:2em;
|
margin-left: 2em;
|
||||||
text-indent:-2em;
|
text-indent: -2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.unread_book {
|
p.unread_book {
|
||||||
text-align:left;
|
text-align: left;
|
||||||
margin-top:0px;
|
margin-top: 0px;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
margin-left:2em;
|
margin-left: 2em;
|
||||||
text-indent:-2em;
|
text-indent: -2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.date_read {
|
p.date_read {
|
||||||
text-align:left;
|
text-align: left;
|
||||||
margin-top:0px;
|
margin-top: 0px;
|
||||||
margin-bottom:0px;
|
margin-bottom: 0px;
|
||||||
margin-left:6em;
|
margin-left: 6em;
|
||||||
text-indent:-6em;
|
text-indent: -6em;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr.series_divider {
|
hr.series_divider {
|
||||||
width:50%;
|
width: 50%;
|
||||||
margin-left:1em;
|
margin-left: 1em;
|
||||||
margin-top:0em;
|
margin-top: 0em;
|
||||||
margin-bottom:0em;
|
margin-bottom: 0em;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr.annotations_divider {
|
hr.annotations_divider {
|
||||||
width:50%;
|
width: 50%;
|
||||||
margin-left:1em;
|
margin-left: 1em;
|
||||||
margin-top:0em;
|
margin-top: 0em;
|
||||||
margin-bottom:0em;
|
margin-bottom: 0em;
|
||||||
}
|
}
|
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
<div id="count_bar"><span id="left"><img
|
<div id="count_bar"><span id="left"><img
|
||||||
src="/static/first.png" alt="Show first set of books"
|
src="/static/first.png" alt="Show first set of books"
|
||||||
title="Show first set of books" /> <img src="/static/previous.png"
|
title="Show first set of books" /> <img
|
||||||
alt="Show previous set of books" title="Show previous set of books" /> </span><span
|
src="/static/previous.png" alt="Show previous set of books"
|
||||||
id="count"> </span> <span
|
title="Show previous set of books" /> </span><span id="count"> </span> <span
|
||||||
id="right"><img src="/static/next.png"
|
id="right"><img src="/static/next.png"
|
||||||
alt="Show next set of books" title="Show next set of books" /> <img
|
alt="Show next set of books" title="Show next set of books" /> <img
|
||||||
src="/static/last.png" alt="Show last set of books"
|
src="/static/last.png" alt="Show last set of books"
|
||||||
|
@ -1,49 +1,56 @@
|
|||||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fb="http://www.gribuser.ru/xml/fictionbook/2.0">
|
<xsl:stylesheet version="1.0"
|
||||||
<!--
|
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
#########################################################################
|
xmlns:fb="http://www.gribuser.ru/xml/fictionbook/2.0">
|
||||||
# #
|
<!-- #########################################################################
|
||||||
# #
|
# # # # # copyright 2002 Paul Henry Tremblay # # # # This program is distributed
|
||||||
# copyright 2002 Paul Henry Tremblay #
|
in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without
|
||||||
# #
|
even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
# This program is distributed in the hope that it will be useful, #
|
PURPOSE. See the GNU # # General Public License for more details. # # # #
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
You should have received a copy of the GNU General Public License # # along
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
|
with this program; if not, write to the Free Software # # Foundation, Inc.,
|
||||||
# General Public License for more details. #
|
59 Temple Place, Suite 330, Boston, MA # # 02111-1307 USA # # # # # ######################################################################### -->
|
||||||
# #
|
<xsl:output method="xml" encoding="UTF-8" />
|
||||||
# You should have received a copy of the GNU General Public License #
|
<xsl:key name="note-link" match="fb:section" use="@id" />
|
||||||
# along with this program; if not, write to the Free Software #
|
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA #
|
|
||||||
# 02111-1307 USA #
|
|
||||||
# #
|
|
||||||
# #
|
|
||||||
#########################################################################
|
|
||||||
|
|
||||||
-->
|
|
||||||
<xsl:output method="xml" encoding="UTF-8"/>
|
|
||||||
<xsl:key name="note-link" match="fb:section" use="@id"/>
|
|
||||||
<xsl:template match="/*">
|
<xsl:template match="/*">
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<xsl:if test="fb:description/fb:title-info/fb:lang = 'ru'">
|
<xsl:if test="fb:description/fb:title-info/fb:lang = 'ru'">
|
||||||
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"/>
|
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8" />
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
<title>
|
<title>
|
||||||
<xsl:value-of select="fb:description/fb:title-info/fb:book-title"/>
|
<xsl:value-of select="fb:description/fb:title-info/fb:book-title" />
|
||||||
</title>
|
</title>
|
||||||
<style type="text/x-oeb1-css">
|
<style type="text/x-oeb1-css">
|
||||||
A { color : #0002CC }
|
A { color : #0002CC }
|
||||||
A:HOVER { color : #BF0000 }
|
A:HOVER { color : #BF0000 }
|
||||||
BODY { background-color : #FEFEFE; color : #000000; font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; text-align : justify }
|
BODY { background-color : #FEFEFE; color : #000000; font-family :
|
||||||
H1{ font-size : 160%; font-style : normal; font-weight : bold; text-align : left; border : 1px solid Black; background-color : #E7E7E7; margin-left : 0px; page-break-before : always; }
|
Verdana, Geneva, Arial, Helvetica, sans-serif; text-align : justify
|
||||||
H2{ font-size : 130%; font-style : normal; font-weight : bold; text-align : left; background-color : #EEEEEE; border : 1px solid Gray; page-break-before : always; }
|
}
|
||||||
H3{ font-size : 110%; font-style : normal; font-weight : bold; text-align : left; background-color : #F1F1F1; border : 1px solid Silver;}
|
H1{ font-size : 160%; font-style : normal; font-weight : bold;
|
||||||
H4{ font-size : 100%; font-style : normal; font-weight : bold; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
|
text-align : left; border : 1px solid Black; background-color :
|
||||||
H5{ font-size : 100%; font-style : italic; font-weight : bold; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
|
#E7E7E7; margin-left : 0px; page-break-before : always; }
|
||||||
H6{ font-size : 100%; font-style : italic; font-weight : normal; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
|
H2{
|
||||||
SMALL{ font-size : 80% }
|
font-size : 130%; font-style : normal; font-weight : bold;
|
||||||
BLOCKQUOTE{ margin-left :4em; margin-top:1em; margin-right:0.2em;}
|
text-align : left; background-color : #EEEEEE; border : 1px solid
|
||||||
|
Gray; page-break-before : always; }
|
||||||
|
H3{ font-size : 110%; font-style
|
||||||
|
: normal; font-weight : bold; text-align : left; background-color :
|
||||||
|
#F1F1F1; border : 1px solid Silver;}
|
||||||
|
H4{ font-size : 100%;
|
||||||
|
font-style : normal; font-weight : bold; text-align : left; border
|
||||||
|
: 1px solid Gray; background-color : #F4F4F4;}
|
||||||
|
H5{ font-size : 100%;
|
||||||
|
font-style : italic; font-weight : bold; text-align : left; border
|
||||||
|
: 1px solid Gray; background-color : #F4F4F4;}
|
||||||
|
H6{ font-size : 100%;
|
||||||
|
font-style : italic; font-weight : normal; text-align : left;
|
||||||
|
border : 1px solid Gray; background-color : #F4F4F4;}
|
||||||
|
SMALL{
|
||||||
|
font-size : 80% }
|
||||||
|
BLOCKQUOTE{ margin-left :4em; margin-top:1em;
|
||||||
|
margin-right:0.2em;}
|
||||||
HR{ color : Black }
|
HR{ color : Black }
|
||||||
DIV{font-family : "Times New Roman", Times, serif; text-align : justify}
|
DIV{font-family : "Times New Roman", Times, serif; text-align : justify}
|
||||||
UL{margin-left: 0}
|
UL{margin-left: 0}
|
||||||
.epigraph{width:50%; margin-left : 35%;}
|
.epigraph{width:50%; margin-left : 35%;}
|
||||||
</style>
|
</style>
|
||||||
@ -51,37 +58,37 @@
|
|||||||
<body>
|
<body>
|
||||||
<xsl:for-each select="fb:description/fb:title-info/fb:annotation">
|
<xsl:for-each select="fb:description/fb:title-info/fb:annotation">
|
||||||
<div>
|
<div>
|
||||||
<xsl:call-template name="annotation"/>
|
<xsl:call-template name="annotation" />
|
||||||
</div>
|
</div>
|
||||||
<hr/>
|
<hr />
|
||||||
</xsl:for-each>
|
</xsl:for-each>
|
||||||
<!-- BUILD TOC -->
|
<!-- BUILD TOC -->
|
||||||
<ul>
|
<ul>
|
||||||
<xsl:apply-templates select="fb:body" mode="toc"/>
|
<xsl:apply-templates select="fb:body" mode="toc" />
|
||||||
</ul>
|
</ul>
|
||||||
<hr/>
|
<hr />
|
||||||
<!-- END BUILD TOC -->
|
<!-- END BUILD TOC -->
|
||||||
<!-- BUILD BOOK -->
|
<!-- BUILD BOOK -->
|
||||||
<xsl:for-each select="fb:body">
|
<xsl:for-each select="fb:body">
|
||||||
<xsl:if test="position()!=1">
|
<xsl:if test="position()!=1">
|
||||||
<hr/>
|
<hr />
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
<xsl:if test="@name">
|
<xsl:if test="@name">
|
||||||
<h4 align="center">
|
<h4 align="center">
|
||||||
<xsl:value-of select="@name"/>
|
<xsl:value-of select="@name" />
|
||||||
</h4>
|
</h4>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
<!-- <xsl:apply-templates /> -->
|
<!-- <xsl:apply-templates /> -->
|
||||||
<xsl:apply-templates/>
|
<xsl:apply-templates />
|
||||||
</xsl:for-each>
|
</xsl:for-each>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
<!-- author template -->
|
<!-- author template -->
|
||||||
<xsl:template name="author">
|
<xsl:template name="author">
|
||||||
<xsl:value-of select="fb:first-name"/>
|
<xsl:value-of select="fb:first-name" />
|
||||||
<xsl:text disable-output-escaping="no"> </xsl:text>
|
<xsl:text disable-output-escaping="no"> </xsl:text>
|
||||||
<xsl:value-of select="fb:middle-name"/> 
|
<xsl:value-of select="fb:middle-name" /> 
|
||||||
<xsl:text disable-output-escaping="no"> </xsl:text>
|
<xsl:text disable-output-escaping="no"> </xsl:text>
|
||||||
<xsl:value-of select="fb:last-name"/>
|
<xsl:value-of select="fb:last-name"/>
|
||||||
<br/>
|
<br/>
|
||||||
|
@ -35,8 +35,8 @@
|
|||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** 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);
|
@namespace svg url (http: //www.w3.org /2000/svg);
|
||||||
/* blocks */
|
/* blocks */
|
||||||
|
|
||||||
html,div,map,dt,isindex,form {
|
html,div,map,dt,isindex,form {
|
||||||
@ -161,10 +161,29 @@ table[align="right"] {
|
|||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
table[rules]:not ([rules="none"] ) {
|
table
|
||||||
border-collapse: collapse;
|
[
|
||||||
}
|
rules
|
||||||
|
]
|
||||||
|
:not
|
||||||
|
|
||||||
|
(
|
||||||
|
[
|
||||||
|
rules
|
||||||
|
=
|
||||||
|
"none"
|
||||||
|
]
|
||||||
|
|
||||||
|
)
|
||||||
|
{
|
||||||
|
border-collapse
|
||||||
|
:
|
||||||
|
|
||||||
|
collapse
|
||||||
|
;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
/* caption inherits from table not table-outer */
|
/* caption inherits from table not table-outer */
|
||||||
caption {
|
caption {
|
||||||
display: table-caption;
|
display: table-caption;
|
||||||
@ -322,7 +341,7 @@ ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* leafs */
|
/* leafs */
|
||||||
/* <hr> noshade and color attributes are handled completely by
|
/* <hr> noshade and color attributes are handled completely by
|
||||||
* the nsHTMLHRElement attribute mapping code
|
* the nsHTMLHRElement attribute mapping code
|
||||||
*/
|
*/
|
||||||
hr {
|
hr {
|
||||||
@ -381,7 +400,7 @@ br {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Images, embedded object, and SVG size defaults */
|
/* Images, embedded object, and SVG size defaults */
|
||||||
img,object,svg |svg {
|
img,object,svg |svg {
|
||||||
width: auto;
|
width: auto;
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user