From 2ffcd552ffa61ecb868f4924392ba50f74e38364 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Mon, 2 Mar 2009 05:55:04 +0000 Subject: - 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 --- ChangeLog | 9 ++ configure.in | 6 +- src/yelp-toc.c | 2 + stylesheets/Makefile.am | 2 +- stylesheets/toc2html.xsl | 260 ---------------------------------------- stylesheets/toc2html.xsl.in | 284 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 301 insertions(+), 262 deletions(-) delete mode 100644 stylesheets/toc2html.xsl create mode 100644 stylesheets/toc2html.xsl.in diff --git a/ChangeLog b/ChangeLog index d0f1dcba..f8842c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-01 Shaun McCance + + * 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 * 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 deleted file mode 100644 index a4473445..00000000 --- a/stylesheets/toc2html.xsl +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title[1]"/> - - - - - - - - - - - -
-
- - - -
- - - - - - - - -
-
- -
- -
-
- - - -
- -
- - - -
-
-
-

- - - - -

-
- - -

- - -

-

- - - - - -
-
-

- - - - - - - - - - - - - - -

No documents or subcategories found.

- - -
-
- - - - - -
    - -
  • - - - - - - - - - - - - - - - -
    • -     -
- - - - - - - diff --git a/stylesheets/toc2html.xsl.in b/stylesheets/toc2html.xsl.in new file mode 100644 index 00000000..e36f84ec --- /dev/null +++ b/stylesheets/toc2html.xsl.in @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:value-of select="title[1]"/> + + + + +
+ + + + + + +
+ + + + + + +
+
+ + + +
+ + + + + + + + +
+
+ +
+ +
+
+ + + +
+ +
+ + + +
+
+
+

+ + + + +

+
+ + +

+ + +

+

+ + + + + +
+
+

+ + + + + + + + + + + + + + +

No documents or subcategories found.

+ + +
+
+ + + + + +
    + +
  • + + + + + + + + + + + + + + + +
    • +     +
+ + + + + + + -- cgit v1.2.1