diff --git a/fb2mobi-gui.config b/fb2mobi-gui.config index 360275a..7a6cdc9 100644 --- a/fb2mobi-gui.config +++ b/fb2mobi-gui.config @@ -1,32 +1,32 @@ - default + KindleNew mobi - No + profile - C:\Users\dnkorpushov\Desktop\dest - C:\Users\dnkorpushov\Google Диск\Библиотека\Довлатов, Сергей + C:\Users\dnkorpushov\Desktop + True - True + False DEBUG - True + False True - 712, 261 + 508, 406 - 356 - 281 - 73 + 100 + 100 + 306 - 243 - 238 - 996 - 558 + 483 + 209 + 937 + 562 diff --git a/fb2mobi-gui.py b/fb2mobi-gui.py index d6ce20e..f925d60 100644 --- a/fb2mobi-gui.py +++ b/fb2mobi-gui.py @@ -743,7 +743,7 @@ def generateFontCSS(self): '.table th', '.table td', '.annotation', 'body'] - css_string = modules.default_css.default_css + css_string = modules.default_css.gui_default_css css = cssutils.parseString(css_string) font_regular = '' diff --git a/fb2mobi.config b/fb2mobi.config index 3df8b07..9ab90c2 100644 --- a/fb2mobi.config +++ b/fb2mobi.config @@ -28,6 +28,77 @@ + + + False + False + True + False + + False + True + + profiles/kindle.css + profiles/dash_spaces.xsl + + True + + None + + True + + #l #f #m + {(#abbrseries{ #padnumber}) }#title + + Аннотация + True + + False + Содержание + Kindle + True + + float + notes,Примечания + + + + + + False + False + True + False + + True + True + + profiles/kindle.css + profiles/dash_spaces.xsl + + True + + None + + True + + #l #f #m + {(#abbrseries{ #padnumber}) }#title + + Аннотация + True + + False + Содержание + Kindle + True + + default + notes,Примечания + + + + False diff --git a/modules/default_css.py b/modules/default_css.py index c007e1f..f827a6f 100644 --- a/modules/default_css.py +++ b/modules/default_css.py @@ -284,3 +284,312 @@ } ''' +gui_default_css = ''' + +@page { + margin-left: 20px; + margin-right:20px; + margin-top:20px; + margin-bottom:5px; +} + +.h0 { + font-size: 140%; + font-weight: bold; + margin-bottom: 1em; +} + +.h1 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h2 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h3 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h4 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.h5 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.h6 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.titleblock { + text-indent: 0em; + page-break-before: always; + margin-top: 2em; + margin-bottom: 1em; +} + +.titleblock_nobreak { + text-indent: 0em; + margin-top: 2em; + margin-bottom: 1em; +} + +.titlenotes { + font-size: 100%; + font-weight: bold; + margin-top: 1em; + margin-bottom: 0.5em; + page-break-after: avoid; +} + +.titlenotes p { + text-indent: 0; + text-align: center; +} + +.indent0 { margin-left: 0pt; text-align: left; } +.indent1 { margin-left: 10pt; text-align: left; } +.indent2 { margin-left: 20pt; text-align: left; } +.indent3 { margin-left: 30pt; text-align: left; } +.indent4 { margin-left: 40pt; text-align: left; } +.indent5 { margin-left: 40pt; text-align: left; } +.indent6 { margin-left: 40pt; text-align: left; } + +.anchor { + vertical-align: super; + font-size: 70%; +} + +.linkanchor { + font-size: 80%; +} + +.inlineanchor { + display: none; +} + +.blockanchor { + vertical-align: super; + font-size: 70%; +} + +.emphasis { + font-style: italic; +} + +.emptyline { + margin-top: 2em; +} + +.strong { + font-weight: bold; +} +.strike { + text-decoration: line-through; +} + +.epigraph { + margin-left: 3em; + margin-right: 3em; + text-align: justify; + margin-top: 0.4em; + margin-bottom: 0.2em; + font-size: 80%; +} + +.epigraph p { + text-indent: 0em; +} + +.text-author { + margin-left: 3em; + margin-right: 3em; + text-indent: 0em; + page-break-before: avoid; + text-align: right; + font-weight: bold; +} + +.subtitle { + page-break-after: avoid; + text-align: center; + font-weight: bold; + margin-bottom: 0.5em; + margin-top: 1em; +} + +p.subtitle { + text-indent: 0em; +} + +p { + text-indent: 1.3em; + margin-bottom: 0pt; + margin-top: 0pt; + text-align: justify; +} + +p.title { + text-indent: 0em; + text-align: center; +} + +.cite { + font-style: italic; + text-indent: 1em; + margin-bottom: 0.3em; + margin-top: 0.3em; +} + +.image { + text-indent: 0em; + text-align: center; +} + +.image img { + max-width:100%; + max-height:100%; +} + +.poem { + text-indent: 0em; + margin-left: 3em; + margin-bottom: 0em; + margin-top: 0em; + font-style: italic; +} + +.stanza { + margin-bottom: 0.5em; +} + +.poem p { + margin-bottom: 0em; + margin-top: 0em; +} + +.table { + width: 100%; + border: 1px solid black; + border-collapse: collapse; +} + +.table th { + border: 1px solid black; + background: #ccc; +} + +.table td { + border: 1px solid black; +} + +.code { + margin-bottom: 0em; + margin-top: 0em; +} + +.inlineimage {} + +.inlinenote { + font-style: italic; + font-size: 80%; + color: #6e6e6e; +} + +.inlinenote::before { + content: "["; +} + +.inlinenote::after { + content: "]"; +} + +.blocknote { + font-style: italic; + font-size: 80%; + border-radius: 4px; + background: #e6e6fa; + padding: 2px; + border: 1px #505050 solid; +} + +.floatnote { + font-size: 80%; + text-indent: 0em; +} + +.notenum { + font-weight: bold; +} + +.annotation { + margin-right: 1em; + margin-left: 1em; + font-size: 80%; + text-align: center; + margin-top: 2em; + margin-bottom: 1em; +} + +span.dropcaps { + font-weight: bold; + font-size: 4em; + float: left; + margin-top: -.1em; + margin-bottom: -.1em; + margin-right: .1em; + padding-right: .1em; +} + +p.dropcaps { + text-indent: 0; +} + +.vignette_title_before { + text-indent: 0; + text-align: center; + page-break-after: avoid; + margin-bottom: 0; +} + +.vignette_title_after { + text-indent: 0; + text-align: center; + page-break-before: avoid; + margin-top: 0; + margin-bottom: 0; +} + +.vignette_chapter_end { + text-indent: 0; + font-size: 200%; + text-align: center; + page-break-before: avoid; + page-break-inside: avoid; + margin-top: 2em; + margin-bottom: 0; +} + +.chapter_end { + page-break-before: avoid; + page-break-inside: avoid; + page-break-after: always; +} +''' \ No newline at end of file diff --git a/profiles/dash_spaces.xsl b/profiles/dash_spaces.xsl new file mode 100644 index 0000000..2884888 --- /dev/null +++ b/profiles/dash_spaces.xsl @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + —  + + + \ No newline at end of file diff --git a/profiles/kindle.css b/profiles/kindle.css new file mode 100644 index 0000000..87f44d3 --- /dev/null +++ b/profiles/kindle.css @@ -0,0 +1,307 @@ + +@page { + margin-left: 20px; + margin-right:20px; + margin-top:20px; + margin-bottom:5px; +} + +.h0 { + font-size: 140%; + font-weight: bold; + margin-bottom: 1em; +} + +.h1 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h2 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h3 { + font-size: 120%; + font-weight: bold; + margin-bottom: 1em; +} + +.h4 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.h5 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.h6 { + font-size: 120%; + font-weight: bold; + text-align: center; + margin-bottom: 1em; +} + +.titleblock { + text-indent: 0em; + page-break-before: always; + margin-top: 2em; + margin-bottom: 1em; +} + +.titleblock_nobreak { + text-indent: 0em; + margin-top: 2em; + margin-bottom: 1em; +} + +.titlenotes { + font-size: 100%; + font-weight: bold; + margin-top: 1em; + margin-bottom: 0.5em; + page-break-after: avoid; +} + +.titlenotes p { + text-indent: 0; + text-align: center; +} + +.indent0 { margin-left: 0pt; text-align: left; } +.indent1 { margin-left: 10pt; text-align: left; } +.indent2 { margin-left: 20pt; text-align: left; } +.indent3 { margin-left: 30pt; text-align: left; } +.indent4 { margin-left: 40pt; text-align: left; } +.indent5 { margin-left: 40pt; text-align: left; } +.indent6 { margin-left: 40pt; text-align: left; } + +.anchor { + vertical-align: super; + font-size: 70%; +} + +.linkanchor { + font-size: 80%; +} + +.inlineanchor { + display: none; +} + +.blockanchor { + vertical-align: super; + font-size: 70%; +} + +.emphasis { + font-style: italic; +} + +.emptyline { + margin-top: 2em; +} + +.strong { + font-weight: bold; +} +.strike { + text-decoration: line-through; +} + +.epigraph { + margin-left: 3em; + margin-right: 3em; + text-align: justify; + margin-top: 0.4em; + margin-bottom: 0.2em; + font-size: 80%; +} + +.epigraph p { + text-indent: 0em; +} + +.text-author { + margin-left: 3em; + margin-right: 3em; + text-indent: 0em; + page-break-before: avoid; + text-align: right; + font-weight: bold; +} + +.subtitle { + page-break-after: avoid; + text-align: center; + font-weight: bold; + margin-bottom: 0.5em; + margin-top: 1em; +} + +p.subtitle { + text-indent: 0em; +} + +p { + text-indent: 1.3em; + margin-bottom: 0pt; + margin-top: 0pt; + text-align: justify; +} + +p.title { + text-indent: 0em; + text-align: center; +} + +.cite { + font-style: italic; + text-indent: 1em; + margin-bottom: 0.3em; + margin-top: 0.3em; +} + +.image { + text-indent: 0em; + text-align: center; +} + +.image img { + max-width:100%; + max-height:100%; +} + +.poem { + text-indent: 0em; + margin-left: 3em; + margin-bottom: 0em; + margin-top: 0em; + font-style: italic; +} + +.stanza { + margin-bottom: 0.5em; +} + +.poem p { + margin-bottom: 0em; + margin-top: 0em; +} + +.table { + width: 100%; + border: 1px solid black; + border-collapse: collapse; +} + +.table th { + border: 1px solid black; + background: #ccc; +} + +.table td { + border: 1px solid black; +} + +.code { + margin-bottom: 0em; + margin-top: 0em; +} + +.inlineimage {} + +.inlinenote { + font-style: italic; + font-size: 80%; + color: #6e6e6e; +} + +.inlinenote::before { + content: "["; +} + +.inlinenote::after { + content: "]"; +} + +.blocknote { + font-style: italic; + font-size: 80%; + border-radius: 4px; + background: #e6e6fa; + padding: 2px; + border: 1px #505050 solid; +} + +.floatnote { + font-size: 80%; + text-indent: 0em; +} + +.notenum { + font-weight: bold; +} + +.annotation { + margin-right: 1em; + margin-left: 1em; + font-size: 80%; + text-align: center; + margin-top: 2em; + margin-bottom: 1em; +} + +span.dropcaps { + font-weight: bold; + font-size: 4em; + float: left; + margin-top: -.1em; + margin-bottom: -.1em; + margin-right: .1em; + padding-right: .1em; +} + +p.dropcaps { + text-indent: 0; +} + +.vignette_title_before { + text-indent: 0; + text-align: center; + page-break-after: avoid; + margin-bottom: 0; +} + +.vignette_title_after { + text-indent: 0; + text-align: center; + page-break-before: avoid; + margin-top: 0; + margin-bottom: 0; +} + +.vignette_chapter_end { + text-indent: 0; + font-size: 200%; + text-align: center; + page-break-before: avoid; + page-break-inside: avoid; + margin-top: 2em; + margin-bottom: 0; +} + +.chapter_end { + page-break-before: avoid; + page-break-inside: avoid; + page-break-after: always; +} diff --git a/version.py b/version.py index f7a2424..7da9cfe 100644 --- a/version.py +++ b/version.py @@ -4,5 +4,5 @@ WINDOWS = platform.system().lower() == "windows" -VERSION = u'3.6.34' +VERSION = u'3.6.35'