summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2009-03-02 05:55:04 +0000
committerShaun McCance <shaunm@src.gnome.org>2009-03-02 05:55:04 +0000
commit2ffcd552ffa61ecb868f4924392ba50f74e38364 (patch)
treecd6e1b332e9b7c493e91fc718fd58b07c49fa5a1
parent6ae495e198f314ac7815b4a0856d474fead4805b (diff)
downloadyelp-2ffcd552ffa61ecb868f4924392ba50f74e38364.tar.gz
- RTL fixes for bug #573159
* configure.in: * src/yelp-toc.c: * stylesheets/toc2html.xsl: * stylesheets/toc2html.xsl.in: * stylesheets/Makefile.am: - RTL fixes for bug #573159 svn path=/trunk/; revision=3225
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--configure.in6
-rw-r--r--src/yelp-toc.c2
-rw-r--r--stylesheets/Makefile.am2
-rw-r--r--stylesheets/toc2html.xsl.in (renamed from stylesheets/toc2html.xsl)66
5 files changed, 62 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index d0f1dcba..f8842c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-01 Shaun McCance <shaunm@gnome.org>
+
+ * configure.in:
+ * src/yelp-toc.c:
+ * stylesheets/toc2html.xsl:
+ * stylesheets/toc2html.xsl.in:
+ * stylesheets/Makefile.am:
+ - RTL fixes for bug #573159
+
2009-03-01 Christian Persch <chpe@gnome.org>
* configure.in: Treat libxul and libxul-embedding the same as far as the
diff --git a/configure.in b/configure.in
index b6b72308..8deacbef 100644
--- a/configure.in
+++ b/configure.in
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES(YELP,
[
gio-2.0
gconf-2.0
- gnome-doc-utils >= 0.11.1
+ gnome-doc-utils >= 0.15.2
gtk+-unix-print-2.0
gtk+-2.0 >= 2.10.0
libglade-2.0 >= 2.0.0
@@ -94,6 +94,9 @@ AC_SUBST(DB_TITLE)
DB2HTML="`$PKG_CONFIG --variable=db2xhtml gnome-doc-utils`"
AC_SUBST(DB2HTML)
+GDU_GETTEXT="`$PKG_CONFIG --variable=gettext gnome-doc-utils`"
+AC_SUBST(GDU_GETTEXT)
+
GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir gnome-doc-utils`"
AC_SUBST(GDU_ICON_PATH)
@@ -267,6 +270,7 @@ src/Makefile
stylesheets/Makefile
stylesheets/db2html.xsl
stylesheets/db-title.xsl
+stylesheets/toc2html.xsl
data/Makefile
data/icons/Makefile
data/ui/Makefile
diff --git a/src/yelp-toc.c b/src/yelp-toc.c
index bec809a0..b59a3150 100644
--- a/src/yelp-toc.c
+++ b/src/yelp-toc.c
@@ -450,6 +450,8 @@ toc_process (YelpToc *toc)
xmlChar *icon = NULL;
xmlChar *id = NULL;
+ xmlNodeSetLang (node, BAD_CAST g_get_language_names ()[0]);
+
xml_trim_titles (node, BAD_CAST "title");
xml_trim_titles (node, BAD_CAST "description");
diff --git a/stylesheets/Makefile.am b/stylesheets/Makefile.am
index 858feb05..c6b6b060 100644
--- a/stylesheets/Makefile.am
+++ b/stylesheets/Makefile.am
@@ -11,4 +11,4 @@ xsl_DATA = \
toc2html.xsl \
yelp-common.xsl
-EXTRA_DIST=$(xsl_DATA)
+EXTRA_DIST=$(xsl_DATA) db2html.xsl.in db-title.xsl.in toc2html.xsl.in
diff --git a/stylesheets/toc2html.xsl b/stylesheets/toc2html.xsl.in
index a4473445..e36f84ec 100644
--- a/stylesheets/toc2html.xsl
+++ b/stylesheets/toc2html.xsl.in
@@ -5,6 +5,8 @@
extension-element-prefixes="yelp"
version="1.0">
+<xsl:import href="@GDU_GETTEXT@"/>
+
<xsl:param name="help_icon"/>
<xsl:param name="help_icon_size"/>
@@ -23,6 +25,19 @@
<xsl:param name="theme.color.yellow_border"/>
<xsl:template match="toc">
+ <xsl:variable name="direction">
+ <xsl:call-template name="l10n.direction"/>
+ </xsl:variable>
+ <xsl:variable name="left">
+ <xsl:call-template name="l10n.align.start">
+ <xsl:with-param name="direction" select="$direction"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="right">
+ <xsl:call-template name="l10n.align.end">
+ <xsl:with-param name="direction" select="$direction"/>
+ </xsl:call-template>
+ </xsl:variable>
<yelp:document href="{@id}">
<html>
<head>
@@ -40,7 +55,7 @@
margin-top: 12px;
margin-left: 12px;
margin-right: 12px;
- padding-left: 204px;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 204px;
padding-top: 0.2em;
padding-bottom: 0.2em;
-moz-border-radius: 6px;
@@ -52,9 +67,8 @@
<xsl:value-of select="$theme.color.text"/><xsl:text>;
}
h1 img {
- position: absolute;
- top: 15px;
- right: 18px;
+ float: </xsl:text><xsl:value-of select="$right"/><xsl:text>;
+ margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 18px;
}
h2 h3 {
color: </xsl:text><xsl:value-of select="$theme.color.text"/><xsl:text>;
@@ -63,10 +77,10 @@
div[class~="leftbar"] {
position: absolute;
top: 4em;
- left: 12px;
+ </xsl:text><xsl:value-of select="$left"/><xsl:text>: 12px;
width: 192px;
min-height: 192px;
- text-align: left;
+ text-align: </xsl:text><xsl:value-of select="$left"/><xsl:text>;
/* padding-top: </xsl:text>
<xsl:value-of select="$help_icon_size"/><xsl:text>px;
background-image: url("</xsl:text>
@@ -79,7 +93,7 @@
div[class~="leftbackground"] {
position: absolute;
top: 4em;
- left: 1px;
+ </xsl:text><xsl:value-of select="$left"/><xsl:text>: 1px;
width: 210px;
min-height: 192px;
text-align: center;
@@ -93,12 +107,9 @@
opacity: .1;
}
div[class~="rightbar"] {
- margin-left: 216px;
- padding-bottom: 1em;
- padding-top: 1em;
- padding-left: 1em;
- padding-right: 1em;
- margin-right: 12px;
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 216px;
+ margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 12px;
+ padding: 1em;
background-color: </xsl:text><xsl:value-of select="$theme.color.background"/><xsl:text>;
color: </xsl:text><xsl:value-of select="$theme.color.text"/><xsl:text>;
-moz-border-radius: 8px;
@@ -106,34 +117,47 @@
ul { margin-left: 0em; padding-left: 0em; }
li[class~="toclist"] {
margin-top: 0.3em;
- margin-left: 0em;
- padding-left: 0em;
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0em;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0em;
font-size: 1.2em;
list-style-type: none;
}
li li[class~="toclist"] {
- padding-left: 0.8em;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0.8em;
font-size: 0.8em;
}
li li li[class~="toclist"] {
- padding-left: 0.8em;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0.8em;
font-size: 0.6em;
}
li[class~="toc"] {
- margin-left: 0em;
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0em;
font-size: 1.2em;
padding-top: 0.5em;
list-style-type: none;
}
- dl { margin-left: 0em; padding-left: 0em; }
+ dl {
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0em;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0em;
+ }
dt { font-size: 1.2em; margin-top: 1em; }
- dd { margin-left: 1em; margin-top: 0.5em; }
+ dd {
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
+ margin-top: 0.5em;
+ }
a { text-decoration: none; color: </xsl:text><xsl:value-of select="$theme.color.link"/><xsl:text>; }
a:hover { text-decoration: underline; }
</xsl:text></style>
</head>
<body>
- <xsl:apply-templates mode="body.mode" select="."/>
+ <div>
+ <xsl:if test="$direction = 'ltr' or $direction='rtl'">
+ <xsl:attribute name="dir">
+ <xsl:value-of select="$direction"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates mode="body.mode" select="."/>
+ </div>
</body>
</html>
</yelp:document>
View Lorry Controller Status