Sorry for the delay, I completely missed this mail.
Le 22/04/2012 20:14, Chow Loong Jin a écrit :
> [...]
>
> - "FIXME: CSS?" doesn't look like it's needed in geanygendoc -- there's a rule
> to generate manual.html from manual.rst and manual.css. (This probably
> shouldn't be dist'd, but Colomban would probably be in a better position to
> answer that)
Actually there is a bug in the current build system, because the
html4css1 stylesheet should either be distributed or embedded, which
isn't currently the case.
Attached are a few patches updating the build system to properly embed
both stylesheets, and a few other updates. I didn't commit them/made a
PR yet because #2 is likely to conflict.
Regards,
Colomban
>From b7c07dc512616b196d2705c4426d4e3c84285673 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <b...@herbesfolles.org>
Date: Sat, 19 May 2012 16:59:36 +0200
Subject: [PATCH 1/3] geanygendoc: Update base stylesheet from docutils 0.8.1
---
geanygendoc/docs/html4css1.css | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/geanygendoc/docs/html4css1.css b/geanygendoc/docs/html4css1.css
index 030cf17..8160506 100644
--- a/geanygendoc/docs/html4css1.css
+++ b/geanygendoc/docs/html4css1.css
@@ -1,6 +1,6 @@
/*
:Author: David Goodger (good...@python.org)
-:Id: $Id: html4css1.css 5951 2009-05-18 18:03:10Z milde $
+:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
@@ -38,6 +38,10 @@ blockquote.epigraph {
dl.docutils dd {
margin-bottom: 0.5em }
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+ overflow: hidden;
+}
+
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
@@ -148,16 +152,22 @@ h2.subtitle {
hr.docutils {
width: 75% }
-img.align-left, .figure.align-left{
+img.align-left, .figure.align-left, object.align-left {
clear: left ;
float: left ;
margin-right: 1em }
-img.align-right, .figure.align-right {
+img.align-right, .figure.align-right, object.align-right {
clear: right ;
float: right ;
margin-left: 1em }
+img.align-center, .figure.align-center, object.align-center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
.align-left {
text-align: left }
@@ -170,7 +180,7 @@ img.align-right, .figure.align-right {
/* reset inner alignment in figures */
div.align-right {
- text-align: left }
+ text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
@@ -230,7 +240,7 @@ pre.address {
margin-top: 0 ;
font: inherit }
-pre.literal-block, pre.doctest-block {
+pre.literal-block, pre.doctest-block, pre.math {
margin-left: 2em ;
margin-right: 2em }
--
1.7.10
>From bdb96bf7a24c3c54c6dda53921a8cb0550cd0ddd Mon Sep 17 00:00:00 2001
From: Colomban Wendling <b...@herbesfolles.org>
Date: Sat, 19 May 2012 17:01:23 +0200
Subject: [PATCH 2/3] geanygendoc: Embed base stylesheet
Don't import the base CSS stylesheet from the custom one but rather
embed both in the output HTML.
---
geanygendoc/docs/Makefile.am | 4 ++--
geanygendoc/docs/manual.css | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/geanygendoc/docs/Makefile.am b/geanygendoc/docs/Makefile.am
index 02df8ce..57d273d 100644
--- a/geanygendoc/docs/Makefile.am
+++ b/geanygendoc/docs/Makefile.am
@@ -14,7 +14,7 @@ plugindoc_DATA = manual.rst
pluginhtmldoc_DATA = manual.html
if BUILD_RST
-manual.html: manual.rst manual.css
- $(AM_V_GEN) $(RST2HTML) -d --strict --stylesheet-path manual.css $< $@
+manual.html: manual.rst manual.css html4css1.css
+ $(AM_V_GEN) $(RST2HTML) -d --strict --stylesheet-path html4css1.css,manual.css $< $@
endif BUILD_RST
endif ENABLE_GEANYGENDOC
diff --git a/geanygendoc/docs/manual.css b/geanygendoc/docs/manual.css
index 4eff7f9..afb527e 100644
--- a/geanygendoc/docs/manual.css
+++ b/geanygendoc/docs/manual.css
@@ -6,7 +6,7 @@
Stylesheet for use with Docutils.
*/
-@import url(html4css1.css);
+/*@import url(html4css1.css);*/
html {
background-color: #eeeeec;
--
1.7.10
>From 54445e987fe07e2d43968bfb97e7889b68731041 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <b...@herbesfolles.org>
Date: Sat, 19 May 2012 17:03:04 +0200
Subject: [PATCH 3/3] geanygendoc: Update generated manual
---
geanygendoc/docs/manual.html | 313 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 310 insertions(+), 3 deletions(-)
diff --git a/geanygendoc/docs/manual.html b/geanygendoc/docs/manual.html
index c411ef8..91c202f 100644
--- a/geanygendoc/docs/manual.html
+++ b/geanygendoc/docs/manual.html
@@ -3,11 +3,318 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/"; />
+<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/"; />
<title>GeanyGenDoc User Manual</title>
<style type="text/css">
/*
+:Author: David Goodger (good...@python.org)
+:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+ border: 0 }
+
+table.borderless td, table.borderless th {
+ /* Override padding for "table.docutils td" with "! important".
+ The right padding separates the table cells. */
+ padding: 0 0.5em 0 0 ! important }
+
+.first {
+ /* Override more specific margin styles with "! important". */
+ margin-top: 0 ! important }
+
+.last, .with-subtitle {
+ margin-bottom: 0 ! important }
+
+.hidden {
+ display: none }
+
+a.toc-backref {
+ text-decoration: none ;
+ color: black }
+
+blockquote.epigraph {
+ margin: 2em 5em ; }
+
+dl.docutils dd {
+ margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+ overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+ font-weight: bold }
+*/
+
+div.abstract {
+ margin: 2em 5em }
+
+div.abstract p.topic-title {
+ font-weight: bold ;
+ text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+ margin: 2em ;
+ border: medium outset ;
+ padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+ font-weight: bold ;
+ font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+ color: red ;
+ font-weight: bold ;
+ font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+ compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+ margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+ margin-top: 0.5em }
+*/
+
+div.dedication {
+ margin: 2em 5em ;
+ text-align: center ;
+ font-style: italic }
+
+div.dedication p.topic-title {
+ font-weight: bold ;
+ font-style: normal }
+
+div.figure {
+ margin-left: 2em ;
+ margin-right: 2em }
+
+div.footer, div.header {
+ clear: both;
+ font-size: smaller }
+
+div.line-block {
+ display: block ;
+ margin-top: 1em ;
+ margin-bottom: 1em }
+
+div.line-block div.line-block {
+ margin-top: 0 ;
+ margin-bottom: 0 ;
+ margin-left: 1.5em }
+
+div.sidebar {
+ margin: 0 0 0.5em 1em ;
+ border: medium outset ;
+ padding: 1em ;
+ background-color: #ffffee ;
+ width: 40% ;
+ float: right ;
+ clear: right }
+
+div.sidebar p.rubric {
+ font-family: sans-serif ;
+ font-size: medium }
+
+div.system-messages {
+ margin: 5em }
+
+div.system-messages h1 {
+ color: red }
+
+div.system-message {
+ border: medium outset ;
+ padding: 1em }
+
+div.system-message p.system-message-title {
+ color: red ;
+ font-weight: bold }
+
+div.topic {
+ margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+ margin-top: 0.4em }
+
+h1.title {
+ text-align: center }
+
+h2.subtitle {
+ text-align: center }
+
+hr.docutils {
+ width: 75% }
+
+img.align-left, .figure.align-left, object.align-left {
+ clear: left ;
+ float: left ;
+ margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right {
+ clear: right ;
+ float: right ;
+ margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.align-left {
+ text-align: left }
+
+.align-center {
+ clear: both ;
+ text-align: center }
+
+.align-right {
+ text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+ text-align: inherit }
+
+/* div.align-center * { */
+/* text-align: left } */
+
+ol.simple, ul.simple {
+ margin-bottom: 1em }
+
+ol.arabic {
+ list-style: decimal }
+
+ol.loweralpha {
+ list-style: lower-alpha }
+
+ol.upperalpha {
+ list-style: upper-alpha }
+
+ol.lowerroman {
+ list-style: lower-roman }
+
+ol.upperroman {
+ list-style: upper-roman }
+
+p.attribution {
+ text-align: right ;
+ margin-left: 50% }
+
+p.caption {
+ font-style: italic }
+
+p.credits {
+ font-style: italic ;
+ font-size: smaller }
+
+p.label {
+ white-space: nowrap }
+
+p.rubric {
+ font-weight: bold ;
+ font-size: larger ;
+ color: maroon ;
+ text-align: center }
+
+p.sidebar-title {
+ font-family: sans-serif ;
+ font-weight: bold ;
+ font-size: larger }
+
+p.sidebar-subtitle {
+ font-family: sans-serif ;
+ font-weight: bold }
+
+p.topic-title {
+ font-weight: bold }
+
+pre.address {
+ margin-bottom: 0 ;
+ margin-top: 0 ;
+ font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math {
+ margin-left: 2em ;
+ margin-right: 2em }
+
+span.classifier {
+ font-family: sans-serif ;
+ font-style: oblique }
+
+span.classifier-delimiter {
+ font-family: sans-serif ;
+ font-weight: bold }
+
+span.interpreted {
+ font-family: sans-serif }
+
+span.option {
+ white-space: nowrap }
+
+span.pre {
+ white-space: pre }
+
+span.problematic {
+ color: red }
+
+span.section-subtitle {
+ /* font-size relative to parent (h1..h6 element) */
+ font-size: 80% }
+
+table.citation {
+ border-left: solid 1px gray;
+ margin-left: 1px }
+
+table.docinfo {
+ margin: 2em 4em }
+
+table.docutils {
+ margin-top: 0.5em ;
+ margin-bottom: 0.5em }
+
+table.footnote {
+ border-left: solid 1px black;
+ margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+ padding-left: 0.5em ;
+ padding-right: 0.5em ;
+ vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+ font-weight: bold ;
+ text-align: left ;
+ white-space: nowrap ;
+ padding-left: 0 }
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+ font-size: 100% }
+
+ul.auto-toc {
+ list-style-type: none }
+
+</style>
+<style type="text/css">
+
+/*
:Author: Colomban Wendling
:Contact: b...@herbesfolles.org
:Copyright: This stylesheet has been placed in the public domain.
@@ -15,7 +322,7 @@
Stylesheet for use with Docutils.
*/
-@import url(html4css1.css);
+/*@import url(html4css1.css);*/
html {
background-color: #eeeeec;
@@ -629,7 +936,7 @@ document ::= ( setting_section? doctype_section? |
</div>
<div class="footer">
<hr class="footer" />
-Generated on: 2011-01-10.
+Generated on: 2012-05-19.
</div>
</body>
--
1.7.10
_______________________________________________
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
