[gnome-doc-utils: 161/165] Merge branch 'mallard'
- From: Shaun McCance <shaunm src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-doc-utils: 161/165] Merge branch 'mallard'
- Date: Tue, 16 Jun 2009 15:42:46 -0400 (EDT)
commit 5a815acf0b065d80cd968cc2584e66940d89d388
Merge: e0bc774... 9f55fd7...
Author: Shaun McCance <shaunm shaunmlxlap localdomain>
Date: Sun Jun 14 21:44:14 2009 -0500
Merge branch 'mallard'
Makefile.am | 2 +-
configure.in | 6 +
data/icons/hicolor/24x24/admon-bug.png | Bin 0 -> 1317 bytes
data/icons/hicolor/24x24/admon-caution.png | Bin 0 -> 1149 bytes
data/icons/hicolor/24x24/admon-important.png | Bin 0 -> 1017 bytes
data/icons/hicolor/24x24/admon-note.png | Bin 0 -> 779 bytes
data/icons/hicolor/24x24/admon-tip.png | Bin 0 -> 1128 bytes
data/icons/hicolor/24x24/admon-warning.png | Bin 0 -> 1149 bytes
doc/Makefile.am | 2 +-
{sandbox/mallard/spec => doc/mallard/C}/Makefile | 4 +-
{sandbox/mallard/spec => doc/mallard/C}/TODO | 0
doc/mallard/C/details.page | 33 +
.../spec/explore.xml => doc/mallard/C/explore.page | 15 +-
.../spec => doc/mallard/C}/figures/mallard.png | Bin 725 -> 725 bytes
doc/mallard/C/i18n.page | 22 +
.../spec/mallard.xml => doc/mallard/C/index.page | 10 +-
doc/mallard/C/its.page | 359 +++++++++
doc/mallard/C/l10n.page | 22 +
doc/mallard/C/legal.xml | 9 +
doc/mallard/C/links.page | 43 ++
.../mal_TODO.xml => doc/mallard/C/mal_TODO.page | 4 +-
.../mallard/C/mal_attr_link.page | 7 +-
doc/mallard/C/mal_block.page | 185 +++++
doc/mallard/C/mal_block_cite.page | 69 ++
doc/mallard/C/mal_block_code.page | 142 ++++
doc/mallard/C/mal_block_comment.page | 179 +++++
doc/mallard/C/mal_block_desc.page | 135 ++++
doc/mallard/C/mal_block_example.page | 134 ++++
doc/mallard/C/mal_block_figure.page | 115 +++
doc/mallard/C/mal_block_list.page | 208 +++++
doc/mallard/C/mal_block_listing.page | 127 ++++
doc/mallard/C/mal_block_media.page | 157 ++++
doc/mallard/C/mal_block_note.page | 233 ++++++
doc/mallard/C/mal_block_p.page | 106 +++
doc/mallard/C/mal_block_quote.page | 156 ++++
doc/mallard/C/mal_block_screen.page | 185 +++++
doc/mallard/C/mal_block_steps.page | 195 +++++
.../mallard/C/mal_block_subtitle.page | 8 +-
doc/mallard/C/mal_block_synopsis.page | 136 ++++
doc/mallard/C/mal_block_terms.page | 187 +++++
.../mallard/C/mal_block_title.page | 8 +-
doc/mallard/C/mal_block_tree.page | 190 +++++
doc/mallard/C/mal_external.page | 75 ++
doc/mallard/C/mal_info.page | 53 ++
doc/mallard/C/mal_info_copyright.page | 96 +++
doc/mallard/C/mal_info_credit.page | 139 ++++
doc/mallard/C/mal_info_desc.page | 73 ++
doc/mallard/C/mal_info_license.page | 93 +++
doc/mallard/C/mal_info_link.page | 21 +
doc/mallard/C/mal_info_revision.page | 155 ++++
doc/mallard/C/mal_info_title.page | 140 ++++
doc/mallard/C/mal_inline.page | 99 +++
doc/mallard/C/mal_inline_app.page | 132 ++++
doc/mallard/C/mal_inline_cmd.page | 179 +++++
doc/mallard/C/mal_inline_code.page | 171 +++++
doc/mallard/C/mal_inline_em.page | 124 +++
doc/mallard/C/mal_inline_file.page | 89 +++
doc/mallard/C/mal_inline_gui.page | 177 +++++
doc/mallard/C/mal_inline_guiseq.page | 117 +++
doc/mallard/C/mal_inline_input.page | 126 +++
doc/mallard/C/mal_inline_key.page | 146 ++++
doc/mallard/C/mal_inline_keyseq.page | 172 +++++
doc/mallard/C/mal_inline_link.page | 206 +++++
doc/mallard/C/mal_inline_media.page | 155 ++++
doc/mallard/C/mal_inline_output.page | 173 +++++
doc/mallard/C/mal_inline_span.page | 110 +++
doc/mallard/C/mal_inline_sys.page | 110 +++
doc/mallard/C/mal_inline_var.page | 98 +++
doc/mallard/C/mal_page.page | 159 ++++
doc/mallard/C/mal_section.page | 92 +++
doc/mallard/C/mal_table.page | 471 ++++++++++++
doc/mallard/C/mal_table_col.page | 24 +
doc/mallard/C/mal_table_td.page | 20 +
doc/mallard/C/mal_table_tr.page | 38 +
.../mallard/C/principle-guide.page | 5 +-
.../mallard/C/principle-justenough.page | 6 +-
.../mallard/C/principle-redundancy.page | 6 +-
.../mallard/C/principles.page | 12 +-
.../spec/mallard.xml => doc/mallard/C/spec.page | 17 +-
.../10minutes.xml => doc/mallard/C/tenminutes.page | 11 +-
doc/mallard/Makefile.am | 8 +
doc/xslt/C/gnome-doc-xslt.xml | 1 +
rng/Makefile.am | 1 +
rng/mallard/Makefile.am | 22 +
{sandbox/mallard/xslt => rng/mallard}/mal2rnc.xsl | 0
{sandbox/mallard/rng => rng/mallard}/rnc2rng.awk | 0
sandbox/mallard/html/Makefile | 47 +-
sandbox/mallard/rng/Makefile | 23 -
sandbox/mallard/spec/legal.xml | 9 -
sandbox/mallard/spec/mal_block.xml | 64 --
sandbox/mallard/spec/mal_block_code.xml | 66 --
sandbox/mallard/spec/mal_block_comment.xml | 62 --
sandbox/mallard/spec/mal_block_figure.xml | 25 -
sandbox/mallard/spec/mal_block_media.xml | 18 -
sandbox/mallard/spec/mal_block_note.xml | 17 -
sandbox/mallard/spec/mal_block_p.xml | 63 --
sandbox/mallard/spec/mal_block_quote.xml | 24 -
sandbox/mallard/spec/mal_block_screen.xml | 23 -
sandbox/mallard/spec/mal_block_synopsis.xml | 44 --
sandbox/mallard/spec/mal_caption.xml | 86 ---
sandbox/mallard/spec/mal_cite.xml | 43 --
sandbox/mallard/spec/mal_info.xml | 44 --
sandbox/mallard/spec/mal_info_copyright.xml | 31 -
sandbox/mallard/spec/mal_info_credit.xml | 27 -
sandbox/mallard/spec/mal_info_desc.xml | 17 -
sandbox/mallard/spec/mal_info_license.xml | 17 -
sandbox/mallard/spec/mal_info_link.xml | 31 -
sandbox/mallard/spec/mal_info_version.xml | 20 -
sandbox/mallard/spec/mal_inline.xml | 46 --
sandbox/mallard/spec/mal_inline_app.xml | 60 --
sandbox/mallard/spec/mal_inline_cmd.xml | 113 ---
sandbox/mallard/spec/mal_inline_code.xml | 68 --
sandbox/mallard/spec/mal_inline_em.xml | 75 --
sandbox/mallard/spec/mal_inline_file.xml | 34 -
sandbox/mallard/spec/mal_inline_gui.xml | 30 -
sandbox/mallard/spec/mal_inline_guiseq.xml | 30 -
sandbox/mallard/spec/mal_inline_input.xml | 29 -
sandbox/mallard/spec/mal_inline_key.xml | 18 -
sandbox/mallard/spec/mal_inline_keyseq.xml | 28 -
sandbox/mallard/spec/mal_inline_link.xml | 38 -
sandbox/mallard/spec/mal_inline_media.xml | 18 -
sandbox/mallard/spec/mal_inline_output.xml | 29 -
sandbox/mallard/spec/mal_inline_quote.xml | 38 -
sandbox/mallard/spec/mal_inline_span.xml | 19 -
sandbox/mallard/spec/mal_inline_sys.xml | 18 -
sandbox/mallard/spec/mal_inline_var.xml | 18 -
sandbox/mallard/spec/mal_list.xml | 29 -
sandbox/mallard/spec/mal_list_bullet.xml | 22 -
sandbox/mallard/spec/mal_list_definition.xml | 22 -
sandbox/mallard/spec/mal_list_numbered.xml | 22 -
sandbox/mallard/spec/mal_list_tree.xml | 22 -
sandbox/mallard/spec/mal_output.xml | 11 -
sandbox/mallard/spec/mal_page.xml | 22 -
sandbox/mallard/spec/mal_section.xml | 19 -
sandbox/mallard/spec/mal_table.xml | 797 --------------------
sandbox/mallard/spec/spec.xml | 17 -
sandbox/mallard/spec/spec_info.xml | 27 -
sandbox/mallard/spec/spec_pages.xml | 28 -
sandbox/mallard/xslt/mal-link.xsl | 111 ---
sandbox/mallard/xslt/mal2html-block.xsl | 289 -------
sandbox/mallard/xslt/mal2html-css.xsl | 134 ----
sandbox/mallard/xslt/mal2html-list.xsl | 90 ---
sandbox/mallard/xslt/mal2html-media.xsl | 41 -
sandbox/mallard/xslt/mal2html-page.xsl | 789 -------------------
sandbox/mallard/xslt/theme.xml | 43 --
sandbox/mallard/xslt/theme.xsl | 78 --
tools/Makefile.am | 2 +-
tools/gnome-doc-utils.pc.in | 2 +
xslt/Makefile.am | 2 +-
xslt/common/Makefile.am | 2 +-
xslt/common/theme.xsl | 11 +
.../mallard/xslt/util.xsl => xslt/common/utils.xsl | 44 +-
xslt/docbook/html/db2xhtml.xsl | 2 +-
xslt/mallard/Makefile.am | 1 +
xslt/mallard/common/Makefile.am | 5 +
xslt/mallard/common/mal-chunk.xsl | 85 +++
xslt/mallard/common/mal-link.xsl | 170 +++++
xslt/mallard/html/Makefile.am | 14 +
xslt/mallard/html/mal2html-block.xsl | 494 ++++++++++++
xslt/mallard/html/mal2html-css.xsl | 284 +++++++
.../xslt => xslt/mallard/html}/mal2html-inline.xsl | 211 ++++--
xslt/mallard/html/mal2html-list.xsl | 292 +++++++
xslt/mallard/html/mal2html-media.xsl | 96 +++
xslt/mallard/html/mal2html-page.xsl | 616 +++++++++++++++
.../xslt => xslt/mallard/html}/mal2html-table.xsl | 23 +-
.../xslt => xslt/mallard/html}/mal2html.xsl | 35 +-
.../mallard/html/mal2xhtml.xsl | 32 +-
xslt/mallard/utils/Makefile.am | 5 +
.../xslt => xslt/mallard/utils}/mal2cache.xsl | 2 +
169 files changed, 9799 insertions(+), 4269 deletions(-)
---
diff --cc configure.in
index 70cf900,35b4381..92853e2
--- a/configure.in
+++ b/configure.in
@@@ -57,7 -57,11 +57,9 @@@ doc/Makefil
doc/gnome-doc-make/Makefile
doc/xslt/Makefile
po/Makefile.in
+ rng/Makefile
+ rng/mallard/Makefile
tools/Makefile
-tools/gnome-doc-tool
-tools/gnome-doc-prepare
tools/gnome-doc-utils.pc
xslt/Makefile
xml2po/Makefile
@@@ -70,10 -74,14 +72,14 @@@ xslt/docbook/common/Makefil
xslt/docbook/html/Makefile
xslt/docbook/omf/Makefile
xslt/docbook/utils/Makefile
+ xslt/mallard/Makefile
+ xslt/mallard/common/Makefile
+ xslt/mallard/html/Makefile
+ xslt/mallard/utils/Makefile
xslt/gettext/Makefile
-],[
-chmod +x tools/gnome-doc-tool
-chmod +x tools/gnome-doc-prepare
])
+AC_CONFIG_FILES([tools/gnome-doc-tool],[chmod +x tools/gnome-doc-tool])
+AC_CONFIG_FILES([tools/gnome-doc-prepare],[chmod +x tools/gnome-doc-prepare])
+
AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
