dia r4070 - in trunk: . doc doc/en doc/en/ps/graphics doc/eu doc/fr doc/html doc/html/css doc/html/images doc/pl samples



Author: hans
Date: Sun Jun 22 14:59:45 2008
New Revision: 4070
URL: http://svn.gnome.org/viewvc/dia?rev=4070&view=rev

Log:
2008-06-22  Hans Breuer  <hans breuer org>

	[Patch from Thomas Harding improving the documentation generation]
	* doc/*/hardcopies.makefile : moved to $(top) directory
	* hardcopies.make : now uses dblatex or fallback on jw 
	  (jade/openjade wrapper).
	* doc/*/README.hardcopies : removed, now handled by configure
	* configure.in : check for and do documentation generation when 
	  given --with-hardbooks
	* doc/**/*.xml : dropping HTML entities, making dia-1.xml
	  independent from dia-cmdline.xml, dropping file extension from
	  graphics
	* doc/*dia-dbk-to-chapter.sed: removed leftovers from previous 
	  doc patch (was too fragile)
	* doc/html/images/caution.svg
	  doc/html/images/important.svg
	  doc/html/images/note.svg
	  doc/html/images/tip.svg
	  doc/html/images/prev.svg
	  doc/html/images/home.svg
	  doc/html/images/next.svg
	  doc/html/images/warning.svg
	  doc/html/images/up.svg
	  doc/html/css/dia.css: new files - images for admonitions and 
	  callouts (for html version)
	* doc/fr/dia.xml: switched encoding to utf8 (more versatile for
	  inexperienced maintainers (needs no entities for specific 
	  glyphs such as ISO entity "oelig" or "laquo"...)
	* doc/pl/*.xml: updated some from *.sgml, corrected encoding to 
	  iso-8859-2.  Corrected graphics "filetype" attribute to 
	  uppercase "PNG".
	* Adding Changelog-tmp, which may be dropped at any time.
	* doc/*/dia-*.omf: make indexation really works with
	  scrollkeeper (which extends omf format). Now yelp shows
	  dia manual in its TOC/whatever.

	* doc/(en|fr)/dia-cmdline.xml : added from my working copy, not sure 
	where it came from ;) The 'fr' version needs translation.
	* doc/Makefile.am : temporary disabled due to build problems
	* doc/*/*.dia : svn mv doc/en/dia.dia ../samples/Self/
	  svn rm fr/dia.dia - there is no relation to the rest of docs
	* doc/hardcopies.make : don't (un)install-examples




Added:
   trunk/doc/en/dia-cmdline.xml
   trunk/doc/en/ps/graphics/preferences_fig.eps
      - copied unchanged from r4069, /trunk/doc/en/ps/graphics/preferences-fig.eps
   trunk/doc/html/
   trunk/doc/html/css/
   trunk/doc/html/css/dia.css
   trunk/doc/html/images/
   trunk/doc/html/images/caution.svg
   trunk/doc/html/images/home.svg
   trunk/doc/html/images/important.svg
   trunk/doc/html/images/next.svg
   trunk/doc/html/images/note.svg
   trunk/doc/html/images/prev.svg
   trunk/doc/html/images/tip.svg
   trunk/doc/html/images/up.svg
   trunk/doc/html/images/warning.svg
   trunk/hardcopies.make
Removed:
   trunk/doc/en/README.hardcopies
   trunk/doc/en/ps/graphics/preferences-fig.eps
   trunk/doc/fr/README.hardcopies
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/doc/Makefile.am
   trunk/doc/en/Makefile.am
   trunk/doc/en/dia-1.xml
   trunk/doc/en/dia-C.omf
   trunk/doc/en/dia-dbk-to-chapter.sed
   trunk/doc/en/dia.xml
   trunk/doc/en/hardcopies.makefile
   trunk/doc/en/html.xsl
   trunk/doc/en/usage-customization.xml
   trunk/doc/en/usage-objects.xml
   trunk/doc/en/usage-quickstart.xml
   trunk/doc/eu/Makefile.am
   trunk/doc/eu/dia-eu.omf
   trunk/doc/eu/dia.1
   trunk/doc/eu/dia.dbk
   trunk/doc/eu/dia.xml
   trunk/doc/eu/usage-objects.xml
   trunk/doc/eu/usage-quickstart.xml
   trunk/doc/fr/Makefile.am
   trunk/doc/fr/custom-shapes.xml
   trunk/doc/fr/dia-1.xml
   trunk/doc/fr/dia-dbk-to-chapter.sed
   trunk/doc/fr/dia-fr.omf
   trunk/doc/fr/dia.xml
   trunk/doc/fr/hardcopies.makefile
   trunk/doc/fr/html.xsl
   trunk/doc/fr/notes.xml
   trunk/doc/fr/usage-customization.xml
   trunk/doc/fr/usage-layers.xml
   trunk/doc/fr/usage-loadsave.xml
   trunk/doc/fr/usage-objects-basic.xml
   trunk/doc/fr/usage-objects-selecting.xml
   trunk/doc/fr/usage-objects.xml
   trunk/doc/fr/usage-quickstart.xml
   trunk/doc/pl/Makefile.am
   trunk/doc/pl/authors.xml
   trunk/doc/pl/dia-pl.omf
   trunk/doc/pl/dia.xml
   trunk/doc/pl/intro.xml
   trunk/doc/pl/license.xml
   trunk/doc/pl/usage-canvas.xml
   trunk/doc/pl/usage-customization.xml
   trunk/doc/pl/usage-layers.xml
   trunk/doc/pl/usage-loadsave.xml
   trunk/doc/pl/usage-objects-selecting.xml
   trunk/doc/pl/usage-objects-special.xml
   trunk/doc/pl/usage-objects.xml
   trunk/doc/pl/usage-quickstart.xml
   trunk/omf.make
   trunk/samples/Makefile.am
   trunk/xmldocs.make

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jun 22 14:59:45 2008
@@ -474,6 +474,47 @@
 fi
 AM_CONDITIONAL(WITH_SWIG, test "x$with_swig" != "xno")
 
+
+
+dnl
+dnl html, pdf and postscript documentation
+dnl
+AC_ARG_WITH(hardbooks,
+[  --with-hardbooks	compile html, pdf and postscript documentation],,hardbooks=no)
+AC_PATH_PROG(DBLATEX,dblatex,no)
+AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
+AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno")
+AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno")
+dnl
+dnl use jw only if we don't find dblatex
+dnl
+AC_PATH_PROG(JW,jw,no)
+if  test "x$dblatex" == "xno"; then
+ AM_CONDITIONAL(WITH_JW, test "x$jw" != "xno")	
+else
+ AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+fi
+hardbook_ok=no
+xsltproc_ok=no
+if test "x$hardbooks" == "xno"; then
+  AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
+  AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
+else
+  if test "x$dblatex" != "xno" ; then
+    hardbook_ok=yes
+  else 
+    if test "x$jw" != "xno" ; then
+      hardbook_ok=yes
+    fi
+  fi
+  if test "x$xsltproc" != "xno" ; then
+    xsltproc_ok=yes
+  fi
+fi
+
+
 AC_OUTPUT(
 Makefile
 lib/Makefile
@@ -594,6 +635,8 @@
 	Gnome Print support (experimental):	${with_gnomeprint}
 	Dia Python bindings with SWIG		${with_swig}
 	WMF plug-in with libEMF:                ${emf_ok}
+	html doc:                               ${xsltproc_ok}
+	pdf and ps doc:                         ${hardbook_ok}
 "
 
 echo "Now type make to build dia..."

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	(original)
+++ trunk/doc/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,5 +1,6 @@
+docname = dia
 
-SUBDIRS = en eu pl fr
+SUBDIRS = en fr eu pl
 
 EXTRA_DIST = \
 	custom-shapes \
@@ -8,13 +9,27 @@
 	sheet.dtd
 
 if HAVE_GNOME
-helpdir = $(datadir)/gnome/help/dia
+helpdir = $(datadir)/gnome/help/$(docname)
 else
 helpdir = $(pkgdatadir)/help
 endif
 
+sysdoc = $(datadir)/doc/$(docname)
+
+
+
 # a simple rule to symlink en to C
-install-data-local:
+install-data-local: $(distfiles)
 	-(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C)
+	$(mkinstalldirs) $(sysdoc)
+	for i in $^; do \
+	  if test -f "$$i"; then  \
+	    echo "installing $$i" ;\
+	    $(INSTALL_DATA) $$i $(sysdoc)/$$(basename $$i); \
+	  fi ; \
+	done
+
 uninstall-local:
 	rm -f $(DESTDIR)$(helpdir)/C
+	-rm -f $(sysdoc)/*
+

Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am	(original)
+++ trunk/doc/en/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,17 +1,35 @@
-figdir=graphics
-docname=dia
-lang=en
-omffile=
-entities=
+docname = dia
+lang = en
+figdir = graphics
+omffile = dia-C.omf
+entities =
+version = 0.5
+progname = dia
+progfiles_extension = dia
+PAPERSIZE = Legal
+## document encoding
+DOCUMENT_ENCODING = ISO-8859-1
+## postscript output resolution (dpi)
+RESOLUTION = 600
+## dblatex tex document charset
+ENCODING = utf8
+UNICODE = 1
+## TeX papersize/sides
+LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
+
 
 include $(top_srcdir)/xmldocs.make
+
 dist-hook: app-dist-hook
 
 nodist_include_EXTRAS = dia.1
 
+
+
 xml_files += \
 	authors.xml \
 	dia.xml \
+	dia-cmdline.xml \
 	entities.xml \
 	intro.xml \
 	license.xml \
@@ -25,31 +43,77 @@
 	usage-objects.xml \
 	usage-quickstart.xml \
 	custom-shapes.xml \
-	dia-cmdline.xml \
 	dia-1.xml
 
 
 EXTRA_DIST += \
 	dia.dbk \
 	dia-1.xml
-#	dia-dbk-to-chapter.sed
-#	graphics/line_props.png \
-#	graphics/home_network.png \
-#	graphics/line_icon.png \
-#	graphics/greendots.png
 
-DISTCLEANFILES = dia-cmdline.xml
+##	graphics/line_props.png \
+##	graphics/home_network.png \
+##	graphics/line_icon.png \
+##	graphics/greendots.png
+
+pngfigures = \
+	graphics/greendots.png \
+	graphics/line_icon.png \
+	graphics/color_selector.png \
+	graphics/home_network.png \
+	graphics/line_props.png \
+	graphics/preferences_fig.png
+
+
+epsfigures = \
+	ps/graphics/color_selector.eps \
+	ps/graphics/preferences_fig.eps
+
+xmlsources = \
+	dia-1.xml \
+	dia-cmdline.xml \
+	authors.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	custom-shapes.xml \
+	dia.xml \
+	usage-loadsave.xml \
+	entities.xml \
+	usage-objects-basic.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml
+
+
+htmlstyle = \
+	html.xsl
+
+
+metadata = \
+	dia-C.omf \
+	topic.dat
+
+examples = \
+	$(progname).$(progfiles_extension) \
+	../shape.dtd \
+	../diagram.dtd \
+	../sheet.dtd
+
+
+DISTCLEANFILES = 
 
 if HAVE_DB2MAN
-# Anyone out there who understands automake?
+## Anyone out there who understands automake?
 DISTCLEANFILES += dia.1
-# If we want misconfigured XML catalogs to not try net access, use
-# --nonet.  But I don't think that's going to solve more problems
-# than it causes.
+## If we want misconfigured XML catalogs to not try net access, use
+## --nonet.  But I don't think that's going to solve more problems
+## than it causes.
 dia.1: dia.dbk
 	xsltproc --novalid $(DB2MAN) $< >dia.1
 
 man_MANS = dia.1
 endif
 
-

Modified: trunk/doc/en/dia-1.xml
==============================================================================
--- trunk/doc/en/dia-1.xml	(original)
+++ trunk/doc/en/dia-1.xml	Sun Jun 22 14:59:45 2008
@@ -1,347 +1,347 @@
-  <refentryinfo>
-    <copyright>
-      <year>1999</year>
-      <year>2004</year>
-      <holder>Fredrik Hallenberg, W. Borgert, Alan Horkan</holder>
-    </copyright>
-    <date>2004-11-26</date>
-    <authorgroup>
-      <author>
-	<firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email>
-      </author>
-      <author>
-	<firstname>W.</firstname>
-	<surname>Borgert</surname>
-	<email>debacle debian org</email>
-      </author>
-      <author>
-	<firstname>Alan</firstname>
-	<surname>Horkan</surname>
-	<email>horkana tcd ie</email>
-      </author>
-    </authorgroup>
-    <revhistory>
-      <revision>
-	<revnumber>4</revnumber>
-	<date>2004-11-26</date>
-	<authorinitials>AH</authorinitials>
-	<revremark>added to See Also, corrected grammar</revremark>
-      </revision>
-      <revision>
-	<revnumber>3</revnumber>
-	<date>2003-11-26</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>added --size option</revremark>
-      </revision>
-      <revision>
-	<revnumber>2</revnumber>
-	<date>2003-10-16</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>added different EPS variants and section on
-	files</revremark>
-      </revision>
-      <revision>
-	<revnumber>1</revnumber>
-	<date>2003-10-12</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>1st DocBook/XML version</revremark>
-      </revision>
-    </revhistory>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>dia</refentrytitle>
-
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>dia</refname>
-
-    <refpurpose>a diagram drawing program</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dia</command>
-
-      <arg><option>-c</option></arg>
-
-      <arg><option>--credits</option></arg>
-
-      <arg><option>-e <replaceable>OUTPUT</replaceable></option></arg>
-
-      <arg><option>--export=<replaceable>OUTPUT</replaceable></option></arg>
-
-      <arg><option>-L <replaceable>LAYER,LAYER,...</replaceable></option></arg>
-
-      <arg><option>--show-layers=<replaceable>LAYER,LAYER,...</replaceable></option></arg>
-
-      <arg><option>-h</option></arg>
-
-      <arg><option>--help</option></arg>
-
-      <arg><option>-n</option></arg>
-
-      <arg><option>--nosplash</option></arg>
-
-      <arg><option>-s <replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>--size=<replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>-t <replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>--filter=<replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>-v</option></arg>
-
-      <arg><option>--version</option></arg>
-
-      <arg>file ...</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>Dia</command> is used to create diagrams.  Dia has
-    a number of basic tools, like lines and boxes but can also
-    dynamically load <emphasis>sheets</emphasis>.  A sheet is a
-    collection of tools that are used in a certain type of
-    diagram.</para>
-
-    <para>Most diagram objects in <command>Dia</command> have
-    <emphasis>connection points</emphasis>.  Lines can be connected to
-    these connection points and this way graph structures can be formed.
-    When objects are moved or resized the connections will follow the
-    objects.</para>
-
-    <para>Diagrams drawn in <command>Dia</command> can be exported as
-    PostScript.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para><command>Dia</command> accepts the following options:</para>
-
-    <variablelist>
-      <varlistentry>
-	<term><option>-c</option>
-	  <option>--credits</option></term>
-	<listitem>
-	  <para>Display credits list and exit.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-e <replaceable>OUTPUT</replaceable></option>
-	  <option>--export=<replaceable>OUTPUT</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file to OUTPUT and exit.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-h</option>
-	  <option>--help</option></term>
-	<listitem>
-	  <para>Display a list of all commandline options.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-n</option>
-	  <option>--nosplash</option></term>
-	<listitem>
-	  <para>Do not show the splash screen.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-s <replaceable>WxH</replaceable></option>
-	  <option>--size=<replaceable>WxH</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file in decimal given width and/or
-	  height.  It is allowed to only select width or height.
-	  E.g. <option>--size=<replaceable>520x</replaceable></option>
-	  exports an image that is 520 pixels wide, while
-	  <option>--size=<replaceable>x900</replaceable></option>
-	  exports an image of 900 pixels height.</para>
-
-	  <note>
-	    <para>This option is currently only implemented for the
-	    PNG export filter.</para>
-	  </note>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-L <replaceable>LAYER,LAYER,...</replaceable></option>
-	  <option>--show-layers=<replaceable>LAYER,LAYER,...</replaceable></option></term>
-	<listitem>
-	  <para>Only include specified layers when exporting. Layers can be
-	  specified either as a layer name, the layer number or a numeric
-	  range X-Y of layers. --show-layers=background,2-5 shows the layer
-	  named background and layers 2-5, --show-layers=2- shows layers 2 and
-	  up.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-t <replaceable>FORMAT</replaceable></option>
-	  <option>--export-to-format=<replaceable>FORMAT</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file in FORMAT and exit.  Format are
-	  described below.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-v</option>
-	  <option>--version</option></term>
-	<listitem>
-	  <para>Display <command>dia</command> version and exit.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Export Formats</title>
-
-    <para>The following export formats are supported by
-    <command>dia</command>.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><literal>cgm</literal> (Computer Graphics Metafile, ISO
-        8632)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>dia</literal> (Native dia diagram)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>dxf</literal> (Drawing Interchange File)</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>eps</literal>  or
-	<literal>eps-builtin</literal> or <literal>eps-pango</literal>
-	(Encapsulated PostScript)</para>
-
-        <para>The format specifications <literal>eps</literal> and <literal>eps-pango</literal> both
-	use the font renderer of the Pango library, while
-        <literal>eps-builtin</literal> uses a dia specific font
-        renderer.  If you have problems with Pango rendering,
-        e.g. Unicode, try <literal>eps-builtin</literal>
-	instead.</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>fig</literal> (XFig format)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>mp</literal> (TeX MetaPost macros)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>plt</literal> or <literal>hpgl</literal> (HP
-	Graphics Language)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>png</literal> (Portable Network
-	Graphics)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>shape</literal> (Dia Shape File)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>svg</literal> (Scalable Vector Graphics)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>tex</literal> (TeX PSTricks macros)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>wpg</literal> (WordPerfect Graphics)</para>
-      </listitem>
-
-      <listitem arch="win32">
-	<para><literal>wmf</literal> (Windows MetaFile)</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>Files</title>
-
-    <para><command>dia</command> creates a directory
-    <filename>.dia</filename> in the user&apos;s home, which contains
-    different files to store user preferences.  To reset
-    <command>dia</command> to it&apos;s default behaviour, just remove
-    the respective file:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><filename>defaults.dia</filename>: contains default
-        values for elements (XML format).</para>
-      </listitem>
-      <listitem>
-	<para><filename>diarc</filename>: keeps
-        <command>dia</command> preferences (ASCII).</para>
-      </listitem>
-      <listitem>
-	<para><filename>history</filename>: keeps the list of last
-        edited diagrams (ASCII).</para>
-      </listitem>
-      <listitem>
-	<para><filename>menurc</filename>: contains an automated
-	accelerator map dump (Lisp).</para>
-      </listitem>
-      <listitem>
-	<para><filename>persistence</filename>: contains GUI
-	information, e.g. open windows (XML).</para>
-      </listitem>
-      <listitem>
-	<para><filename>pluginrc</filename>: the list of loaded
-	plugins (XML).</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
-    <para>X (1)</para>
-    <para>xfig (1)</para>
-    <para>inkscape (1)</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Copyright</title>
-
-    <para>Copyright 1999 Alexander Larsson.</para>
-
-    <para>Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without fee is
-    hereby granted, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Authors</title>
-
-    <para><author><firstname>Alexander</firstname>
-	<surname>Larsson</surname>
-	<email>alla lysator liu se</email></author></para>
-
-    <para>This manual was written by
-    <author><firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email></author>.</para>
-  </refsect1>
+  <refentryinfo>
+    <copyright>
+      <year>1999</year>
+      <year>2004</year>
+      <holder>Fredrik Hallenberg, W. Borgert, Alan Horkan</holder>
+    </copyright>
+    <date>2004-11-26</date>
+    <authorgroup>
+      <author>
+	<firstname>Fredrik</firstname>
+	<surname>Hallenberg</surname>
+	<email>hallon lysator liu se</email>
+      </author>
+      <author>
+	<firstname>W.</firstname>
+	<surname>Borgert</surname>
+	<email>debacle debian org</email>
+      </author>
+      <author>
+	<firstname>Alan</firstname>
+	<surname>Horkan</surname>
+	<email>horkana tcd ie</email>
+      </author>
+    </authorgroup>
+    <revhistory>
+      <revision>
+	<revnumber>4</revnumber>
+	<date>2004-11-26</date>
+	<authorinitials>AH</authorinitials>
+	<revremark>added to See Also, corrected grammar</revremark>
+      </revision>
+      <revision>
+	<revnumber>3</revnumber>
+	<date>2003-11-26</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>added --size option</revremark>
+      </revision>
+      <revision>
+	<revnumber>2</revnumber>
+	<date>2003-10-16</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>added different EPS variants and section on
+	files</revremark>
+      </revision>
+      <revision>
+	<revnumber>1</revnumber>
+	<date>2003-10-12</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>1st DocBook/XML version</revremark>
+      </revision>
+    </revhistory>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>dia</refentrytitle>
+
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>dia</refname>
+
+    <refpurpose>a diagram drawing program</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>dia</command>
+
+      <arg><option>-c</option></arg>
+
+      <arg><option>--credits</option></arg>
+
+      <arg><option>-e <replaceable>OUTPUT</replaceable></option></arg>
+
+      <arg><option>--export=<replaceable>OUTPUT</replaceable></option></arg>
+
+      <arg><option>-L <replaceable>LAYER,LAYER,...</replaceable></option></arg>
+
+      <arg><option>--show-layers=<replaceable>LAYER,LAYER,...</replaceable></option></arg>
+
+      <arg><option>-h</option></arg>
+
+      <arg><option>--help</option></arg>
+
+      <arg><option>-n</option></arg>
+
+      <arg><option>--nosplash</option></arg>
+
+      <arg><option>-s <replaceable>WxH</replaceable></option></arg>
+
+      <arg><option>--size=<replaceable>WxH</replaceable></option></arg>
+
+      <arg><option>-t <replaceable>FORMAT</replaceable></option></arg>
+
+      <arg><option>--filter=<replaceable>FORMAT</replaceable></option></arg>
+
+      <arg><option>-v</option></arg>
+
+      <arg><option>--version</option></arg>
+
+      <arg>file ...</arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><command>Dia</command> is used to create diagrams.  Dia has
+    a number of basic tools, like lines and boxes but can also
+    dynamically load <emphasis>sheets</emphasis>.  A sheet is a
+    collection of tools that are used in a certain type of
+    diagram.</para>
+
+    <para>Most diagram objects in <command>Dia</command> have
+    <emphasis>connection points</emphasis>.  Lines can be connected to
+    these connection points and this way graph structures can be formed.
+    When objects are moved or resized the connections will follow the
+    objects.</para>
+
+    <para>Diagrams drawn in <command>Dia</command> can be exported as
+    PostScript.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Options</title>
+
+    <para><command>Dia</command> accepts the following options:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><option>-c</option>
+	  <option>--credits</option></term>
+	<listitem>
+	  <para>Display credits list and exit.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-e <replaceable>OUTPUT</replaceable></option>
+	  <option>--export=<replaceable>OUTPUT</replaceable></option></term>
+	<listitem>
+	  <para>Export loaded file to OUTPUT and exit.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-h</option>
+	  <option>--help</option></term>
+	<listitem>
+	  <para>Display a list of all commandline options.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-n</option>
+	  <option>--nosplash</option></term>
+	<listitem>
+	  <para>Do not show the splash screen.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-s <replaceable>WxH</replaceable></option>
+	  <option>--size=<replaceable>WxH</replaceable></option></term>
+	<listitem>
+	  <para>Export loaded file in decimal given width and/or
+	  height.  It is allowed to only select width or height.
+	  E.g. <option>--size=<replaceable>520x</replaceable></option>
+	  exports an image that is 520 pixels wide, while
+	  <option>--size=<replaceable>x900</replaceable></option>
+	  exports an image of 900 pixels height.</para>
+
+	  <note>
+	    <para>This option is currently only implemented for the
+	    PNG export filter.</para>
+	  </note>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-L <replaceable>LAYER,LAYER,...</replaceable></option>
+	  <option>--show-layers=<replaceable>LAYER,LAYER,...</replaceable></option></term>
+	<listitem>
+	  <para>Only include specified layers when exporting. Layers can be
+	  specified either as a layer name, the layer number or a numeric
+	  range X-Y of layers. --show-layers=background,2-5 shows the layer
+	  named background and layers 2-5, --show-layers=2- shows layers 2 and
+	  up.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-t <replaceable>FORMAT</replaceable></option>
+	  <option>--export-to-format=<replaceable>FORMAT</replaceable></option></term>
+	<listitem>
+	  <para>Export loaded file in FORMAT and exit.  Format are
+	  described below.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-v</option>
+	  <option>--version</option></term>
+	<listitem>
+	  <para>Display <command>dia</command> version and exit.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Export Formats</title>
+
+    <para>The following export formats are supported by
+    <command>dia</command>.</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>cgm</literal> (Computer Graphics Metafile, ISO
+        8632)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dia</literal> (Native dia diagram)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dxf</literal> (Drawing Interchange File)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>eps</literal>  or
+	<literal>eps-builtin</literal> or <literal>eps-pango</literal>
+	(Encapsulated PostScript)</para>
+
+        <para>The format specifications <literal>eps</literal> and <literal>eps-pango</literal> both
+	use the font renderer of the Pango library, while
+        <literal>eps-builtin</literal> uses a dia specific font
+        renderer.  If you have problems with Pango rendering,
+        e.g. Unicode, try <literal>eps-builtin</literal>
+	instead.</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>fig</literal> (XFig format)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>mp</literal> (TeX MetaPost macros)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>plt</literal> or <literal>hpgl</literal> (HP
+	Graphics Language)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>png</literal> (Portable Network
+	Graphics)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>shape</literal> (Dia Shape File)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>svg</literal> (Scalable Vector Graphics)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>tex</literal> (TeX PSTricks macros)</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>wpg</literal> (WordPerfect Graphics)</para>
+      </listitem>
+
+      <listitem arch="win32">
+	<para><literal>wmf</literal> (Windows MetaFile)</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>Files</title>
+
+    <para><command>dia</command> creates a directory
+    <filename>.dia</filename> in the user&apos;s home, which contains
+    different files to store user preferences.  To reset
+    <command>dia</command> to it&apos;s default behaviour, just remove
+    the respective file:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><filename>defaults.dia</filename>: contains default
+        values for elements (XML format).</para>
+      </listitem>
+      <listitem>
+	<para><filename>diarc</filename>: keeps
+        <command>dia</command> preferences (ASCII).</para>
+      </listitem>
+      <listitem>
+	<para><filename>history</filename>: keeps the list of last
+        edited diagrams (ASCII).</para>
+      </listitem>
+      <listitem>
+	<para><filename>menurc</filename>: contains an automated
+	accelerator map dump (Lisp).</para>
+      </listitem>
+      <listitem>
+	<para><filename>persistence</filename>: contains GUI
+	information, e.g. open windows (XML).</para>
+      </listitem>
+      <listitem>
+	<para><filename>pluginrc</filename>: the list of loaded
+	plugins (XML).</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
+    <para>X (1)</para>
+    <para>xfig (1)</para>
+    <para>inkscape (1)</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Copyright</title>
+
+    <para>Copyright 1999 Alexander Larsson.</para>
+
+    <para>Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without fee is
+    hereby granted, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Authors</title>
+
+    <para><author><firstname>Alexander</firstname>
+	<surname>Larsson</surname>
+	<email>alla lysator liu se</email></author></para>
+
+    <para>This manual was written by
+    <author><firstname>Fredrik</firstname>
+	<surname>Hallenberg</surname>
+	<email>hallon lysator liu se</email></author>.</para>
+  </refsect1>

Modified: trunk/doc/en/dia-C.omf
==============================================================================
--- trunk/doc/en/dia-C.omf	(original)
+++ trunk/doc/en/dia-C.omf	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE omf PUBLIC "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
 <omf>
   <resource>
    <creator>Henry House</creator>
@@ -11,17 +12,24 @@
    <contributor>Fredrik Hallenberg</contributor>
    <contributor>W. Borgert</contributor>
    <contributor>Thomas Harding</contributor>
-
-    <title>
-      The Dia Manual
-    </title>
-    <date>05/20/2007</date>
-    <version identifier="0.5" date="05/20/2007" />
-    <subject>
-      <category>GNOME|Office</category>
-   </subject>
-   <format mime="text/sgml"/>
-   <identifier url="panel.sgml"/>
-   <language code="en" />
+   <title>The Dia Manual</title>
+   <date>05/20/2007</date>
+   <version id="dia-manual-C-0.5-2" identifier="0.5-2" date="05-26-2008" description="no significant changes" />
+   <!-- please specify subject for your distribution 
+        as ANOTHER "subject" element -->
+   <subject category="GNOME|Applications|Graphics"></subject>
+   <subject category="GNOME|Applications|Office"></subject>
+   <subject category="Applications|Multimedia|Graphics"></subject>
+   <subject category="GNOME|Office"></subject>
+   <description>
+	The Dia Manual, Dia: the diagram editor
+   </description>
+   <type>
+     user's guide
+   </type>
+   <format mime="application/xml" dtd="-//OASIS//DTD DocBook XML V4.4//EN" />
+   <identifier url="file:///usr/local/share/dia/doc/dia.xml"/>
+   <language code="C" />
+   <relation seriesid="dia" />
  </resource>
 </omf>

Added: trunk/doc/en/dia-cmdline.xml
==============================================================================
--- (empty file)
+++ trunk/doc/en/dia-cmdline.xml	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,21 @@
+<chapter id="commandline" label="12"> 
+  <title>Dia command line</title> 
+    <sect1 id="commandline-intro"> 
+        <title>Introduction</title> 
+        <para> 
+        Dia can be used via command line, 
+        And, more, FROM command-line (batch treatment, 
+        e.g. to export to another file format). 
+        Do not forgot <option>--nosplash</option> option 
+        in case of usage of dia from command line,  
+        to avoid Dia's splash screen. 
+        </para> 
+    </sect1> 
+    <sect1 id="commandline-manpage"> 
+        <title>Command line manual</title>
+
+<refentry>
+&DIA-1;
+</refentry>
+    </sect1> 
+</chapter>

Modified: trunk/doc/en/dia-dbk-to-chapter.sed
==============================================================================
--- trunk/doc/en/dia-dbk-to-chapter.sed	(original)
+++ trunk/doc/en/dia-dbk-to-chapter.sed	Sun Jun 22 14:59:45 2008
@@ -1,19 +0,0 @@
-1,+2d;4a \
-<chapter id="commandline" label="12"> \
-  <title>Dia command line</title> \
-    <sect1 id="commandline-intro"> \
-        <title>Introduction</title> \
-        <para> \
-        Dia can be used via command line, \
-        And, more, FROM command-line (batch treatment, \
-        e.g. to export to another file format). \
-        Do not forgot <option>--nosplash</option> option \
-        in case of usage of dia from command line,  \
-        to avoid Dia's splash screen. \
-        </para> \
-    </sect1> \
-    <sect1 id="commandline-manpage"> \
-        <title>Command line manual</title>
-; $a \
-    </sect1> \
-</chapter>

Modified: trunk/doc/en/dia.xml
==============================================================================
--- trunk/doc/en/dia.xml	(original)
+++ trunk/doc/en/dia.xml	Sun Jun 22 14:59:45 2008
@@ -38,9 +38,10 @@
 
     <!ENTITY LICENSE SYSTEM "license.xml">
 
-    <!ENTITY pngfile "png">
-
     <!ENTITY DIA-1 SYSTEM "dia-1.xml">
+
+    <!ENTITY % local_entities SYSTEM "entities.xml">
+    %local_entities;
   ]
 
 >
@@ -68,6 +69,13 @@
    <holder>Alan Horkan</holder>
 
   </copyright>                                                  
+  <authorgroup>
+   <author><firstname>Kevin</firstname><surname>Breit</surname></author>
+   <author><firstname>Henry</firstname><surname>House</surname></author>
+   <author><firstname>Judith</firstname><surname>Samson</surname></author>
+   <author><firstname>Alan</firstname><surname>Horkan</surname></author>
+   <author><firstname>Thomas</firstname><surname>Harding</surname></author>
+  </authorgroup>
 
 
 
@@ -120,6 +128,15 @@
    This is version 0.5 of the Dia manual.
 
   </releaseinfo>
+  <revhistory>
+  <revision>
+    <revnumber>0.5-2</revnumber>
+    <date>2008-27-05</date>
+    <authorinitials>HDG</authorinitials>
+    <revremark>dropping HTML entities, making dia-1.xml independant from dia-cmdline.xml,
+    dropping file extension from graphics</revremark>
+  </revision>
+  </revhistory>
 
  </bookinfo>
 

Modified: trunk/doc/en/hardcopies.makefile
==============================================================================
--- trunk/doc/en/hardcopies.makefile	(original)
+++ trunk/doc/en/hardcopies.makefile	Sun Jun 22 14:59:45 2008
@@ -1,250 +0,0 @@
-#
-# build and install html, ps and pdf documentation
-#
-srcdir = .
-figdir = graphics
-INSTALL_DATA = /usr/bin/install
-sysdoc = $(datadir)/doc/$(docname)
-papersize = Letter
-encoding = "utf-8"
-eps_figures = color_selector.eps \
-			preferences-fig.eps
-
-ifdef WITH_HTMLDOC
-htmldoc = dia.html
-html_install = install-html
-html_uninstall = uninstall-html
-html_clean = clean-html
-else
-htmldoc =
-html_install =
-html_uninstall =
-html_clean =
-endif
-
-ifdef WITH_PDFDOC
-pdfdoc = dia.pdf
-pdf_install = install-pdf
-pdf_uninstall = uninstall-pdf
-pdf_clean = clean-pdf
-else
-pdfdoc =
-pdf_install =
-pdf_uninstall =
-pdf_clean =
-endif
-
-ifdef WITH_PSDOC
-psdoc = dia.ps
-ps_install = install-ps
-ps_uninstall = uninstall-ps
-ps_clean = clean-ps
-else
-psdoc =
-ps_install =
-ps_uninstall =
-ps_clean =
-endif
-
-all: mk-chapter-cmdline
-
-dia.html: dia.xml
-	install -d $(srcdir)/html
-	cd $(srcdir)/html && xsltproc ../html.xsl ../dia.xml
-
-dia.pdf: dia.xml
-	export SP_ENCODING=$(encoding) ; \
-	jw -b pdf -V paper-type=$(papersize) -V paper-size=$(papersize) -o pdf/  $<
-
-dia.ps: dia.xml
-	mkdir -p $(srcdir)/ps/$(figdir)/
-	if test "$(figdir)"; then \
-	  for file in $(figdir)/*.png ; do \
-	    destfile=$(srcdir)/ps/$(figdir)/`basename $$file .png`.eps ; \
-	    if test ! -f $$destfile ; then \
-	        convert $(srcdir)/$$file $$destfile; \
-	    fi ; \
-	  done ; \
-	fi
-	sed -e 's/<!ENTITY pngfile "png">/<!ENTITY pngfile "eps">/' $< >doc-ps.xml
-	export SP_ENCODING=$(encoding) ; \
-    jw -b ps -V paper-type=$(papersize) -V paper-size=$(papersize) -o ps/ doc-ps.xml
-	rm doc-ps.xml
-	mv ps/doc-ps.ps ps/`basename $< .xml`.ps
-    
-mk-chapter-cmdline: dia.dbk
-	sed -f dia-dbk-to-chapter.sed $< > dia-cmdline.xml
-	 
-pdf_docs = \
-	dia.pdf
-	 
-ps_docs = \
-	dia.ps
-
-dia_examples = \
-	dia.dia
-
-
-install-html:
-	@list = `ls $(srcdir)/html`
-	$(mkinstalldirs) $(sysdoc)
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	$(mkinstalldirs) $(sysdoc)/$(lang)/$(figdir)
-	for i in $$list; do \
-	  file=$(srcdir)/html/$$i; \
-	  dest=`echo $$file | sed -e 's,^.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-	@list=`ls $(srcdir)/$(figdir)`
-	for i in $$list; do \
-	  file=$(srcdir)/$(figdir)/$$i; \
-	  dest=`echo $$file | sed -e 's,^.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-	
-
-uninstall-html:
-	@list='$(html_pages)'; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(helpdir)/$(lang)/$$file ; then \
-	    echo " rm -f $(helpdir)/$(lang)/$$file"; \
-	    rm -f $(helpdir)/$(lang)/$$file; \
-	  fi; \
-	done
-	@list=`ls $(srcdir)/$(figdir)`; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(helpdir)/$(lang)/$$file ; then \
-	    echo " rm -f $(helpdir)/$(lang)/$(figdir)/$$file"; \
-	    rm -f $(helpdir)/$(lang)/$(figdir)/$$lfile; \
-	  fi; \
-	done
-
-clean-html:
-	@list='$(html_pages)'; \
-	for i in $$list ; do \
-	  if test -f $(srcdir)/$$i; then \
-	    file=$(srcdir)/$$i; \
-	    else file=$$i;\
-	  fi; \
-	  if test -f $$file ; then \
-	    echo " rm -f $$file"; \
-	    rm -f $$file; \
-	  fi; \
-	done
-
-
-install-pdf:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(pdf_docs)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/pdf/$$i; then  \
-	    file=$(srcdir)/pdf/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-uninstall-pdf:
-	@list='$(pdf_docs)'; \
-	for i in $$list ; do \
-	  pdffile=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$pdffile ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$pdffile"; \
-	    rm -f $(sysdoc)/$(lang)/$$pdffile; \
-	  fi; \
-	done
-	rmdir $(sysdoc)/$(lang)
-	rmdir $(sysdoc)
-
-clean-pdf: 
-	rm $(srcdir)/pdf/*
-	rmdir $(srcdir)/pdf/
-
-
-install-ps:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(ps_docs)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/ps/$$i; then  \
-	    file=$(srcdir)/ps/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-uninstall-ps:
-	@list='$(ps_docs)'; \
-	for i in $$list ; do \
-	  psfile=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$psfile ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$psfile"; \
-	    rm -f $(sysdoc)/$(lang)/$$psfile; \
-	  fi; \
-	done
-
-clean-ps:
-	@list='$(ps_docs)'; \
-    for i in $$list ; do \
-	    rm $(srcdir)/ps/$$i ; \
-    done
-	@list='$(eps_figures)' ; \
-    for file in `ls ps/graphics/` ; do \
-        keep=0 ; \
-        for to_keep in @list ; do \
-            if test "$$file" = "$$to_keep" ; then \
-            keep=1 ; \
-        done ; \
-        if test $$keep = 0 ; then \
-            echo "rm -f ps/graphics/$$file" ; \
-            rm -f ps/graphics/$$file \
-        fi \
-    done   
-
-install-examples:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(dia_examples)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then  \
-	    file=$(srcdir)/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-
-uninstall-examples:
-	@list='$(dia_examples)'; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$file ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$file"; \
-	    rm -f $(sysdoc)/$(lang)/$$file; \
-	  fi; \
-	done
-
-
-cmdline-clean:
-	@list='dia-cmdline.xml'; \
-	for file in $$list ; do \
-	  if test -f $(srcdir)/$$file ; then \
-	    echo " rm -f $(srcdir)/$$file"; \
-	    rm -f $(srcdir)/$$file; \
-	  fi; \
-	done
-

Modified: trunk/doc/en/html.xsl
==============================================================================
--- trunk/doc/en/html.xsl	(original)
+++ trunk/doc/en/html.xsl	Sun Jun 22 14:59:45 2008
@@ -3,5 +3,37 @@
 
 <!-- <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl"></xsl:import> -->
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl";></xsl:import>
-<xsl:param name="html.stylesheet" select="'dia.css'"></xsl:param>
+
+<xsl:param name="make.valid.html" select="1"></xsl:param>
+<xsl:param name="html.cleanup" select="1"></xsl:param>
+<xsl:param name="generate.id.attributes" select="1"></xsl:param>
+
+<xsl:param name="html.stylesheet" select="'css/dia.css'"></xsl:param>
+
+<xsl:param name="preface.autolabel" select="i"></xsl:param>
+<xsl:param name="component.label.includes.part.label" select="0"></xsl:param>
+<xsl:param name="section.autolabel" select="1"></xsl:param>
+<xsl:param name="label.from.part" select="1"></xsl:param>
+<xsl:param name="section.label.includes.component.label" select="1"></xsl:param>
+
+<xsl:param name="admon.graphics" select="1"></xsl:param>
+<xsl:param name="admon.textlabel" select="0"></xsl:param>
+<xsl:param name="admon.style">
+  <xsl:text></xsl:text>
+</xsl:param>
+
+<xsl:param name="callout.unicode" select="1"></xsl:param>
+
+<xsl:param name="formal.title.placement">
+figure before
+example before
+equation before
+table before
+procedure before
+task before
+</xsl:param>
+<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+<xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
 </xsl:stylesheet>

Modified: trunk/doc/en/usage-customization.xml
==============================================================================
--- trunk/doc/en/usage-customization.xml	(original)
+++ trunk/doc/en/usage-customization.xml	Sun Jun 22 14:59:45 2008
@@ -16,7 +16,7 @@
       <title><interface>Preferences</interface> dialog box</title>
         <screenshot>
           <screeninfo><interface>Preferences.</interface>dialog box</screeninfo>
-            <graphic format="PNG" fileref="graphics/preferences_fig.&pngfile;"
+            <graphic format="PNG" fileref="graphics/preferences_fig"
                 srccredit="Jeremy" />
         </screenshot>
     </figure>

Modified: trunk/doc/en/usage-objects.xml
==============================================================================
--- trunk/doc/en/usage-objects.xml	(original)
+++ trunk/doc/en/usage-objects.xml	Sun Jun 22 14:59:45 2008
@@ -51,7 +51,7 @@
        <title>Adjuster Dots</title>
        <screenshot>
          <screeninfo>The green dots allow resizing the image.</screeninfo>
-         <graphic format="PNG" fileref="graphics/greendots.&pngfile;" srccredit=
+         <graphic format="PNG" fileref="graphics/greendots" srccredit=
 	 "Kevin Breit" />
        </screenshot>
      </figure> 
@@ -120,7 +120,7 @@
       <title>The line icon</title>
      <screenshot>
       <screeninfo>The line icon</screeninfo>
-      <graphic format="PNG" fileref="graphics/line_icon.&pngfile;" srccredit=
+      <graphic format="PNG" fileref="graphics/line_icon" srccredit=
       "Steffen Macke" />
       </screenshot>
     </figure>
@@ -137,7 +137,7 @@
     <title>Line properties</title>
       <screenshot>
         <screeninfo>The three sections are all described below.</screeninfo>
-        <graphic format="PNG" fileref="graphics/line_props.&pngfile;" 
+        <graphic format="PNG" fileref="graphics/line_props" 
 	srccredit="Kevin Breit" />
       </screenshot>
     </figure>
@@ -256,7 +256,7 @@
             <screenshot>
                 <screeninfo>The colors selector box is described below.</screeninfo>
                 <graphic format="PNG"
-                         fileref="graphics/color_selector.&pngfile;"
+                         fileref="graphics/color_selector"
                          srccredit="Jeremy" />
             </screenshot>
       </figure>

Modified: trunk/doc/en/usage-quickstart.xml
==============================================================================
--- trunk/doc/en/usage-quickstart.xml	(original)
+++ trunk/doc/en/usage-quickstart.xml	Sun Jun 22 14:59:45 2008
@@ -14,7 +14,7 @@
         <screeninfo>This is a diagram of a home network produced in under
         5 minutes using <application>Dia</application>.
         </screeninfo>
-        <graphic format="PNG" fileref="graphics/home_network.&pngfile;" srccredit=
+        <graphic format="PNG" fileref="graphics/home_network" srccredit=
 	"Kevin Breit" />
       </screenshot>
     </figure>

Modified: trunk/doc/eu/Makefile.am
==============================================================================
--- trunk/doc/eu/Makefile.am	(original)
+++ trunk/doc/eu/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,15 +1,31 @@
-figdir=graphics
 docname=dia
 lang=eu
-omffile=
+figdir=graphics
+omffile=dia-eu.omf
 entities=
+progname = dia
+progfiles_extension = dia
+PAPERSIZE = Legal
+## document encoding
+DOCUMENT_ENCODING = ISO-8859-1
+##postscript output resolution (dpi)
+RESOLUTION = 600
+## dblatex tex document charset
+ENCODING = utf8
+UNICODE = 1
+## TeX papersize/sides
+LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
+
 
 include $(top_srcdir)/xmldocs.make
+
 dist-hook: app-dist-hook
 
-EXTRA_DIST += \
-	dia.1 \
-	dia.dbk \
+nodist_include_EXTRAS = dia.1
+
+
+
+xml_files += \
 	authors.xml \
 	dia.xml \
 	entities.xml \
@@ -24,14 +40,73 @@
 	usage-objects-special.xml \
 	usage-objects.xml \
 	usage-quickstart.xml \
-	graphics/line_props.png \
-	graphics/home_network.png \
+	dia-cmdline.xml \
+	dia-1.xml
+
+
+EXTRA_DIST += \
+	dia.dbk \
+	dia-1.xml
+
+##	graphics/line_props.png \
+##	graphics/home_network.png \
+##	graphics/line_icon.png \
+##	graphics/greendots.png
+
+pngfigures = \
+	graphics/greendots.png \
 	graphics/line_icon.png \
-	graphics/greendots.png
+	graphics/home_network.png \
+	graphics/line_props.png
+
+
+epsfigures = 
+
+xmlsources = \
+	dia-cmdline.xml \
+	dia-1.xml \
+	authors.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	dia.xml \
+	usage-loadsave.xml \
+	entities.xml \
+	usage-objects-basic.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml
+
+
+htmlstyle = \
+	html.xsl
+
+
+metadata = \
+	dia-eu.omf \
+	topic.dat
+
+examples = \
+	../shape.dtd \
+	../diagram.dtd \
+	../sheet.dtd
+
+##	$(progname).$(progfiles_extension)
+
+DISTCLEANFILES = 
 
 if HAVE_DB2MAN
+## Anyone out there who understands automake?
+DISTCLEANFILES += dia.1
+## If we want misconfigured XML catalogs to not try net access, use
+## --nonet.  But I don't think that's going to solve more problems
+## than it causes.
 dia.1: dia.dbk
-	xsltproc --nonet --novalid $(DB2MAN) dia.dbk >dia.1
-endif
+	xsltproc --novalid $(DB2MAN) $< >dia.1
 
 man_MANS = dia.1
+endif
+

Modified: trunk/doc/eu/dia-eu.omf
==============================================================================
--- trunk/doc/eu/dia-eu.omf	(original)
+++ trunk/doc/eu/dia-eu.omf	Sun Jun 22 14:59:45 2008
@@ -1,15 +1,34 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE omf PUBLIC "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
 <omf>
   <resource>
-    <title>
-      Dia-ren eskuliburua
-    </title>
-    <subject>
-      <category>GNOME|Office</category>
-   </subject>
-   <format mime="text/sgml"/>
-   <identifier url="panel.sgml"/>
+   <creator>Henry House</creator>
+   <creator>Judith Samson</creator>
+   <creator>Kevin Breit</creator>
+   <creator>Alan Horkan</creator>
+   <maintainer>docs gnome org</maintainer>
+   <contributor>James Henstridge</contributor>
+   <contributor>Dolores Alia de Saravia</contributor>
+   <contributor>Fredrik Hallenberg</contributor>
+   <contributor>W. Borgert</contributor>
+   <title>Dia-ren eskuliburua</title>
+   <date>05/20/2007</date>
+   <version id="dia-manual-eu-0.2" identifier="Dia-ren eskuliburua 0.2" date="2000-01-01" description="no significant changes" />
+   <!-- please specify subject for your distribution 
+        as ANOTHER "subject" element -->
+   <subject category="GNOME|Applications|Graphics"></subject>
+   <subject category="GNOME|Applications|Office"></subject>
+   <subject category="Applications|Multimedia|Graphics"></subject>
+   <subject category="GNOME|Office"></subject>
+   <description>
+	Dia-ren eskuliburua
+   </description>
+   <type>
+     user's guide
+   </type>
+   <format mime="application/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN" />
+   <identifier url="file:///usr/local/share/dia/doc/eu/dia.xml"/>
    <language code="eu" />
+   <relation seriesid="dia" />
  </resource>
 </omf>
-

Modified: trunk/doc/eu/dia.1
==============================================================================
--- trunk/doc/eu/dia.1	(original)
+++ trunk/doc/eu/dia.1	Sun Jun 22 14:59:45 2008
@@ -1,188 +1,676 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.0).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "DIA" "1" "1999\-07\-03" "" ""
+.\"     Title: diadiadia
+.\"    Author: Fredrik Hallenberg <hallon lysator liu se>
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\"      Date: 1999-07-03
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "DIADIADIA" "1" "1999\-07\-03" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-dia \- a diagram drawing program
+dia - a diagram drawing program
 .SH "SYNOPSIS"
 .HP 4
-\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] [\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ \fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ ...]
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] [\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ \fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \.\.\.]
 .SH "DESCRIPTION"
 .PP
-\fBDia\fR 
-is used to create diagrams. Dia has a number of basic tools, like lines and boxes but can also dynamically load 
-\fIsheets\fR. A sheet is a collection of tools that are used in a certain type of diagram.
-.PP
-Most diagram objects in 
-\fBDia\fR 
-has 
-\fIhandles\fR. Lines can be connected to these handles and this way graph structures can be formed. When objects are moved or resized the connections will follow the objects.
-.PP
-Diagrams drawn in 
-\fBDia\fR 
-can be exported PostScript.
+\fBDia\fR
+is used to create diagrams\. Dia has a number of basic tools, like lines and boxes but can also dynamically load
+\fIsheets\fR\. A sheet is a collection of tools that are used in a certain type of diagram\.
+.PP
+Most diagram objects in
+\fBDia\fR
+has
+\fIhandles\fR\. Lines can be connected to these handles and this way graph structures can be formed\. When objects are moved or resized the connections will follow the objects\.
+.PP
+Diagrams drawn in
+\fBDia\fR
+can be exported PostScript\.
 .SH "OPTIONS"
 .PP
-\fBDia\fR 
+\fBDia\fR
 accepts the following options:
-.TP
+.PP
 \fB\-c\fR \fB\-\-credits\fR
-Display credits list and exit.
-.TP
+.RS 4
+Display credits list and exit\.
+.RE
+.PP
 \fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
-Export loaded file to OUTPUT and exit.
-.TP
+.RS 4
+Export loaded file to OUTPUT and exit\.
+.RE
+.PP
 \fB\-h\fR \fB\-\-help\fR
-Display a list of all commandline options.
-.TP
+.RS 4
+Display a list of all commandline options\.
+.RE
+.PP
 \fB\-n\fR \fB\-\-nosplash\fR
-Do not show the splash screen.
-.TP
+.RS 4
+Do not show the splash screen\.
+.RE
+.PP
 \fB\-s \fR\fB\fIWxH\fR\fR \fB\-\-size=\fR\fB\fIWxH\fR\fR
-Export loaded file in decimal given width and/or height. It is allowed to only select width or height. E.g. 
-\fB\-\-size=\fR\fB\fI520x\fR\fR 
-exports an image that is 520 pixels wide, while 
-\fB\-\-size=\fR\fB\fIx900\fR\fR 
-exports an image of 900 pixels height.
+.RS 4
+Export loaded file in decimal given width and/or height\. It is allowed to only select width or height\. E\.g\.
+\fB\-\-size=\fR\fB\fI520x\fR\fR
+exports an image that is 520 pixels wide, while
+\fB\-\-size=\fR\fB\fIx900\fR\fR
+exports an image of 900 pixels height\.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-\fBNote\fR
-This option is currently only implemented for the PNG export filter.
-.TP
+Note
+This option is currently only implemented for the PNG export filter\.
+.RE
+.PP
 \fB\-t \fR\fB\fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fR\fB\fIFORMAT\fR\fR
-Export loaded file in FORMAT and exit. Format are described below.
-.TP
+.RS 4
+Export loaded file in FORMAT and exit\. Format are described below\.
+.RE
+.PP
 \fB\-v\fR \fB\-\-version\fR
-Display 
-\fBdia\fR 
-version and exit.
+.RS 4
+Display
+\fBdia\fR
+version and exit\.
+.RE
 .SH "EXPORT FORMATS"
 .PP
-The following export formats are supported by 
-\fBdia\fR.
-.TP 3
-\(bu
-cgm 
+The following export formats are supported by
+\fBdia\fR\.
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'cgm
 (Computer Graphics Metafile, ISO 8632)
-.TP
-\(bu
-dia 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dia
 (Native dia diagram)
-.TP
-\(bu
-dxf 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dxf
 (Drawing Interchange File)
-.TP
-\(bu
-eps 
-or 
-eps\-builtin 
-or 
-eps\-pango 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'eps
+or
+epsi
+or
+eps\-builtin
+or
+eps\-pango
 (Encapsulated PostScript)
-
-The format specifications 
-eps, 
-epsi, and 
-eps\-pango 
-all use the font renderer of the Pango library, while 
-eps\-builtin 
-uses a dia specific font renderer. If you have problems with Pango rendering, e.g. Unicode, try 
-eps\-builtin 
-instead.
-.TP
-\(bu
-fig 
+.sp
+The format specifications
+eps,
+epsi, and
+eps\-pango
+all use the font renderer of the Pango library, while
+eps\-builtin
+uses a dia specific font renderer\. If you have problems with Pango rendering, e\.g\. Unicode, try
+eps\-builtin
+instead\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'fig
 (XFig format)
-.TP
-\(bu
-mp 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'mp
 (TeX MetaPost macros)
-.TP
-\(bu
-plt 
-or 
-hpgl 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'plt
+or
+hpgl
 (HP Graphics Language)
-.TP
-\(bu
-png 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'png
 (Portable Network Graphics)
-.TP
-\(bu
-shape 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'shape
 (Dia shape file)
-.TP
-\(bu
-svg 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'svg
 (Scalable Vector Graphics)
-.TP
-\(bu
-tex 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'tex
 (TeX PSTricks macros)
-.TP
-\(bu
-wpg 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wpg
 (WordPerfect Graphics)
-.TP
-\(bu
-wmf 
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wmf
 (Windows MetaFile)
+.RE
 .SH "FILES"
 .PP
-\fBdia\fR 
-creates a directory 
-\fI.dia\fR 
-in the user's home, which contains different files to store user preferences. To reset 
-\fBdia\fR 
-to it's default behaviour, just remove the respective file:
-.TP 3
-\(bu
-\fIdefaults.dia\fR: contains default values for elements (XML format).
-.TP
-\(bu
-\fIdiarc\fR: keeps 
-\fBdia\fR 
-preferences (ASCII).
-.TP
-\(bu
-\fIhistory\fR: keeps the list of last edited diagrams (ASCII).
-.TP
-\(bu
-\fImenurc\fR: contains an automated accelerator map dump (Lisp).
-.TP
-\(bu
-\fIpersistence\fR: contains GUI information, e.g. open windows (XML).
-.TP
-\(bu
-\fIpluginrc\fR: the list of loaded plugins (XML).
+\fBdia\fR
+creates a directory
+\fI\.dia\fR
+in the user\'s home, which contains different files to store user preferences\. To reset
+\fBdia\fR
+to it\'s default behaviour, just remove the respective file:
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdefaults\.dia\fR: contains default values for elements (XML format)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdiarc\fR: keeps
+\fBdia\fR
+preferences (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIhistory\fR: keeps the list of last edited diagrams (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fImenurc\fR: contains an automated accelerator map dump (Lisp)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpersistence\fR: contains GUI information, e\.g\. open windows (XML)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpluginrc\fR: the list of loaded plugins (XML)\.
+.RE
 .SH "SEE ALSO"
 .PP
-[1]\&\fIPango\fR
+\fIPango\fR\&[1]
 .PP
 X (1)
 .SH "COPYRIGHT"
 .PP
-Copyright 1999 Alexander Larsson.
+Copyright 1999 Alexander Larsson\.
 .PP
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation.
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation\.
 .SH "AUTHORS"
 .PP
 Alexander Larsson
 .PP
-This manual was written by 
-Fredrik Hallenberg.
-.SH "AUTHOR"
-Fredrik Hallenberg <hallon lysator liu se>, W. Borgert <debacle debian org>. 
-.SH "REFERENCES"
-.TP 3
-1.\ Pango
+This manual was written by
+Fredrik Hallenberg\.
+.br
+dia - a diagram drawing program
+.SH "SYNOPSIS"
+.HP 4
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] [\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ \fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \.\.\.]
+.SH "DESCRIPTION"
+.PP
+\fBDia\fR
+is used to create diagrams\. Dia has a number of basic tools, like lines and boxes but can also dynamically load
+\fIsheets\fR\. A sheet is a collection of tools that are used in a certain type of diagram\.
+.PP
+Most diagram objects in
+\fBDia\fR
+has
+\fIhandles\fR\. Lines can be connected to these handles and this way graph structures can be formed\. When objects are moved or resized the connections will follow the objects\.
+.PP
+Diagrams drawn in
+\fBDia\fR
+can be exported PostScript\.
+.SH "OPTIONS"
+.PP
+\fBDia\fR
+accepts the following options:
+.PP
+\fB\-c\fR \fB\-\-credits\fR
+.RS 4
+Display credits list and exit\.
+.RE
+.PP
+\fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
+.RS 4
+Export loaded file to OUTPUT and exit\.
+.RE
+.PP
+\fB\-h\fR \fB\-\-help\fR
+.RS 4
+Display a list of all commandline options\.
+.RE
+.PP
+\fB\-n\fR \fB\-\-nosplash\fR
+.RS 4
+Do not show the splash screen\.
+.RE
+.PP
+\fB\-s \fR\fB\fIWxH\fR\fR \fB\-\-size=\fR\fB\fIWxH\fR\fR
+.RS 4
+Export loaded file in decimal given width and/or height\. It is allowed to only select width or height\. E\.g\.
+\fB\-\-size=\fR\fB\fI520x\fR\fR
+exports an image that is 520 pixels wide, while
+\fB\-\-size=\fR\fB\fIx900\fR\fR
+exports an image of 900 pixels height\.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+Note
+This option is currently only implemented for the PNG export filter\.
+.RE
+.PP
+\fB\-t \fR\fB\fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fR\fB\fIFORMAT\fR\fR
+.RS 4
+Export loaded file in FORMAT and exit\. Format are described below\.
+.RE
+.PP
+\fB\-v\fR \fB\-\-version\fR
+.RS 4
+Display
+\fBdia\fR
+version and exit\.
+.RE
+.SH "EXPORT FORMATS"
+.PP
+The following export formats are supported by
+\fBdia\fR\.
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'cgm
+(Computer Graphics Metafile, ISO 8632)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dia
+(Native dia diagram)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dxf
+(Drawing Interchange File)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'eps
+or
+epsi
+or
+eps\-builtin
+or
+eps\-pango
+(Encapsulated PostScript)
+.sp
+The format specifications
+eps,
+epsi, and
+eps\-pango
+all use the font renderer of the Pango library, while
+eps\-builtin
+uses a dia specific font renderer\. If you have problems with Pango rendering, e\.g\. Unicode, try
+eps\-builtin
+instead\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'fig
+(XFig format)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'mp
+(TeX MetaPost macros)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'plt
+or
+hpgl
+(HP Graphics Language)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'png
+(Portable Network Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'shape
+(Dia shape file)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'svg
+(Scalable Vector Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'tex
+(TeX PSTricks macros)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wpg
+(WordPerfect Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wmf
+(Windows MetaFile)
+.RE
+.SH "FILES"
+.PP
+\fBdia\fR
+creates a directory
+\fI\.dia\fR
+in the user\'s home, which contains different files to store user preferences\. To reset
+\fBdia\fR
+to it\'s default behaviour, just remove the respective file:
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdefaults\.dia\fR: contains default values for elements (XML format)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdiarc\fR: keeps
+\fBdia\fR
+preferences (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIhistory\fR: keeps the list of last edited diagrams (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fImenurc\fR: contains an automated accelerator map dump (Lisp)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpersistence\fR: contains GUI information, e\.g\. open windows (XML)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpluginrc\fR: the list of loaded plugins (XML)\.
+.RE
+.SH "SEE ALSO"
+.PP
+\fIPango\fR\&[1]
+.PP
+X (1)
+.SH "COPYRIGHT"
+.PP
+Copyright 1999 Alexander Larsson\.
+.PP
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation\.
+.SH "AUTHORS"
+.PP
+Alexander Larsson
+.PP
+This manual was written by
+Fredrik Hallenberg\.
+.br
+dia - a diagram drawing program
+.SH "SYNOPSIS"
+.HP 4
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] [\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ \fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \.\.\.]
+.SH "DESCRIPTION"
+.PP
+\fBDia\fR
+is used to create diagrams\. Dia has a number of basic tools, like lines and boxes but can also dynamically load
+\fIsheets\fR\. A sheet is a collection of tools that are used in a certain type of diagram\.
+.PP
+Most diagram objects in
+\fBDia\fR
+has
+\fIhandles\fR\. Lines can be connected to these handles and this way graph structures can be formed\. When objects are moved or resized the connections will follow the objects\.
+.PP
+Diagrams drawn in
+\fBDia\fR
+can be exported PostScript\.
+.SH "OPTIONS"
+.PP
+\fBDia\fR
+accepts the following options:
+.PP
+\fB\-c\fR \fB\-\-credits\fR
+.RS 4
+Display credits list and exit\.
+.RE
+.PP
+\fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
+.RS 4
+Export loaded file to OUTPUT and exit\.
+.RE
+.PP
+\fB\-h\fR \fB\-\-help\fR
+.RS 4
+Display a list of all commandline options\.
+.RE
+.PP
+\fB\-n\fR \fB\-\-nosplash\fR
+.RS 4
+Do not show the splash screen\.
+.RE
+.PP
+\fB\-s \fR\fB\fIWxH\fR\fR \fB\-\-size=\fR\fB\fIWxH\fR\fR
+.RS 4
+Export loaded file in decimal given width and/or height\. It is allowed to only select width or height\. E\.g\.
+\fB\-\-size=\fR\fB\fI520x\fR\fR
+exports an image that is 520 pixels wide, while
+\fB\-\-size=\fR\fB\fIx900\fR\fR
+exports an image of 900 pixels height\.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+Note
+This option is currently only implemented for the PNG export filter\.
+.RE
+.PP
+\fB\-t \fR\fB\fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fR\fB\fIFORMAT\fR\fR
+.RS 4
+Export loaded file in FORMAT and exit\. Format are described below\.
+.RE
+.PP
+\fB\-v\fR \fB\-\-version\fR
+.RS 4
+Display
+\fBdia\fR
+version and exit\.
+.RE
+.SH "EXPORT FORMATS"
+.PP
+The following export formats are supported by
+\fBdia\fR\.
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'cgm
+(Computer Graphics Metafile, ISO 8632)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dia
+(Native dia diagram)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'dxf
+(Drawing Interchange File)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'eps
+or
+epsi
+or
+eps\-builtin
+or
+eps\-pango
+(Encapsulated PostScript)
+.sp
+The format specifications
+eps,
+epsi, and
+eps\-pango
+all use the font renderer of the Pango library, while
+eps\-builtin
+uses a dia specific font renderer\. If you have problems with Pango rendering, e\.g\. Unicode, try
+eps\-builtin
+instead\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'fig
+(XFig format)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'mp
+(TeX MetaPost macros)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'plt
+or
+hpgl
+(HP Graphics Language)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'png
+(Portable Network Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'shape
+(Dia shape file)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'svg
+(Scalable Vector Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'tex
+(TeX PSTricks macros)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wpg
+(WordPerfect Graphics)
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'wmf
+(Windows MetaFile)
+.RE
+.SH "FILES"
+.PP
+\fBdia\fR
+creates a directory
+\fI\.dia\fR
+in the user\'s home, which contains different files to store user preferences\. To reset
+\fBdia\fR
+to it\'s default behaviour, just remove the respective file:
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdefaults\.dia\fR: contains default values for elements (XML format)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIdiarc\fR: keeps
+\fBdia\fR
+preferences (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIhistory\fR: keeps the list of last edited diagrams (ASCII)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fImenurc\fR: contains an automated accelerator map dump (Lisp)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpersistence\fR: contains GUI information, e\.g\. open windows (XML)\.
+.RE
+.sp
+.RS 4
+\h'-04'\(bu\h'+03'\fIpluginrc\fR: the list of loaded plugins (XML)\.
+.RE
+.SH "SEE ALSO"
+.PP
+\fIPango\fR\&[1]
+.PP
+X (1)
+.SH "COPYRIGHT"
+.PP
+Copyright 1999 Alexander Larsson\.
+.PP
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation\.
+.SH "AUTHORS"
+.PP
+Alexander Larsson
+.PP
+This manual was written by
+Fredrik Hallenberg\.
+.SH "AUTHORS"
+.PP
+\fBFredrik Hallenberg\fR <\&hallon lysator\ liu\ se\&>
+.sp -1n
+.IP "" 4
+Author.
+.PP
+\fBW\. Borgert\fR <\&debacle debian\ org\&>
+.sp -1n
+.IP "" 4
+Author.
+.PP
+\fBFredrik Hallenberg\fR <\&hallon lysator\ liu\ se\&>
+.sp -1n
+.IP "" 4
+Author.
+.PP
+\fBW\. Borgert\fR <\&debacle debian\ org\&>
+.sp -1n
+.IP "" 4
+Author.
+.PP
+\fBFredrik Hallenberg\fR <\&hallon lysator\ liu\ se\&>
+.sp -1n
+.IP "" 4
+Author.
+.PP
+\fBW\. Borgert\fR <\&debacle debian\ org\&>
+.sp -1n
+.IP "" 4
+Author.
+.SH "COPYRIGHT"
+Copyright \(co 1999, 2003 Fredrik Hallenberg, W. Borgert
+.br
+.SH "NOTES"
+.IP " 1." 4
+Pango
+.RS 4
 \%http://www.pango.org/
+.RE

Modified: trunk/doc/eu/dia.dbk
==============================================================================
--- trunk/doc/eu/dia.dbk	(original)
+++ trunk/doc/eu/dia.dbk	Sun Jun 22 14:59:45 2008
@@ -1,326 +1,11 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";
+[
+<!ENTITY DIA-1 SYSTEM "dia-1.xml">
+]
+>
 
 <refentry>
-  <refentryinfo>
-    <copyright>
-      <year>1999</year>
-      <year>2003</year>
-      <holder>Fredrik Hallenberg, W. Borgert</holder>
-    </copyright>
-    <date>1999-07-03</date>
-    <authorgroup>
-      <author>
-	<firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email>
-      </author>
-      <author>
-	<firstname>W.</firstname>
-	<surname>Borgert</surname>
-	<email>debacle debian org</email>
-      </author>
-    </authorgroup>
-    <revhistory>
-      <revision>
-	<revnumber>2</revnumber>
-	<date>2003-11-26</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>added --size option</revremark>
-      </revision>
-      <revision>
-	<revnumber>2</revnumber>
-	<date>2003-10-16</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>added different EPS variants and section on
-	files</revremark>
-      </revision>
-      <revision>
-	<revnumber>1</revnumber>
-	<date>2003-10-12</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>1st DocBook/XML version</revremark>
-      </revision>
-    </revhistory>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>dia</refentrytitle>
-
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>dia</refname>
-
-    <refpurpose>a diagram drawing program</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dia</command>
-
-      <arg><option>-c</option></arg>
-
-      <arg><option>--credits</option></arg>
-
-      <arg><option>-e <replaceable>OUTPUT</replaceable></option></arg>
-
-      <arg><option>--export=<replaceable>OUTPUT</replaceable></option></arg>
-
-      <arg><option>-h</option></arg>
-
-      <arg><option>--help</option></arg>
-
-      <arg><option>-n</option></arg>
-
-      <arg><option>--nosplash</option></arg>
-
-      <arg><option>-s <replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>--size=<replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>-t <replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>--filter=<replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>-v</option></arg>
-
-      <arg><option>--version</option></arg>
-
-      <arg>file ...</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>Dia</command> is used to create diagrams.  Dia has
-    a number of basic tools, like lines and boxes but can also
-    dynamically load <emphasis>sheets</emphasis>.  A sheet is a
-    collection of tools that are used in a certain type of
-    diagram.</para>
-
-    <para>Most diagram objects in <command>Dia</command> has
-    <emphasis>handles</emphasis>.  Lines can be connected to these
-    handles and this way graph structures can be formed.  When objects
-    are moved or resized the connections will follow the
-    objects.</para>
-
-    <para>Diagrams drawn in <command>Dia</command> can be exported
-    PostScript.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para><command>Dia</command> accepts the following options:</para>
-
-    <variablelist>
-      <varlistentry>
-	<term><option>-c</option>
-	  <option>--credits</option></term>
-	<listitem>
-	  <para>Display credits list and exit.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-e <replaceable>OUTPUT</replaceable></option>
-	  <option>--export=<replaceable>OUTPUT</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file to OUTPUT and exit.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-h</option>
-	  <option>--help</option></term>
-	<listitem>
-	  <para>Display a list of all commandline options.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-n</option>
-	  <option>--nosplash</option></term>
-	<listitem>
-	  <para>Do not show the splash screen.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-s <replaceable>WxH</replaceable></option>
-	  <option>--size=<replaceable>WxH</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file in decimal given width and/or
-	  height.  It is allowed to only select width or height.
-	  E.g. <option>--size=<replaceable>520x</replaceable></option>
-	  exports an image that is 520 pixels wide, while
-	  <option>--size=<replaceable>x900</replaceable></option>
-	  exports an image of 900 pixels height.</para>
-
-	  <note>
-	    <para>This option is currently only implemented for the
-	    PNG export filter.</para>
-	  </note>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-t <replaceable>FORMAT</replaceable></option>
-	  <option>--export-to-format=<replaceable>FORMAT</replaceable></option></term>
-	<listitem>
-	  <para>Export loaded file in FORMAT and exit.  Format are
-	  described below.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-v</option>
-	  <option>--version</option></term>
-	<listitem>
-	  <para>Display <command>dia</command> version and exit.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Export Formats</title>
-
-    <para>The following export formats are supported by
-    <command>dia</command>.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><literal>cgm</literal> (Computer Graphics Metafile, ISO
-        8632)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>dia</literal> (Native dia diagram)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>dxf</literal> (Drawing Interchange File)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>eps</literal> or <literal>epsi</literal> or
-	<literal>eps-builtin</literal> or <literal>eps-pango</literal>
-	(Encapsulated PostScript)</para>
-
-        <para>The format specifications <literal>eps</literal>,
-	<literal>epsi</literal>, and <literal>eps-pango</literal> all
-	use the font renderer of the Pango library, while
-	<literal>eps-builtin</literal> uses a dia specific font
-	renderer.  If you have problems with Pango rendering,
-	e.g. Unicode, try <literal>eps-builtin</literal>
-	instead.</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>fig</literal> (XFig format)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>mp</literal> (TeX MetaPost macros)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>plt</literal> or <literal>hpgl</literal> (HP
-	Graphics Language)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>png</literal> (Portable Network
-	Graphics)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>shape</literal> (Dia shape file)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>svg</literal> (Scalable Vector Graphics)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>tex</literal> (TeX PSTricks macros)</para>
-      </listitem>
-
-      <listitem>
-	<para><literal>wpg</literal> (WordPerfect Graphics)</para>
-      </listitem>
-
-      <listitem arch="win32">
-	<para><literal>wmf</literal> (Windows MetaFile)</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>Files</title>
-
-    <para><command>dia</command> creates a directory
-    <filename>.dia</filename> in the user&apos;s home, which contains
-    different files to store user preferences.  To reset
-    <command>dia</command> to it&apos;s default behaviour, just remove
-    the respective file:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><filename>defaults.dia</filename>: contains default
-        values for elements (XML format).</para>
-      </listitem>
-      <listitem>
-	<para><filename>diarc</filename>: keeps
-	<command>dia</command> preferences (ASCII).</para>
-      </listitem>
-      <listitem>
-	<para><filename>history</filename>: keeps the list of last
-        edited diagrams (ASCII).</para>
-      </listitem>
-      <listitem>
-	<para><filename>menurc</filename>: contains an automated
-	accelerator map dump (Lisp).</para>
-      </listitem>
-      <listitem>
-	<para><filename>persistence</filename>: contains GUI
-	information, e.g. open windows (XML).</para>
-      </listitem>
-      <listitem>
-	<para><filename>pluginrc</filename>: the list of loaded
-	plugins (XML).</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
-    <para>X (1)</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Copyright</title>
-
-    <para>Copyright 1999 Alexander Larsson.</para>
-
-    <para>Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without fee is
-    hereby granted, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Authors</title>
-
-    <para><author><firstname>Alexander</firstname>
-	<surname>Larsson</surname>
-	<email>alla lysator liu se</email></author></para>
-
-    <para>This manual was written by
-    <author><firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email></author>.</para>
-  </refsect1>
+&DIA-1;
 </refentry>

Modified: trunk/doc/eu/dia.xml
==============================================================================
--- trunk/doc/eu/dia.xml	(original)
+++ trunk/doc/eu/dia.xml	Sun Jun 22 14:59:45 2008
@@ -30,11 +30,13 @@
 
     <!ENTITY LICENSE SYSTEM "license.xml">
 
+    <!ENTITY DIA-1 SYSTEM "dia-1.xml">
+
   ]>
 
 
 
-<book id="index" lang="en"> <!-- please do not change the id -->
+<book id="index" lang="eu"> <!-- please do not change the id -->
 
 
 

Modified: trunk/doc/eu/usage-objects.xml
==============================================================================
--- trunk/doc/eu/usage-objects.xml	(original)
+++ trunk/doc/eu/usage-objects.xml	Sun Jun 22 14:59:45 2008
@@ -60,7 +60,7 @@
 berde txiki batzuekin agertzen da. <figure>
        <title>Doitzeko puntuak</title>
        <screenshot><screeninfo>Puntu berdeen bidez irudiaren tamaina alda 
-daiteke.</screeninfo> <graphic format="PNG" fileref="graphics/greendots.png" 
+daiteke.</screeninfo> <graphic format="PNG" fileref="graphics/greendots" 
 srccredit="Kevin Breit"/></screenshot></figure> Koadroen barneko area 
 objektuaren area da.  Egin klik objektu-arean, eta ez askatu.  Mugitu sagua 
 oihalean zehar, objektua oihalaren beste leku batean jartzeko.
@@ -123,7 +123,7 @@
  <figure>
       <title>Marraren ikonoa</title>
      <screenshot><screeninfo>Marraren ikonoa</screeninfo> 
-<graphic format="PNG" fileref="graphics/line_icon.png" 
+<graphic format="PNG" fileref="graphics/line_icon" 
 srccredit="Steffen Macke"/></screenshot></figure></sect2> 
 <sect2 id="line-styles">
    <title>Marra-estiloak</title>
@@ -138,7 +138,7 @@
     <title>Marraren propietateak</title>
       <screenshot><screeninfo>Hiru atalak behean azaltzen 
 dira.</screeninfo> 
-<graphic format="PNG" fileref="graphics/line_props.png" 
+<graphic format="PNG" fileref="graphics/line_props" 
 srccredit="Kevin Breit"/></screenshot></figure> 
 <para>
 Estilo askotako marrak daude: 

Modified: trunk/doc/eu/usage-quickstart.xml
==============================================================================
--- trunk/doc/eu/usage-quickstart.xml	(original)
+++ trunk/doc/eu/usage-quickstart.xml	Sun Jun 22 14:59:45 2008
@@ -13,7 +13,7 @@
     <title>Demoa</title>
       <screenshot><screeninfo>Diagrama honek etxeko sarea 
 irudikatzen du, eta 5 minutuan egin da <application>Dia</application>-rekin.
-</screeninfo> <graphic format="PNG" fileref="graphics/home_network.png" 
+</screeninfo> <graphic format="PNG" fileref="graphics/home_network" 
 srccredit="Kevin Breit"/></screenshot></figure>
 </para>
 </sect1> 

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,11 +1,25 @@
-figdir = graphics
 docname = dia
 lang = fr
+figdir = graphics
 omffile = dia-fr.omf
 entities =
 version = 0.5_1fr
+progname = dia
+progfiles_extension = dia
+PAPERSIZE = a4
+##postscript output resolution (dpi)
+RESOLUTION = 600
+## document encoding
+DOCUMENT_ENCODING = UTF-8
+## dblatex tex document charset
+ENCODING = utf8
+UNICODE = 1
+## TeX papersize/sides
+LATEX_CLASS_OPTIONS = -P 'latex.class.options=a4paper,oneside'
+
 
 include $(top_srcdir)/xmldocs.make
+
 dist-hook: app-dist-hook
 
 nodist_include_EXTRAS = dia.1
@@ -39,23 +53,69 @@
 	graphics/preferences_fig.png \
 	graphics/color_selector.png
 
-##missing	graphics/preferences-fig.png
 
-DISTCLEANFILES = dia-cmdline.xml
+pngfigures = \
+	graphics/greendots.png \
+	graphics/line_icon.png \
+	graphics/color_selector.png \
+	graphics/home_network.png \
+	graphics/line_props.png \
+	graphics/preferences_fig.png
+
+
+epsfigures = \
+	ps/graphics/color_selector.eps \
+	ps/graphics/preferences_fig.eps
+
+xmlsources = \
+	dia-cmdline.xml \
+	dia-1.xml \
+	authors.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	custom-shapes.xml \
+	dia.xml \
+	usage-loadsave.xml \
+	entities.xml \
+	usage-objects-basic.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml
+
+
+htmlstyle = \
+	html.xsl
+
+
+metadata = \
+	dia-fr.omf \
+	topic.dat
+
+examples = \
+	$(progname).$(progfiles_extension) \
+	../shape.dtd \
+	../diagram.dtd \
+	../sheet.dtd
+
+DISTCLEANFILES = 
 
 if HAVE_DB2MAN
-# Anyone out there who understands automake?
+## Anyone out there who understands automake?
 DISTCLEANFILES += dia.1
-# If we want misconfigured XML catalogs to not try net access, use
-# --nonet.  But I don't think that's going to solve more problems
-# than it causes.
+## If we want misconfigured XML catalogs to not try net access, use
+## --nonet.  But I don't think that's going to solve more problems
+## than it causes.
 dia.1: dia.dbk
 	xsltproc --novalid $(DB2MAN) $< >dia.1
 
 man_MANS = dia.1
 endif
 
-#adding lang to man path
+##adding lang to man path
 mandir = $(datadir)/man/$(lang)
 
 

Modified: trunk/doc/fr/custom-shapes.xml
==============================================================================
--- trunk/doc/fr/custom-shapes.xml	(original)
+++ trunk/doc/fr/custom-shapes.xml	Sun Jun 22 14:59:45 2008
@@ -276,15 +276,15 @@
        </listitem>
        </itemizedlist>
        <tip>
-        <para>
+        <simpara>
             Pour dessiner un rectangle avec une ligne de largeur minimale
             (hairline), cette astuce devrait fontionner :
+	</simpara>
             <literallayout>
             <literal>
   &lt;svg:rect style="stroke-width: 0" x="..." y="..." width="..." height="..."/&gt;
             </literal>
             </literallayout>
-        </para>
         </tip>
         </para>
         <para>

Modified: trunk/doc/fr/dia-1.xml
==============================================================================
--- trunk/doc/fr/dia-1.xml	(original)
+++ trunk/doc/fr/dia-1.xml	Sun Jun 22 14:59:45 2008
@@ -1,362 +1,362 @@
-ï  <refentryinfo>
-    <copyright>
-      <year>1999</year>
-      <year>2004</year>
-      <holder>Fredrik Hallenberg, W. Borgert, Alan Horkan</holder>
-    </copyright>
-    <date>2004-11-26</date>
-    <authorgroup>
-      <author>
-	<firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email>
-      </author>
-      <author>
-	<firstname>W.</firstname>
-	<surname>Borgert</surname>
-	<email>debacle debian org</email>
-      </author>
-      <author>
-	<firstname>Alan</firstname>
-	<surname>Horkan</surname>
-	<email>horkana tcd ie</email>
-      </author>
-    </authorgroup>
-    <revhistory>
-      <revision>
-	<revnumber>4</revnumber>
-	<date>2004-11-26</date>
-	<authorinitials>AH</authorinitials>
-	<revremark>Ajout de Voir aussi, correction de la syntaxe</revremark>
-      </revision>
-      <revision>
-	<revnumber>3</revnumber>
-	<date>2003-11-26</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>ajout de l&apos;option --size</revremark>
-      </revision>
-      <revision>
-	<revnumber>2</revnumber>
-	<date>2003-10-16</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>ajout de differentes variantes EPS et de la section
-	fichiers</revremark>
-      </revision>
-      <revision>
-	<revnumber>1</revnumber>
-	<date>2003-10-12</date>
-	<authorinitials>WB</authorinitials>
-	<revremark>1Ãre version DocBook/XML</revremark>
-      </revision>
-    </revhistory>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>dia</refentrytitle>
-
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>dia</refname>
-
-    <refpurpose>un programme de dessin de diagrammes</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dia</command>
-
-      <arg><option>-c</option></arg>
-
-      <arg><option>--credits</option></arg>
-
-      <arg><option>-e <replaceable>SORTIE</replaceable></option></arg>
-
-      <arg><option>--export=<replaceable>SORTIE</replaceable></option></arg>
-
-      <arg><option>-L <replaceable>CALQUE,CALQUE,...</replaceable></option></arg>
-
-      <arg><option>--show-layers=<replaceable>CALQUE,CALQUE,...</replaceable></option></arg>
-
-      <arg><option>-h</option></arg>
-
-      <arg><option>--help</option></arg>
-
-      <arg><option>-n</option></arg>
-
-      <arg><option>--nosplash</option></arg>
-
-      <arg><option>-s <replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>--size=<replaceable>WxH</replaceable></option></arg>
-
-      <arg><option>-t <replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>--filter=<replaceable>FORMAT</replaceable></option></arg>
-
-      <arg><option>-v</option></arg>
-
-      <arg><option>--version</option></arg>
-
-      <arg>file ...</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-        <para><command>Dia</command> est utilisà pour crÃer des diagrammes.
-        Dia possÃde des outils de base, comme les lignes et les boÃtes, mais
-        peut Ãgalement charger dynamiquement des <emphasis>feuilles</emphasis>.
-        Une feuille est une collection d&apos;outils utilisÃs dans
-        un certain type de diagramme.</para>
-
-        <para>La plupart des objets de diagramme dans <command>Dia</command>
-        ont des <emphasis>points de connexion</emphasis>.  Les lignes peuvent
-        Ãtre connectÃes à ces points de connexion, et par ce moyen des
-        structures de graphe peuvent Ãtre mises en forme.  Lorsque les
-        objets sont dÃplacÃs, ou leurs dimensions changÃes, les
-        connexions suivent ces objets.</para>
-
-        <para>les diagrammes dessinÃs avec <command>Dia</command> peuvent
-        Ãtre exportÃs dans le format PostScript.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para><command>Dia</command> accepte les options suivantes :</para>
-
-    <variablelist>
-      <varlistentry>
-	<term><option>-c</option>
-	  <option>--credits</option></term>
-	<listitem>
-	  <para>Affiche la liste des attributions et quitte.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-e <replaceable>SORTIE</replaceable></option>
-	  <option>--export=<replaceable>SORTIE</replaceable></option></term>
-	<listitem>
-	  <para>Exporte le fichier chargà dans SORTIE et quitte.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-h</option>
-	  <option>--help</option></term>
-	<listitem>
-      <para>Affiche la liste de toutes les options de la ligne de
-      commande.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-n</option>
-	  <option>--nosplash</option></term>
-	<listitem>
-	  <para>N&apos;affiche pas l&apos;Ãcran de lancement.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><option>-s <replaceable>LxH</replaceable></option>
-	  <option>--size=<replaceable>LxH</replaceable></option></term>
-	<listitem>
-      <para>Exporte le fichier chargà dans la largeur et/ou la hauteur
-      dÃcimale donnÃe.  Il est possible de ne sÃlectionner que la
-      hauteur ou la largeur.  P.ex.
-      <option>--size=<replaceable>520x</replaceable></option> exporte une image
-      de 520 pixels largeur, alors que
-      <option>--size=<replaceable>x900</replaceable></option> exporte une image
-      de 900 pixels de hauteur.</para>
-
-	  <note>
-        <para>Cette option n&apos;est actuellement implÃmentÃe que pour
-        le filtre d&apos;export PNG.</para>
-	  </note>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	    <term><option>-L <replaceable>CALQUE,CALQUE,...</replaceable></option>
-	    <option>--show-layers=<replaceable>CALQUE,CALQUE,...</replaceable></option></term>
-        <listitem>
-            <para>N&apos;inclue que les calques spÃcifiÃs lors de
-            l&apos;exportation.  Les calques peuvent Ãtre spÃcifiÃs
-            par leur nom, leur numÃro, ou une Ãtandue numÃrique X-Y de
-            calques. --show-layers=background,2-5 montre
-            les calques nommÃs background et les calques 2 Ã 5,
-            --show-layers=2- montre les calques 2 et supÃrieurs.</para>
-	    </listitem>
-      </varlistentry>
-      <varlistentry>
-	    <term><option>-t <replaceable>FORMAT</replaceable></option>
-	    <option>--export-to-format=<replaceable>FORMAT</replaceable></option></term>
-	    <listitem>
-            <para>Exporte le fichier chargà dans le FORMAT et quitte.  Les
-            FORMATS D&apos;EXPORTATION sont dÃcrits ci-dessous.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-	    <option>--version</option></term>
-	    <listitem>
-            <para>Affiche la version de <command>dia</command> et
-            quitte.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>FORMATS D&apos;EXPORTATION</title>
-
-        <para>Les formats d&apos;exportation suivants sont supportÃs par
-        <command>dia</command>.</para>
-
-    <itemizedlist>
-      <listitem>
-	    <para><literal>cgm</literal> (Computer Graphics Metafile, ISO
-        8632)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>dia</literal> (diagram Dia natif)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>dxf</literal> (Drawing Interchange File)</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>eps</literal>  ou <literal>eps-builtin</literal> ou
-        <literal>eps-pango</literal> (PostScript encapsulÃ)</para>
-
-        <para>Les spÃcifications de format <literal>eps</literal> et
-        <literal>eps-pango</literal> utilisent toutes-deux le rendu de fontes
-        de la bibliothÃque Pango, alors que <literal>eps-builtin</literal>
-        utilise le rendu de fontes spÃcifique de dia.  Si vous avez des
-        problÃmes avec le rendu de Pango, p.ex. avec Unicode, utilisez
-        <literal>eps-builtin</literal> Ã la place.</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>fig</literal> (format XFig)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>mp</literal> (macros TeX MetaPost)</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>plt</literal> or <literal>hpgl</literal> (HP Graphics
-        Language)</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>png</literal> (Portable Network Graphics)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>shape</literal> (Fichier Dia Shape)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>svg</literal> (Scalable Vector Graphics)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>tex</literal> (macros TeX PSTricks)</para>
-      </listitem>
-
-      <listitem>
-	    <para><literal>wpg</literal> (WordPerfect Graphics)</para>
-      </listitem>
-
-      <listitem arch="win32">
-        <para><literal>wmf</literal> (Windows MetaFile)</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>FICHIERS</title>
-
-    <para><command>dia</command> crÃe un rÃpertoire
-    <filename>.dia</filename> dans le rÃpertoire  home  de
-    l&apos;utilisateur, contenant diffÃrents fichiers qui enregistrent ses
-    prÃfÃrences.  Pour initialiser
-    <command>dia</command> dans son comportement par dÃfaut, il suffit
-    d&apos;effacer les fichiers suivants :</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><filename>defaults.dia</filename>: contient les valeurs par
-        dÃfaut des ÃlÃments (format XML).</para>
-      </listitem>
-      <listitem>
-        <para><filename>diarc</filename>: garde les prÃfÃrences de
-        <command>dia</command> (ASCII).</para>
-      </listitem>
-      <listitem>
-        <para><filename>history</filename>: garde la liste des derniers
-        diagrammes ÃditÃs (ASCII).</para>
-      </listitem>
-      <listitem>
-        <para><filename>menurc</filename>: contient une emprunte de carte
-        d&apos;accÃlÃration automatisÃe (Lisp).</para>
-      </listitem>
-      <listitem>
-        <para><filename>persistence</filename>: contient les information
-        d&apos;interface graphique, p.ex. les fenÃtres ouvertes
-        (XML).</para>
-      </listitem>
-      <listitem>
-        <para><filename>pluginrc</filename>: la liste des plugins chargÃs
-        (XML).</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>VOIR AUSSI</title>
-
-    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
-    <para>X (1)</para>
-    <para>xfig (1)</para>
-    <para>inkscape (1)</para>
-  </refsect1>
-
-  <refsect1>
-    <title>COPYRIGHT</title>
-
-    <para>Copyright 1999 Alexander Larsson.</para>
-
-    <para>Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without fee is
-    hereby granted, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>AUTEURS</title>
-
-    <para><author><firstname>Alexander</firstname>
-	<surname>Larsson</surname>
-	<email>alla lysator liu se</email></author></para>
-
-    <para>This manual was written by
-    <author><firstname>Fredrik</firstname>
-	<surname>Hallenberg</surname>
-	<email>hallon lysator liu se</email></author>.</para>
-  </refsect1>
-  <refsect1>
-    <title>TRADUCTION</title>
-    <para>
-    <author>
-    <firstname>Thomas</firstname>
-    <surname>Harding</surname>
-    <email>thomas harding laposte net</email>
-    </author>
-    </para>
-  </refsect1>
+ï<refentryinfo>
+    <copyright>
+      <year>1999</year>
+      <year>2004</year>
+      <holder>Fredrik Hallenberg, W. Borgert, Alan Horkan</holder>
+    </copyright>
+    <date>2004-11-26</date>
+    <authorgroup>
+      <author>
+	<firstname>Fredrik</firstname>
+	<surname>Hallenberg</surname>
+	<email>hallon lysator liu se</email>
+      </author>
+      <author>
+	<firstname>W.</firstname>
+	<surname>Borgert</surname>
+	<email>debacle debian org</email>
+      </author>
+      <author>
+	<firstname>Alan</firstname>
+	<surname>Horkan</surname>
+	<email>horkana tcd ie</email>
+      </author>
+    </authorgroup>
+    <revhistory>
+      <revision>
+	<revnumber>4</revnumber>
+	<date>2004-11-26</date>
+	<authorinitials>AH</authorinitials>
+	<revremark>Ajout de Voir aussi, correction de la syntaxe</revremark>
+      </revision>
+      <revision>
+	<revnumber>3</revnumber>
+	<date>2003-11-26</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>ajout de l&apos;option --size</revremark>
+      </revision>
+      <revision>
+	<revnumber>2</revnumber>
+	<date>2003-10-16</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>ajout de differentes variantes EPS et de la section
+	fichiers</revremark>
+      </revision>
+      <revision>
+	<revnumber>1</revnumber>
+	<date>2003-10-12</date>
+	<authorinitials>WB</authorinitials>
+	<revremark>1Ãre version DocBook/XML</revremark>
+      </revision>
+    </revhistory>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>dia</refentrytitle>
+
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>dia</refname>
+
+    <refpurpose>un programme de dessin de diagrammes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>dia</command>
+
+      <arg><option>-c</option></arg>
+
+      <arg><option>--credits</option></arg>
+
+      <arg><option>-e <replaceable>SORTIE</replaceable></option></arg>
+
+      <arg><option>--export=<replaceable>SORTIE</replaceable></option></arg>
+
+      <arg><option>-L <replaceable>CALQUE,CALQUE,...</replaceable></option></arg>
+
+      <arg><option>--show-layers=<replaceable>CALQUE,CALQUE,...</replaceable></option></arg>
+
+      <arg><option>-h</option></arg>
+
+      <arg><option>--help</option></arg>
+
+      <arg><option>-n</option></arg>
+
+      <arg><option>--nosplash</option></arg>
+
+      <arg><option>-s <replaceable>WxH</replaceable></option></arg>
+
+      <arg><option>--size=<replaceable>WxH</replaceable></option></arg>
+
+      <arg><option>-t <replaceable>FORMAT</replaceable></option></arg>
+
+      <arg><option>--filter=<replaceable>FORMAT</replaceable></option></arg>
+
+      <arg><option>-v</option></arg>
+
+      <arg><option>--version</option></arg>
+
+      <arg>file ...</arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+        <para><command>Dia</command> est utilisà pour crÃer des diagrammes.
+        Dia possÃde des outils de base, comme les lignes et les boÃtes, mais
+        peut Ãgalement charger dynamiquement des <emphasis>feuilles</emphasis>.
+        Une feuille est une collection d&apos;outils utilisÃs dans
+        un certain type de diagramme.</para>
+
+        <para>La plupart des objets de diagramme dans <command>Dia</command>
+        ont des <emphasis>points de connexion</emphasis>.  Les lignes peuvent
+        Ãtre connectÃes à ces points de connexion, et par ce moyen des
+        structures de graphe peuvent Ãtre mises en forme.  Lorsque les
+        objets sont dÃplacÃs, ou leurs dimensions changÃes, les
+        connexions suivent ces objets.</para>
+
+        <para>les diagrammes dessinÃs avec <command>Dia</command> peuvent
+        Ãtre exportÃs dans le format PostScript.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para><command>Dia</command> accepte les options suivantes :</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><option>-c</option>
+	  <option>--credits</option></term>
+	<listitem>
+	  <para>Affiche la liste des attributions et quitte.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-e <replaceable>SORTIE</replaceable></option>
+	  <option>--export=<replaceable>SORTIE</replaceable></option></term>
+	<listitem>
+	  <para>Exporte le fichier chargà dans SORTIE et quitte.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-h</option>
+	  <option>--help</option></term>
+	<listitem>
+      <para>Affiche la liste de toutes les options de la ligne de
+      commande.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-n</option>
+	  <option>--nosplash</option></term>
+	<listitem>
+	  <para>N&apos;affiche pas l&apos;Ãcran de lancement.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-s <replaceable>LxH</replaceable></option>
+	  <option>--size=<replaceable>LxH</replaceable></option></term>
+	<listitem>
+      <para>Exporte le fichier chargà dans la largeur et/ou la hauteur
+      dÃcimale donnÃe.  Il est possible de ne sÃlectionner que la
+      hauteur ou la largeur.  P.ex.
+      <option>--size=<replaceable>520x</replaceable></option> exporte une image
+      de 520 pixels largeur, alors que
+      <option>--size=<replaceable>x900</replaceable></option> exporte une image
+      de 900 pixels de hauteur.</para>
+
+	  <note>
+        <simpara>Cette option n&apos;est actuellement implÃmentÃe que pour
+        le filtre d&apos;export PNG.</simpara>
+	  </note>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	    <term><option>-L <replaceable>CALQUE,CALQUE,...</replaceable></option>
+	    <option>--show-layers=<replaceable>CALQUE,CALQUE,...</replaceable></option></term>
+        <listitem>
+            <para>N&apos;inclue que les calques spÃcifiÃs lors de
+            l&apos;exportation.  Les calques peuvent Ãtre spÃcifiÃs
+            par leur nom, leur numÃro, ou une Ãtandue numÃrique X-Y de
+            calques. --show-layers=background,2-5 montre
+            les calques nommÃs background et les calques 2 Ã 5,
+            --show-layers=2- montre les calques 2 et supÃrieurs.</para>
+	    </listitem>
+      </varlistentry>
+      <varlistentry>
+	    <term><option>-t <replaceable>FORMAT</replaceable></option>
+	    <option>--export-to-format=<replaceable>FORMAT</replaceable></option></term>
+	    <listitem>
+            <para>Exporte le fichier chargà dans le FORMAT et quitte.  Les
+            FORMATS D&apos;EXPORTATION sont dÃcrits ci-dessous.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+	    <option>--version</option></term>
+	    <listitem>
+            <para>Affiche la version de <command>dia</command> et
+            quitte.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>FORMATS D&apos;EXPORTATION</title>
+
+        <para>Les formats d&apos;exportation suivants sont supportÃs par
+        <command>dia</command>.</para>
+
+    <itemizedlist>
+      <listitem>
+	    <para><literal>cgm</literal> (Computer Graphics Metafile, ISO
+        8632)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>dia</literal> (diagram Dia natif)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>dxf</literal> (Drawing Interchange File)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>eps</literal>  ou <literal>eps-builtin</literal> ou
+        <literal>eps-pango</literal> (PostScript encapsulÃ)</para>
+
+        <para>Les spÃcifications de format <literal>eps</literal> et
+        <literal>eps-pango</literal> utilisent toutes-deux le rendu de fontes
+        de la bibliothÃque Pango, alors que <literal>eps-builtin</literal>
+        utilise le rendu de fontes spÃcifique de dia.  Si vous avez des
+        problÃmes avec le rendu de Pango, p.ex. avec Unicode, utilisez
+        <literal>eps-builtin</literal> Ã la place.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>fig</literal> (format XFig)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>mp</literal> (macros TeX MetaPost)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>plt</literal> or <literal>hpgl</literal> (HP Graphics
+        Language)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>png</literal> (Portable Network Graphics)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>shape</literal> (Fichier Dia Shape)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>svg</literal> (Scalable Vector Graphics)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>tex</literal> (macros TeX PSTricks)</para>
+      </listitem>
+
+      <listitem>
+	    <para><literal>wpg</literal> (WordPerfect Graphics)</para>
+      </listitem>
+
+      <listitem arch="win32">
+        <para><literal>wmf</literal> (Windows MetaFile)</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>FICHIERS</title>
+
+    <para><command>dia</command> crÃe un rÃpertoire
+    <filename>.dia</filename> dans le rÃpertoire  home  de
+    l&apos;utilisateur, contenant diffÃrents fichiers qui enregistrent ses
+    prÃfÃrences.  Pour initialiser
+    <command>dia</command> dans son comportement par dÃfaut, il suffit
+    d&apos;effacer les fichiers suivants :</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><filename>defaults.dia</filename>: contient les valeurs par
+        dÃfaut des ÃlÃments (format XML).</para>
+      </listitem>
+      <listitem>
+        <para><filename>diarc</filename>: garde les prÃfÃrences de
+        <command>dia</command> (ASCII).</para>
+      </listitem>
+      <listitem>
+        <para><filename>history</filename>: garde la liste des derniers
+        diagrammes ÃditÃs (ASCII).</para>
+      </listitem>
+      <listitem>
+        <para><filename>menurc</filename>: contient une emprunte de carte
+        d&apos;accÃlÃration automatisÃe (Lisp).</para>
+      </listitem>
+      <listitem>
+        <para><filename>persistence</filename>: contient les information
+        d&apos;interface graphique, p.ex. les fenÃtres ouvertes
+        (XML).</para>
+      </listitem>
+      <listitem>
+        <para><filename>pluginrc</filename>: la liste des plugins chargÃs
+        (XML).</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>VOIR AUSSI</title>
+
+    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
+    <para>X (1)</para>
+    <para>xfig (1)</para>
+    <para>inkscape (1)</para>
+  </refsect1>
+
+  <refsect1>
+    <title>COPYRIGHT</title>
+
+    <para>Copyright 1999 Alexander Larsson.</para>
+
+    <para>Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without fee is
+    hereby granted, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTEURS</title>
+
+    <para><author><firstname>Alexander</firstname>
+	<surname>Larsson</surname>
+	<email>alla lysator liu se</email></author></para>
+
+    <para>This manual was written by
+    <author><firstname>Fredrik</firstname>
+	<surname>Hallenberg</surname>
+	<email>hallon lysator liu se</email></author>.</para>
+  </refsect1>
+  <refsect1>
+    <title>TRADUCTION</title>
+    <para>
+    <author>
+    <firstname>Thomas</firstname>
+    <surname>Harding</surname>
+    <email>thomas harding laposte net</email>
+    </author>
+    </para>
+</refsect1>

Modified: trunk/doc/fr/dia-dbk-to-chapter.sed
==============================================================================
--- trunk/doc/fr/dia-dbk-to-chapter.sed	(original)
+++ trunk/doc/fr/dia-dbk-to-chapter.sed	Sun Jun 22 14:59:45 2008
@@ -1,19 +0,0 @@
-1,+2d;4a \
-<chapter id="commandline" label="12"> \
-  <title>Ligne de commande</title> \
-    <sect1 id="commandline-intro"> \
-        <title>Introduction</title> \
-        <para> \
-        Dia peut Ãtre utilisà via la ligne de commande, \
-        ou mÃme depuis la ligne de commande (traitement par lots, \
-        par exemple pour la transformation de format de fichiers). \
-        on n'oubliera pas d'ajouter l'option <option>--nosplash</option> \
-        dans le cas d'utilisation de dia depuis la ligne de commande,  \
-        afin d'Ãviter l'apparition de l'Ãcran d'accueil. \
-        </para> \
-    </sect1> \
-    <sect1 id="commandline-manpage"> \
-        <title>Manuel de la ligne de commande</title>
-; $a \
-    </sect1> \
-</chapter>

Modified: trunk/doc/fr/dia-fr.omf
==============================================================================
--- trunk/doc/fr/dia-fr.omf	(original)
+++ trunk/doc/fr/dia-fr.omf	Sun Jun 22 14:59:45 2008
@@ -1,26 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE omf PUBLIC "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
 <omf>
-<!-- (creator+ , maintainer* , contributor* , title , date , version* , subject* , description? , type* , coverage* , format , identifier , language , relation* , source* , rights*) -->
   <resource>
    <creator>Henry House</creator>
    <creator>Judith Samson</creator>
    <creator>Kevin Breit</creator>
    <creator>Alan Horkan</creator>
-   <maintainer>docs gnome org</maintainer>
+   <maintainer>thomas harding laposte net (Thomas HARDING)</maintainer>
    <contributor>James Henstridge</contributor>
    <contributor>Dolores Alia de Saravia</contributor>
    <contributor>Fredrik Hallenberg</contributor>
    <contributor>W. Borgert</contributor>
    <contributor>Thomas Harding</contributor>
-
-    <title>
-      Manuel de Dia
-    </title>
-    <date>21/04/2007</date>
-    <version identifier="0.5_1fr" date="21/04/2007" />
-    <subject category="GNOME|Office" />
-   <format mime="text/sgml"/>
-   <identifier url="panel.sgml"/>
+   <title>Le manuel de Dia</title>
+   <date>05/27/2008</date>
+   <version id="dia-manual-fr-0.5-2" identifier="Manuel de Dia 0.5-2" date="2008-05-26" description="correction d'erreurs typographiques" />
+   <!-- please specify subject for your distribution 
+        as ANOTHER "subject" element -->
+   <subject category="GNOME|Applications|Graphics"></subject>
+   <subject category="GNOME|Applications|Office"></subject>
+   <subject category="Applications|Multimedia|Graphics"></subject>
+   <subject category="GNOME|Office"></subject>
+   <description>
+	Manuel d'utilisation de Dia, l'Ãditeur de diagrammes
+   </description>
+   <type>
+     user's guide
+   </type>
+   <format mime="application/xml" dtd="-//OASIS//DTD DocBook XML V4.4//EN" />
+   <identifier url="file://usr/local/share/dia/doc/fr/dia.xml"/>
    <language code="fr" />
+   <relation seriesid="dia" />
  </resource>
 </omf>

Modified: trunk/doc/fr/dia.xml
==============================================================================
--- trunk/doc/fr/dia.xml	(original)
+++ trunk/doc/fr/dia.xml	Sun Jun 22 14:59:45 2008
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-
 <!DOCTYPE book
 
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"
@@ -42,13 +41,14 @@
 
     <!ENTITY toolbox "BoÃte à outils">
     
-    <!ENTITY og "Â&nbsp;">
+    <!ENTITY og "Â&#x00A0;">
     
-    <!ENTITY fg "&nbsp;Â">
-
-    <!ENTITY pngfile "png">
+    <!ENTITY fg "&#x00A0;Â">
 
     <!ENTITY DIA-1 SYSTEM "dia-1.xml">
+    
+    <!ENTITY % local_entities SYSTEM "entities.xml">
+    %local_entities;
   ]
 
 >
@@ -57,8 +57,6 @@
 
 <book id="index" lang="fr"> <!-- please do not change the id -->
 
-
-
  <bookinfo>
   
   <title>Dia</title>
@@ -80,7 +78,13 @@
    <holder>Alan Horkan</holder>
 
   </copyright>                                                  
-   
+  <authorgroup>
+   <author><firstname>Kevin</firstname><surname>Breit</surname></author>
+   <author><firstname>Henry</firstname><surname>House</surname></author>
+   <author><firstname>Judith</firstname><surname>Samson</surname></author>
+   <author><firstname>Alan</firstname><surname>Horkan</surname></author>
+   <author><firstname>Thomas</firstname><surname>Harding</surname></author>
+  </authorgroup>
   <legalnotice id="legal-notice">
 
    <para>
@@ -136,7 +140,15 @@
    manuel.
 
   </releaseinfo>
-
+  <revhistory>
+  <revision>
+    <revnumber>0.5-2fr</revnumber>
+    <date>2008-27-05</date>
+    <authorinitials>HDG</authorinitials>
+    <revremark>suppressions des entitÃs HTML, dia-1.xml independant de dia-cmdline.xml,
+    suppression des extensions des ÃlÃments "graphic"</revremark>
+  </revision>
+  </revhistory>
  </bookinfo>
 
 &INTRODUCTION;

Modified: trunk/doc/fr/hardcopies.makefile
==============================================================================
--- trunk/doc/fr/hardcopies.makefile	(original)
+++ trunk/doc/fr/hardcopies.makefile	Sun Jun 22 14:59:45 2008
@@ -1,267 +0,0 @@
-#
-# build and install html, ps and pdf documentation
-#
-srcdir = .
-figdir = graphics
-INSTALL_DATA = /usr/bin/install
-sysdoc = $(datadir)/doc/$(docname)
-papersize = A4
-encoding = "utf-8"
-eps_figures = color_selector.eps \
-			preferences-fig.eps
-
-ifdef WITH_HTMLDOC
-htmldoc = dia.html
-html_install = install-html
-html_uninstall = uninstall-html
-html_clean = clean-html
-else
-htmldoc =
-html_install =
-html_uninstall =
-html_clean =
-endif
-
-ifdef WITH_PDFDOC
-pdfdoc = dia.pdf
-pdf_install = install-pdf
-pdf_uninstall = uninstall-pdf
-pdf_clean = clean-pdf
-else
-pdfdoc =
-pdf_install =
-pdf_uninstall =
-pdf_clean =
-endif
-
-ifdef WITH_PSDOC
-psdoc = dia.ps
-ps_install = install-ps
-ps_uninstall = uninstall-ps
-ps_clean = clean-ps
-else
-psdoc =
-ps_install =
-ps_uninstall =
-ps_clean =
-endif
-
-all: mk-chapter-cmdline
-
-dia.html: dia.xml
-	install -d $(srcdir)/html
-	cd $(srcdir)/html && xsltproc ../html.xsl ../dia.xml
-
-
-dia.pdf: dia.xml
-	export SP_ENCODING=$(encoding) ; \
-	jw -b pdf -V paper-type=$(papersize) -V paper-size=$(papersize) -o pdf/  $<
-
-dia.ps: dia.xml
-	mkdir -p $(srcdir)/ps/$(figdir)/
-	if test "$(figdir)"; then \
-	  for file in $(figdir)/*.png ; do \
-	    destfile=$(srcdir)/ps/$(figdir)/`basename $$file .png`.eps ; \
-	    if test ! -f $$destfile ; then \
-	        convert $(srcdir)/$$file $$destfile; \
-	    fi ; \
-	  done ; \
-	fi
-	sed -e 's/<!ENTITY pngfile "png">/<!ENTITY pngfile "eps">/' $< >doc-ps.xml
-	export SP_ENCODING=$(encoding) ; \
-    jw -b ps -V paper-type=$(papersize) -V paper-size=$(papersize) -o ps/ doc-ps.xml
-	rm doc-ps.xml
-	mv ps/doc-ps.ps ps/`basename $< .xml`.ps
- 
-dia.tex: dia.xml
-	mkdir -p $(srcdir)/ps/$(figdir)/
-	if test "$(figdir)"; then \
-	  for file in $(figdir)/*.png ; do \
-	    destfile=$(srcdir)/ps/$(figdir)/`basename $$file .png`.eps ; \
-	    if test ! -f $$destfile ; then \
-	        convert $(srcdir)/$$file $$destfile; \
-	    fi ; \
-	  done ; \
-	fi
-	sed -e 's/<!ENTITY pngfile "png">/<!ENTITY pngfile "eps">/' $< >doc-ps.xml
-	export SP_ENCODING=$(encoding) ; \
-    jw -b tex -V paper-type=$(papersize) -V paper-size=$(papersize) -o ps/ doc-ps.xml
-	rm doc-ps.xml
-	mv ps/doc-ps.tex ps/`basename $< .xml`.tex
-
-mk-chapter-cmdline: dia.dbk
-	sed -f dia-dbk-to-chapter.sed $< > dia-cmdline.xml
-
-pdf_docs = \
-	dia.pdf
-
-ps_docs = \
-	dia.ps
-
-dia_examples = \
-	dia.dia
-
-
-install-html:
-	@list = `ls $(srcdir)/html`
-	$(mkinstalldirs) $(sysdoc)
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	$(mkinstalldirs) $(sysdoc)/$(lang)/$(figdir)
-	for i in $$list; do \
-	  file=$(srcdir)/html/$$i; \
-	  dest=`echo $$file | sed -e 's,^.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-	@list=`ls $(srcdir)/$(figdir)`
-	for i in $$list; do \
-	  file=$(srcdir)/$(figdir)/$$i; \
-	  dest=`echo $$file | sed -e 's,^.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-
-uninstall-html:
-	@list='$(html_pages)'; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(helpdir)/$(lang)/$$file ; then \
-	    echo " rm -f $(helpdir)/$(lang)/$$file"; \
-	    rm -f $(helpdir)/$(lang)/$$file; \
-	  fi; \
-	done
-	@list=`ls $(srcdir)/$(figdir)`; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(helpdir)/$(lang)/$$file ; then \
-	    echo " rm -f $(helpdir)/$(lang)/$(figdir)/$$file"; \
-	    rm -f $(helpdir)/$(lang)/$(figdir)/$$lfile; \
-	  fi; \
-	done
-
-clean-html:
-	@list='$(html_pages)'; \
-	for i in $$list ; do \
-	  if test -f $(srcdir)/$$i; then \
-	    file=$(srcdir)/$$i; \
-	    else file=$$i;\
-	  fi; \
-	  if test -f $$file ; then \
-	    echo " rm -f $$file"; \
-	    rm -f $$file; \
-	  fi; \
-	done
-
-
-install-pdf:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(pdf_docs)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/pdf/$$i; then  \
-	    file=$(srcdir)/pdf/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-uninstall-pdf:
-	@list='$(pdf_docs)'; \
-	for i in $$list ; do \
-	  pdffile=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$pdffile ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$pdffile"; \
-	    rm -f $(sysdoc)/$(lang)/$$pdffile; \
-	  fi; \
-	done
-	rmdir $(sysdoc)/$(lang)
-	rmdir $(sysdoc)
-
-clean-pdf: 
-	rm $(srcdir)/pdf/*
-	rmdir $(srcdir)/pdf/
-
-
-install-ps:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(ps_docs)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/ps/$$i; then  \
-	    file=$(srcdir)/ps/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-uninstall-ps:
-	@list='$(ps_docs)'; \
-	for i in $$list ; do \
-	  psfile=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$psfile ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$psfile"; \
-	    rm -f $(sysdoc)/$(lang)/$$psfile; \
-	  fi; \
-	done
-
-clean-ps:
-	@list='$(ps_docs)'; \
-    for i in $$list ; do \
-	    rm $(srcdir)/ps/$$i ; \
-    done
-	@list='$(eps_figures)' ; \
-    for file in `ls ps/graphics/` ; do \
-        keep=0 ; \
-        for to_keep in @list ; do \
-            if test "$$file" = "$$to_keep" ; then \
-            keep=1 ; \
-        done ; \
-        if test $$keep = 0 ; then \
-            echo "rm -f ps/graphics/$$file" ; \
-            rm -f ps/graphics/$$file \
-        fi \
-    done   
-
-install-examples:
-	$(mkinstalldirs) $(sysdoc)/$(lang)
-	@list='$(dia_examples)'; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then  \
-	    file=$(srcdir)/$$i; \
-	  else \
-	    file=$$i; \
-	  fi; \
-	  if test ! -f $$file ; then continue ; fi ; \
-	  dest=`echo $$file | sed -e 's,^\.*/,,'`; \
-	  echo " $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest"; \
-	  $(INSTALL_DATA) $$file $(sysdoc)/$(lang)/$$dest; \
-	done
-
-
-uninstall-examples:
-	@list='$(dia_examples)'; \
-	for i in $$list ; do \
-	  file=`echo $$i | sed -e 's,^\.*/,,'`; \
-	  if test -f $(sysdoc)/$(lang)/$$file ; then \
-	    echo " rm -f $(sysdoc)/$(lang)/$$file"; \
-	    rm -f $(sysdoc)/$(lang)/$$file; \
-	  fi; \
-	done
-
-
-cmdline-clean:
-	@list='dia-cmdline.xml'; \
-	for file in $$list ; do \
-	  if test -f $(srcdir)/$$file ; then \
-	    echo " rm -f $(srcdir)/$$file"; \
-	    rm -f $(srcdir)/$$file; \
-	  fi; \
-	done
-

Modified: trunk/doc/fr/html.xsl
==============================================================================
--- trunk/doc/fr/html.xsl	(original)
+++ trunk/doc/fr/html.xsl	Sun Jun 22 14:59:45 2008
@@ -3,5 +3,37 @@
 
 <!-- <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl"></xsl:import> -->
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl";></xsl:import>
-<xsl:param name="html.stylesheet" select="'dia.css'"></xsl:param>
+
+<xsl:param name="make.valid.html" select="1"></xsl:param>
+<xsl:param name="html.cleanup" select="1"></xsl:param>
+<xsl:param name="generate.id.attributes" select="1"></xsl:param>
+
+<xsl:param name="html.stylesheet" select="'css/dia.css'"></xsl:param>
+
+<xsl:param name="preface.autolabel" select="i"></xsl:param>
+<xsl:param name="component.label.includes.part.label" select="0"></xsl:param>
+<xsl:param name="section.autolabel" select="1"></xsl:param>
+<xsl:param name="label.from.part" select="1"></xsl:param>
+<xsl:param name="section.label.includes.component.label" select="1"></xsl:param>
+
+<xsl:param name="admon.graphics" select="1"></xsl:param>
+<xsl:param name="admon.textlabel" select="0"></xsl:param>
+<xsl:param name="admon.style">
+  <xsl:text></xsl:text>
+</xsl:param>
+
+<xsl:param name="callout.unicode" select="1"></xsl:param>
+
+<xsl:param name="formal.title.placement">
+figure after
+example before
+equation before
+table before
+procedure before
+task before
+</xsl:param>
+<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+<xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
 </xsl:stylesheet>

Modified: trunk/doc/fr/notes.xml
==============================================================================
--- trunk/doc/fr/notes.xml	(original)
+++ trunk/doc/fr/notes.xml	Sun Jun 22 14:59:45 2008
@@ -1,6 +0,0 @@
-    <note>
-    <simpara id="directory" class="attribute">pour les unices, on parle bien de rÃpertoire (directory) et non de
-        dossier (folder).
-    </simpara>
-    </note>
-

Modified: trunk/doc/fr/usage-customization.xml
==============================================================================
--- trunk/doc/fr/usage-customization.xml	(original)
+++ trunk/doc/fr/usage-customization.xml	Sun Jun 22 14:59:45 2008
@@ -17,7 +17,7 @@
  <title>La boÃte de dialogue prÃfÃrences</title>
  <screenshot>
   <screeninfo>La boÃte de dialogue <interface>PrÃfÃrences.</interface></screeninfo>
-   <graphic format="PNG" fileref="graphics/preferences_fig.&pngfile;"
+   <graphic format="PNG" fileref="graphics/preferences_fig"
         srccredit="Thomas Harding" />
  </screenshot>
  </figure>
@@ -81,9 +81,9 @@
       le nombre de choix qui seront afichÃs dans la section 
       Documents RÃcents du menu <guimenu>Fichiers</guimenu>.
       <note>
-      <para>
+      <simpara>
         ndt : cette section n&apos;existe pas encore dans la version 0.96... 
-      </para>
+      </simpara>
       </note>
     </para>
    </listitem>
@@ -113,39 +113,39 @@
   <itemizedlist>
    <listitem>
     <para>
-     portrait&nbsp;: permet de dÃfinir qu'un nouveau diagramme soit orientà en portrait ou en paysage
+     portrait&#x00A0;: permet de dÃfinir qu'un nouveau diagramme soit orientà en portrait ou en paysage
      selon qu'il est cochà ou non.
     </para>
    </listitem>
    <listitem>
     <para>
-    Type de papier&nbsp;: dÃfinit la taille de papier normalisà d'une page d'un nouveau diagramme.
+    Type de papier&#x00A0;: dÃfinit la taille de papier normalisà d'une page d'un nouveau diagramme.
     </para>
    </listitem>
    <listitem>
     <para>
-      Couleur d'arriÃrere-plan&nbsp;: dÃfinit la couleur d'arriÃre-plan d'un nouveau diagramme.
+      Couleur d'arriÃrere-plan&#x00A0;: dÃfinit la couleur d'arriÃre-plan d'un nouveau diagramme.
     </para>
     </listitem>
    <listitem>
     <para>
-     Largeur&nbsp;: contrÃle la largeur, en pixels, d'une nouvelle fenÃtre.
+     Largeur&#x00A0;: contrÃle la largeur, en pixels, d'une nouvelle fenÃtre.
     </para>
    </listitem>
    <listitem>
     <para>
-     Hauteur&nbsp;: contrÃle la hauteur, en pixels, d'une nouvelle fenÃtre.
+     Hauteur&#x00A0;: contrÃle la hauteur, en pixels, d'une nouvelle fenÃtre.
     </para>
    </listitem>
    <listitem>
     <para>
-      Grossissement&nbsp;: rÃgle le facteur de multiplication du zoom
+      Grossissement&#x00A0;: rÃgle le facteur de multiplication du zoom
       d'une nouvelle fenÃtre.
     </para>
    </listitem>
    <listitem>
     <para>
-     Visible&nbsp;: dÃfinit la visibilità des points de connexion.
+     Visible&#x00A0;: dÃfinit la visibilità des points de connexion.
     </para>
    </listitem> 
    </itemizedlist>
@@ -161,31 +161,31 @@
    </listitem> 
    <listitem>
     <para>
-      MagnÃtisme&nbsp;: fait que les objets sont attirÃs aux intersections de la grille.
+      MagnÃtisme&#x00A0;: fait que les objets sont attirÃs aux intersections de la grille.
       Ceci permettant un alignement plus aisà des objets, les objets sÃparÃs revenant
       brusquement à la mÃme ligne.
     </para>
    </listitem>
    <listitem>
      <para>
-       Largeur du pas&nbsp;: l'utilisateur dÃfinit un multiplicateur qui rÃgle
+       Largeur du pas&#x00A0;: l'utilisateur dÃfinit un multiplicateur qui rÃgle
        l'espacement horizontal des lignes de la grille.
      </para>
    </listitem>
    <listitem>
      <para>
-       Hauteur du pas&nbsp;: l'utilisateur dÃfinit un multiplicateur qui rÃgle
+       Hauteur du pas&#x00A0;: l'utilisateur dÃfinit un multiplicateur qui rÃgle
        l'espacement vertical des lignes de la grille.
      </para>
    </listitem>
    <listitem>
      <para>
-       Couleur&nbsp;: rÃgle la couleur d'affichage des lignes de la grille.
+       Couleur&#x00A0;: rÃgle la couleur d'affichage des lignes de la grille.
      </para>
    </listitem>
    <listitem>
      <para>
-       Lignes par subdivision majeure&nbsp;: indique ce que sera l'emplacement 
+       Lignes par subdivision majeure&#x00A0;: indique ce que sera l'emplacement 
        des bords de page lorsque vous imprimez le diagramme.
      </para>
    </listitem>

Modified: trunk/doc/fr/usage-layers.xml
==============================================================================
--- trunk/doc/fr/usage-layers.xml	(original)
+++ trunk/doc/fr/usage-layers.xml	Sun Jun 22 14:59:45 2008
@@ -21,24 +21,22 @@
       et pas d'autres qui resteront cachÃes mÃme lors de l'exportation ou de
       l'impression du diagramme.
     </para>
-    <tip>
-      <para>
+    <tip><simpara>
         Utilisez l'option <command>--show-layers</command> de la ligne de
         commande pour contrÃler quels calques seront visibles lors d'une
         exportation par lot.
-      </para>
-    </tip>
+    </simpara></tip>
     <para>
       Dans un calque, toute opÃration que vous voudriez faire sur des objets
       sont possible à travers le &stdpop;, vous pouvez influer sur
       les objets exactement de la mÃme maniÃre que d'habitude.
     </para>
     <tip>
-      <para>
+      <simpara>
         Seul les objets prÃsents dans le calque courant peuvent Ãtre
         sÃlectionnnÃs.  Si un objet ne veut dÃcidÃment pas Ãtre sÃlectionnÃ,
         vous devriez vÃrifier si il est affectà au calque courant ou non.
-      </para>
+      </simpara>
     </tip>
     <para>
       Chaque nouveau diagramme vient avec un calque par dÃfaut ÃtiquetÃ
@@ -107,11 +105,11 @@
        diagramme ne seront effectuÃs que dans le calque sÃlectionnÃ.
      </para>
      <note>
-      <para>
+      <simpara>
        Seul un calque peut-Ãtre sÃlectionnà à la fois. De cette faÃon vous
        pouvez faire quoi que vous dÃsirez dans ce calque sans affecter les
        autres calques de votre diagramme.
-      </para>
+      </simpara>
      </note>
     </sect2>
 
@@ -170,14 +168,14 @@
         sans faire aucun changement.
       </para>
       <tip>
-        <para>
+        <simpara>
           Donner des nom aux calques qui en dÃcrivent l'usage est utile pour
           rappeler ce pour quoi ils sont faits. N'hÃsitez pas à crÃer de
           nombreux calques diffÃrents, <application>Dia</application> ne vous
           impose pas de contraites quant au nombre de calques que vous avez
           crÃÃs, aussi sentez-vous libre d'ajuster la hiÃrarchie du diagramme Ã
           vos besoins.
-        </para>
+        </simpara>
       </tip>
     </sect2>
 
@@ -213,24 +211,24 @@
       pourriez le faire avec un simple et monolithique bloc d'objets.
     </para>
     <note>
-      <para>
+      <simpara>
         Par dÃfinition, un diagramme doit Ãtre structurÃ. Aussi le diviser en
         plusieurs parties logique devrait Ãtre un processus facile. C'est lÃ
         que les <emphasis>calques</emphasis> deviennent un outil important et
         pratique pour la gestion du contenu des diagrammes. Ils vous permettent
         d'isoler chacune des parties en diapositives sÃparÃes, aussi il devient
         un rÃel plaisir de les manipuler de la faÃon que vous prÃfÃrez.
-      </para>
+      </simpara>
     </note>
     <para>
-      L'<guibutton>icone &og;&oelig;il&fg;</guibutton> Ã la gauche du nom
+      L'<guibutton>icone &og;Åil&fg;</guibutton> Ã la gauche du nom
       du calque est ce qui fait que les calque sont si utiles. Elle vous permet
       de montrer ou cacher le calque correspondant. Ce qui veut dire que si
       pour quelque raison vous dÃcider de cacher un calque particulier, il vous
-      suffit de cliquer l'<guibutton>icone &og;&oelig;il&fg;</guibutton>
+      suffit de cliquer l'<guibutton>icone &og;Åil&fg;</guibutton>
       : le calque et tout ce qu'il contient disparaÃtront du canevas. Si vous
       maintenez la touche majuscules et cliquez l'<guibutton>icone
-      &og;&oelig;il&fg;</guibutton>, vous cachez tous les autres calques
+      &og;Åil&fg;</guibutton>, vous cachez tous les autres calques
       exceptà le calque courant, et si vous cliquez de nouveau tout en
       maintenant la touche majuscules tous les autres calques seront de nouveau
       apparents.
@@ -248,13 +246,13 @@
       diagramme.
     </para>
     <note>
-      <para>
+      <simpara>
         Dans <application>Dia</application>, le crÃation et manipulation des
         <emphasis>calques</emphasis> est aussi courante que dessiner ou
         sÃlectionner des objets dans le diagramme. Vous devez garder la main
         sur eux, car probablement vous aurez à les utiliser chaque fois que
         vous voudrez crÃer un nouveau diagramme. 
-      </para>
+      </simpara>
     </note>
   </sect1>
 

Modified: trunk/doc/fr/usage-loadsave.xml
==============================================================================
--- trunk/doc/fr/usage-loadsave.xml	(original)
+++ trunk/doc/fr/usage-loadsave.xml	Sun Jun 22 14:59:45 2008
@@ -1,10 +1,10 @@
 <chapter label="8" id="loadsave-chapter">
 <title>Charger et sauver des diagrammes</title>
 <sect1 id="loadsave-intro">
- <title>Charger et sauver des diagrammes&nbsp;: Introduction</title>
+ <title>Charger et sauver des diagrammes&#x00A0;: Introduction</title>
   <para>
    <application>Dia</application> suit le modÃle de sauvegarde commun à la
-   plupart des applications&nbsp;: vous devez sauver explicitement chaque
+   plupart des applications&#x00A0;: vous devez sauver explicitement chaque
    canevas que vous dÃsirez retenir pour un usage futur. Pour sauver un
    fichier, utilisez
     <menuchoice>
@@ -26,7 +26,7 @@
      <guimenuitem>Ouvrir</guimenuitem>
     </menuchoice>
    de l'interface <interface>Barre de menu principale</interface>.  Le rÃsultat
-   est une <interface>boÃte de dialogue ouvrir</interface>&nbsp;; selectionnez
+   est une <interface>boÃte de dialogue ouvrir</interface>&#x00A0;; selectionnez
    le fichier que vous dÃsirez et choisissez le bouton
    <guibutton>Ouvrir</guibutton>. la <interface>boÃte de dialogue
    ouvrir</interface> est standard à part le menu popup ÃtiquetÃ
@@ -75,7 +75,7 @@
     <sect2 id="loadsave-filetypes-import">
     <title>Formats d'importation</title>
      <para>
-      <application>Dia</application> peut importer les types de fichiers suivants&nbsp;:
+      <application>Dia</application> peut importer les types de fichiers suivants&#x00A0;:
       <itemizedlist>
        <listitem>
         <para>
@@ -109,7 +109,7 @@
     <sect2 id="loadsave-filetypes-export">
     <title>Exportation: Support d'autres formats</title>
      <para>
-     <application>Dia</application> supporte l'exportation dans beaucoup d'autres types de fichiers, comme&nbsp;:
+     <application>Dia</application> supporte l'exportation dans beaucoup d'autres types de fichiers, comme&#x00A0;:
      <itemizedlist>
       <listitem>
        <para>

Modified: trunk/doc/fr/usage-objects-basic.xml
==============================================================================
--- trunk/doc/fr/usage-objects-basic.xml	(original)
+++ trunk/doc/fr/usage-objects-basic.xml	Sun Jun 22 14:59:45 2008
@@ -33,9 +33,9 @@
    Utiliser CTRL-MAJ-X pour couper et CTRL-MAJ-V pour coller seulement le texte.
    Il n'y a pas de raccourci permettant la copie seule de texte.
    </para>
-   <note><para>Lorsque vous collez du texte dans un objet, le texte est formattÃ
+   <note><simpara>Lorsque vous collez du texte dans un objet, le texte est formattÃ
    selon les propriÃtÃs de l'objet de destination et non de celui du texte source.
-   </para></note>
+   </simpara></note>
    </listitem>
    <listitem>
    <para>On ne peut pas sÃlectionner de portion de texte à la souris (cela
@@ -44,12 +44,12 @@
    caractÃre à gauche du pointeur de la souris avec la touche retour arriÃre
    (backspace).
    </para>
-   <note><para>
+   <note><simpara>
    La touche SUPPR supprime l'objet entier et non le texte à la droite du 
    curseur. Utilisez MAJ-SUPPR pour supprimer ce texte (et utilisez 
    Ãdition/annuler si vous supprimez un objet par erreur). Pour supprimer
    tout le texte, utilisez Couper (CTRL-MAJ-X).
-   </para></note>
+   </simpara></note>
    </listitem>
    <listitem><para>
    Si vous utilizez une police ou une taille de police autre que celle par 
@@ -60,10 +60,10 @@
    </para></listitem>
    </itemizedlist>
    <note>
-    <para>
+    <simpara>
      Le <emphasis>Texte</emphasis> dans <application>Dia</application> peut
      utiliser toute fonte disponible à Gnome.
-    </para>
+    </simpara>
    </note>
    </sect2>
    <sect2 id="box">
@@ -71,7 +71,7 @@
     <para>
      Les boÃtes dans <application>Dia</application> peuvent Ãtre personnalisÃes
      pour prendre n'importe quelle taille dÃsirÃe par l'utilisateur.  Les
-     propriÃtÃs disponibles sont&nbsp;:
+     propriÃtÃs disponibles sont&#x00A0;:
      <itemizedlist>
       <listitem>
        <para>
@@ -164,7 +164,7 @@
     <para>
      Les formats d'image suivants sont actuellement supportÃs pour l'inclusion
      dans les diagrammes
-      <application>Dia</application> &nbsp;:
+      <application>Dia</application> &#x00A0;:
       <itemizedlist>
         <listitem><para>ANI</para></listitem>
 	<listitem><para>BMP</para></listitem>

Modified: trunk/doc/fr/usage-objects-selecting.xml
==============================================================================
--- trunk/doc/fr/usage-objects-selecting.xml	(original)
+++ trunk/doc/fr/usage-objects-selecting.xml	Sun Jun 22 14:59:45 2008
@@ -83,14 +83,14 @@
          Majuscules et cliquez sur les items que vous dÃsirez ajouter.
      </para>
      <note>
-      <para>
+      <simpara>
          En supposant que vous avez sÃlectionnà des objets dans votre diagramme,
          il reste possible de changer la taille de l'un d'eux sans changer la
          taille ou la position des autres objets sÃlectionnÃs. Pour apprendre
          comment changer la taille des objets voir la section Changer la taille
          des objets.
          <!-- need to set up some link right here -->
-      </para>
+      </simpara>
      </note>
     </sect2>
  
@@ -100,7 +100,7 @@
        D'autres moyens de sÃlectionner des objets sont dÃcris ci-dessous,
        toutes ces options peuvent Ãtre atteintes dans le
        <interface>&stdpop;</interface> dans le sous-menu
-       <menuchoice><guimenu>SÃlection</guimenu></menuchoice>&nbsp;:
+       <menuchoice><guimenu>SÃlection</guimenu></menuchoice>&#x00A0;:
     </para>
     <variablelist>
       <varlistentry>
@@ -136,12 +136,12 @@
              de nouveau pour continuer.
           </para>
           <tip>
-            <para>
+            <simpara>
               Souvent, vous aurez à garder vos sÃlections persistantes. Pour ce
-              faire, vous pouvez crÃer un groupe des items sÃlectionnÃs, ou les
+              faire, vous pouvez crÃer un groupe des objets sÃlectionnÃs, ou les
               couper et les coller dans un nouveau calque qui contiendra tous
               les objets de votre sÃlection.
-            </para>
+            </simpara>
             <!-- para
               To learn more about managing groups see the Managing Groups section, and
               to learn more about layers you can also check the Managing Layers section.              
@@ -164,7 +164,7 @@
               autres laissÃs à part.
            </para>
            <tip>
-             <para>
+             <simpara>
                 Un autre moyen est de choisir
                 <menuchoice>
                     <guimenu>SÃlection</guimenu>
@@ -172,17 +172,17 @@
                 </menuchoice>
                 comme dÃcrit plus haut, et de presser la touche Majuscules tout
                 en dÃsectionnant les objets dont vous n'avez pas besoin.
-             </para>
+             </simpara>
            </tip>
    <note>
-     <para>
+     <simpara>
         Seuls les objets prÃsents sur le calque courant peuvent Ãtre
         sÃlectionnÃs. si un objet ne peut Ãtre sÃlectionnÃ, c'est probablement
         qu'il est situà sur un autre calque. RÃfÃrez-vous à la section GÃrer
         les calques pour apprendre comment changer de calque ou comment en
         manipuler beaucoup.
         <!-- need to make a link link to it -->
-     </para>
+     </simpara>
     </note>
          </listitem>
       </varlistentry>
@@ -226,10 +226,10 @@
        formeront un nouveau groupe d'objets sÃlectionnÃs temporairement.
      </para>
      <note>
-      <para>
+      <simpara>
         Si vous rÃpÃtez cette opÃration, tous les objets connectÃs à ce nouveau
         groupe seront ajoutÃs à la sÃlection.
-      </para>
+      </simpara>
       <para>
         Vous pouvez rÃpÃter cette opÃration jusqu'Ã sÃlectionner tous les
         objets interconnectÃs.

Modified: trunk/doc/fr/usage-objects.xml
==============================================================================
--- trunk/doc/fr/usage-objects.xml	(original)
+++ trunk/doc/fr/usage-objects.xml	Sun Jun 22 14:59:45 2008
@@ -18,7 +18,7 @@
      placer dans le canevas.  Cliquer le canevas pour y placer l'objet.
     </para>
     <para>
-     <application>Dia</application> fourni deux types d'objets&nbsp;:
+     <application>Dia</application> fourni deux types d'objets&#x00A0;:
       <itemizedlist>
        <listitem>
         <para>
@@ -53,7 +53,7 @@
        <title>Points d'ajustement</title>
        <screenshot>
          <screeninfo>Les points verts permettent de changer la taille de l'image.</screeninfo>
-         <graphic format="PNG" fileref="graphics/greendots.&pngfile;" srccredit="Kevin Breit" />
+         <graphic format="PNG" fileref="graphics/greendots" srccredit="Kevin Breit" />
        </screenshot>
      </figure> 
      La zone à l'intÃrieur des boites est la surface de l'objet. &og;Cliquez et
@@ -75,11 +75,11 @@
      au milieu des cÃtÃs droit et gauche la largeur.
     </para>
     <tip>
-     <para>
+     <simpara>
       Pour garder les proportions avec les boutons de coin, maintenir appuyÃe
       la touche Majuscules. Ceci ne s'applique qu'aux objets spÃciaux et pas
       aux formes communes.
-     </para>
+     </simpara>
     </tip>
    </sect2>
    <sect2 id="deleting-objects">
@@ -91,10 +91,10 @@
      <menuchoice><guimenu>Ãdition</guimenu><guimenuitem>Supprimer</guimenuitem></menuchoice>
     </para>
     <tip>
-    <para>
+    <simpara>
         Utiliser la touche suppr du clavier aprÃs avoir sÃlectionnà l'objet
         peut Ãtre plus rapide.
-    </para>
+    </simpara>
     </tip>
    </sect2>
    <sect2 id="aligning-objects">
@@ -102,7 +102,7 @@
     <para>
       <application>Dia</application>
       fourni des fonctionnalitÃs pour arranger de multiples objets sans avoir à les bouger individuellement.
-      Par exemple&nbsp;:
+      Par exemple&#x00A0;:
       &stdpop; <menuchoice><guimenu>Objets</guimenu><guimenuitem>Aligner</guimenuitem><guimenuitem>Droite</guimenuitem></menuchoice>
       <!-- TODO explain the different types of Alignment -->
     </para>
@@ -122,13 +122,13 @@
    <title>PropiÃtÃs de la ligne</title>
     <para>
      Un des objets de <application>Dia</application> est la ligne. 
-     L'objet ligne est symbolisà par l'icÃne suivant&nbsp;:
+     L'objet ligne est symbolisà par l'icÃne suivant&#x00A0;:
     </para> 
     <figure>
       <title>L'icÃne ligne</title>
      <screenshot>
       <screeninfo>L'icÃne ligne</screeninfo>
-      <graphic format="PNG" fileref="graphics/line_icon.&pngfile;" srccredit=
+      <graphic format="PNG" fileref="graphics/line_icon" srccredit=
       "Steffen Macke" />
       </screenshot>
     </figure>
@@ -149,7 +149,7 @@
     <title>PropriÃtÃs de ligne</title>
       <screenshot>
         <screeninfo>Les trois sections sont dÃcrites ci-dessous.</screeninfo>
-        <graphic format="PNG" fileref="graphics/line_props.&pngfile;" 
+        <graphic format="PNG" fileref="graphics/line_props" 
 	srccredit="Kevin Breit" />
       </screenshot>
     </figure>
@@ -215,7 +215,7 @@
     A chaque objet sont assignÃes des propriÃtÃs qui lui sont particuliÃres.
     Elle sont accessibles en double-cliquant l'objet dÃjà placà sur le canevas.
     Une fenÃtre apparaÃt, vous permettant d'Ãditer de nombreuses propriÃtÃs
-    incluant&nbsp;:
+    incluant&#x00A0;:
     <itemizedlist>
      <listitem>
       <para>
@@ -246,21 +246,21 @@
     dans la boÃte qui apparaÃt. Voir plus bas la boÃte de sÃlection de
     couleurs.
    <note>
-    <para>
+    <simpara>
      Ces sÃlecteurs de couleur permettent seulement de sÃlectionner les couleurs
      des objets qui n'ont <emphasis>pas encore</emphasis> Ãtà placÃs sur le
      canevas.
-    </para>
+    </simpara>
    </note>
    <tip>
-    <para>
+    <simpara>
      Pour inverser les couleurs, cliquez sur la double-flÃche en haut à droite des deux rectangles de couleurs sur la &toolbox;.
-    </para>
+    </simpara>
    </tip>
    <tip>
-    <para>
+    <simpara>
      Pour remettre à zÃro les couleurs, cliquer les deux petits carrÃs noir et blanc en bas à gauche des rectangles de couleur sur la &toolbox;
-    </para>
+    </simpara>
    </tip>
   </para>
   <sect2>
@@ -271,16 +271,16 @@
                 <screeninfo>La boÃte de sÃlection de couleurs est dÃcrite
                 ci-dessous.</screeninfo>
                 <graphic format="PNG"
-                         fileref="graphics/color_selector.&pngfile;"
+                         fileref="graphics/color_selector"
                          srccredit="Thomas Harding" />
             </screenshot>
       </figure>
       <para>
-        La boÃte de sÃlection de couleurs est divisÃe en 6 zones&nbsp;:
+        La boÃte de sÃlection de couleurs est divisÃe en 6 zones&#x00A0;:
         <itemizedlist>
            <listitem>
               <para>
-                La roue de couleurs&nbsp;: cliquez et glissez le cercle
+                La roue de couleurs&#x00A0;: cliquez et glissez le cercle
                 extÃrieur pour dÃfinir la teinte, puis cliquez et dÃplacez le
                 petit cercle à l'intÃrieur du triangle pour dÃfinir saturation
                 et valeur.

Modified: trunk/doc/fr/usage-quickstart.xml
==============================================================================
--- trunk/doc/fr/usage-quickstart.xml	(original)
+++ trunk/doc/fr/usage-quickstart.xml	Sun Jun 22 14:59:45 2008
@@ -16,7 +16,7 @@
         <screeninfo>Ceci est le diagramme d'un rÃseau domestique
         fait en 5 minutes avec <application>Dia</application>.
         </screeninfo>
-        <graphic format="PNG" fileref="graphics/home_network.&pngfile;"
+        <graphic format="PNG" fileref="graphics/home_network"
         srccredit="Kevin Breit" />
       </screenshot>
     </figure>
@@ -34,7 +34,7 @@
    </para>
   </sect1>
   <sect1 id="quickstart-intro">
-  <title>DÃmarrage rapide&nbsp;: Introduction</title>
+  <title>DÃmarrage rapide&#x00A0;: Introduction</title>
    <para>
     Le dÃmarrage rapide est fait pour l'utilisateur qui ne veut pas lire un
     manuel entier pour ne rÃaliser qu'un diagramme basique.
@@ -66,7 +66,7 @@
    <para>                                                                     
     Dans la &toolbox;, vous pouvez double-cliquer sur tout objet pour voir
     ses propriÃtÃs avancÃes. Cela vous permet de modifier les formes en stock
-    selon vos v&oelig;ux.
+    selon vos vÅux.
    </para>
    <para>
     Les calques crÃent des images multiples, chaque calque est une image.  Ce
@@ -135,7 +135,7 @@
    <!-- qui s'intÃresse à Dia ? -->
     <para>
      <application>Dia</application> est intÃressant dans de nombreux domaines
-     d'activitÃs&nbsp;:
+     d'activitÃs&#x00A0;:
      <itemizedlist>
       <listitem>
        <para>

Added: trunk/doc/html/css/dia.css
==============================================================================
--- (empty file)
+++ trunk/doc/html/css/dia.css	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,273 @@
+/* General formatting */
+
+body { font-family: sans-serif; }
+
+.copyright { color: #7F7F7F; }
+
+/* Title page formatting */
+
+.titlepage h1 {
+text-align: center;
+font-size: huge;
+}
+
+.bookinfo {
+text-align: center; 
+font-size: 16pt;
+}
+
+.bookinfo h1.title  { color: blue; }
+.bookinfo h2.subtitle  { color: blue; }
+.bookinfo h1.author { color: green; }
+
+.bookinfo .copyright { color: black; }
+
+.pubdate {
+color: #7F7F7F;
+font-style: italic;
+font-size: 80%;
+}
+/* ToC page formatting */
+
+.toc a            { text-decoration: none; }
+.toc a:link       { color: blue; }
+.toc a:visited    { color: blue; }
+
+.list-of-figures a            { text-decoration: none; }
+.list-of-figures a:link       { color: blue; }
+.list-of-figures a:visited    { color: blue; }
+
+.list-of-tables a            { text-decoration: none; }
+.list-of-tables a:link       { color: blue; }
+.list-of-tables a:visited    { color: blue; }
+
+/* Navigation header formatting */
+.navheader              { border-bottom: 1px solid black;
+margin-bottom: 10px;
+padding-bottom: 4px;
+}
+
+.navheader hr { display: none; }
+
+/* Navigation footer formatting */
+.navfooter              { border-top: 1px solid black;
+margin-top: 10px;
+padding-top: 4px;
+}
+.navfooter hr { display: none; }
+
+/* General navigation formatting */
+
+.link-text            { font-weight: bold;
+font-size: 80%;
+}
+
+
+.link-text a          { text-decoration: none; }
+.link-text a:link     { color: blue; }
+.link-text a:visited  { color: blue; }
+
+.no-link-text         { color: #7F7F7F; }
+
+/* Admonitions formatting */
+.tip, .warning, .caution, .important, .note {
+margin-left: 1cm;
+margin-right: 1cm;
+margin-bottom: 10px;
+margin-bottom: 10px;
+border-bottom: 1px solid black;
+border-top: 1px solid black;
+}
+
+/* Figures formatting */
+.figure {
+	text-align: center;
+}
+.figure .title {
+	font-size: 80%;
+	font-weight: bold;
+}
+
+/* EOF */
+/* General formatting */
+
+body { font-family: sans-serif; }
+
+.copyright { color: #7F7F7F; }
+
+/* Title page formatting */
+
+.titlepage h1 {
+text-align: center;
+font-size: huge;
+}
+
+.bookinfo {
+text-align: center; 
+font-size: 16pt;
+}
+
+.bookinfo h1.title  { color: blue; }
+.bookinfo h2.subtitle  { color: blue; }
+.bookinfo h1.author { color: green; }
+
+.bookinfo .copyright { color: black; }
+
+.pubdate {
+color: #7F7F7F;
+font-style: italic;
+font-size: 80%;
+}
+/* ToC page formatting */
+
+.toc a            { text-decoration: none; }
+.toc a:link       { color: blue; }
+.toc a:visited    { color: blue; }
+
+.list-of-figures a            { text-decoration: none; }
+.list-of-figures a:link       { color: blue; }
+.list-of-figures a:visited    { color: blue; }
+
+.list-of-tables a            { text-decoration: none; }
+.list-of-tables a:link       { color: blue; }
+.list-of-tables a:visited    { color: blue; }
+
+/* Navigation header formatting */
+.navheader              { border-bottom: 1px solid black;
+margin-bottom: 10px;
+padding-bottom: 4px;
+}
+
+.navheader hr { display: none; }
+
+/* Navigation footer formatting */
+.navfooter              { border-top: 1px solid black;
+margin-top: 10px;
+padding-top: 4px;
+}
+.navfooter hr { display: none; }
+
+/* General navigation formatting */
+
+.link-text            { font-weight: bold;
+font-size: 80%;
+}
+
+
+.link-text a          { text-decoration: none; }
+.link-text a:link     { color: blue; }
+.link-text a:visited  { color: blue; }
+
+.no-link-text         { color: #7F7F7F; }
+
+/* Admonitions formatting */
+.tip, .warning, .caution, .important, .note {
+margin-left: 1cm;
+margin-right: 1cm;
+margin-bottom: 10px;
+margin-bottom: 10px;
+border-bottom: 1px solid black;
+border-top: 1px solid black;
+}
+
+/* Figures formatting */
+.figure {
+	text-align: center;
+}
+.figure .title {
+	font-size: 80%;
+	font-weight: bold;
+}
+
+/* EOF */
+/* General formatting */
+
+body { font-family: sans-serif; }
+
+.copyright { color: #7F7F7F; }
+
+/* Title page formatting */
+
+.titlepage h1 {
+text-align: center;
+font-size: huge;
+}
+
+.bookinfo {
+text-align: center; 
+font-size: 16pt;
+}
+
+.bookinfo h1.title  { color: blue; }
+.bookinfo h2.subtitle  { color: blue; }
+.bookinfo h1.author { color: green; }
+
+.bookinfo .copyright { color: black; }
+
+.pubdate {
+color: #7F7F7F;
+font-style: italic;
+font-size: 80%;
+}
+/* ToC page formatting */
+
+.toc a            { text-decoration: none; }
+.toc a:link       { color: blue; }
+.toc a:visited    { color: blue; }
+
+.list-of-figures a            { text-decoration: none; }
+.list-of-figures a:link       { color: blue; }
+.list-of-figures a:visited    { color: blue; }
+
+.list-of-tables a            { text-decoration: none; }
+.list-of-tables a:link       { color: blue; }
+.list-of-tables a:visited    { color: blue; }
+
+/* Navigation header formatting */
+.navheader              { border-bottom: 1px solid black;
+margin-bottom: 10px;
+padding-bottom: 4px;
+}
+
+.navheader hr { display: none; }
+
+/* Navigation footer formatting */
+.navfooter              { border-top: 1px solid black;
+margin-top: 10px;
+padding-top: 4px;
+}
+.navfooter hr { display: none; }
+
+/* General navigation formatting */
+
+.link-text            { font-weight: bold;
+font-size: 80%;
+}
+
+
+.link-text a          { text-decoration: none; }
+.link-text a:link     { color: blue; }
+.link-text a:visited  { color: blue; }
+
+.no-link-text         { color: #7F7F7F; }
+
+/* Admonitions formatting */
+.tip, .warning, .caution, .important, .note {
+margin-left: 1cm;
+margin-right: 1cm;
+margin-bottom: 10px;
+margin-bottom: 10px;
+border-bottom: 1px solid black;
+border-top: 1px solid black;
+}
+
+/* Figures formatting */
+.figure {
+	text-align: center;
+}
+.figure .title {
+	font-size: 80%;
+	font-weight: bold;
+}
+
+/* EOF */

Added: trunk/doc/html/images/caution.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/caution.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
+	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st4;">
+		<g>
+			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
+			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
+			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
+			<g>
+				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+			</g>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
+	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st4;">
+		<g>
+			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
+			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
+			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
+			<g>
+				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+			</g>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/home.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/home.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st1 "fill:none;stroke:none;">
+	<!ENTITY st2 "fill:#000000;">
+	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:6.3469;stroke-linejoin:round;">
+	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
+	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st0;">
+		<g style="&st4;">
+			<path style="&st3;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
+				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
+			<path style="&st2;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
+				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
+			<path style="&st2;" d="M41.8,22.8l-5.1-4.2v-0.1L31,13.7v0l-6.5-5.5C24.2,8,24,8,23.8,8.2L6.2,22.9c-0.1,0.1-0.1,0.3,0.1,0.3h1.6H10h28.1h1.2h2.3c0.2,0,0.4-0.2,0.2-0.4z"/>
+			<path d="M35.8,16.8l0-5.1c0-0.2-0.1-0.4-0.3-0.4h-3.2c-0.2,0-0.3,0.1-0.3,0.3v2.2l3.9,2.9z"/>
+			<path d="M11.9,24.7V37c0,0.3,0.1,0.4,0.3,0.4h23.6c0.3,0,0.4-0.2,0.4-0.4V24.7H11.9z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st5;">
+		<path style="&st1;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st1 "fill:none;stroke:none;">
+	<!ENTITY st2 "fill:#000000;">
+	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:6.3469;stroke-linejoin:round;">
+	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
+	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st0;">
+		<g style="&st4;">
+			<path style="&st3;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
+				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
+			<path style="&st2;" d="M22.9,7.1L5.1,21.8l0,0c-0.3,0.3-0.5,0.8-0.5,1.2c0,0.2,0,0.4,0.1,0.6c0.3,0.6,0.9,1,1.6,1c0,0,1.1,0,2.2,0c0,2.4,0,14.2,0,14.2c0,1.1,0.8,1.9,1.8,1.9h27.4c1.1,0,1.9-0.9,1.9-2c0,0,0-11.8,0-14.2c1,0,2,0,2,0c0.8,0,1.4-0.5,1.7-1.2
+				c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.2-1-0.7-1.4c0,0-3.6-3-4.5-3.7c0-1.2,0-6.9,0-6.9c0-1.2-0.8-2-2-2h-4.8c-1,0-1.7,0.6-1.9,1.5c-1.9-1.6-4.1-3.5-4.1-3.5l0.1,0.1c-0.7-0.7-1.8-0.8-2.7-0.1z"/>
+			<path style="&st2;" d="M41.8,22.8l-5.1-4.2v-0.1L31,13.7v0l-6.5-5.5C24.2,8,24,8,23.8,8.2L6.2,22.9c-0.1,0.1-0.1,0.3,0.1,0.3h1.6H10h28.1h1.2h2.3c0.2,0,0.4-0.2,0.2-0.4z"/>
+			<path d="M35.8,16.8l0-5.1c0-0.2-0.1-0.4-0.3-0.4h-3.2c-0.2,0-0.3,0.1-0.3,0.3v2.2l3.9,2.9z"/>
+			<path d="M11.9,24.7V37c0,0.3,0.1,0.4,0.3,0.4h23.6c0.3,0,0.4-0.2,0.4-0.4V24.7H11.9z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st5;">
+		<path style="&st1;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/important.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/important.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
+	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st4;">
+		<g>
+			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
+			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
+			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
+			<g>
+				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+			</g>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
+	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st4;">
+		<g>
+			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
+			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
+			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
+			<g>
+				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+			</g>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/next.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/next.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
+			<path style="&st3;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
+			<path style="&st3;" d="M22.4,41.1c0,0.3,0.3,0.3,0.5,0.2l16.6-16.9c0.5-0.5,0.4-0.7,0-1L22.9,6.7c-0.1-0.1-0.4-0.1-0.4,0.1v10H8.9c-0.3,0-0.5,0.2-0.5,0.4l0,13.3C8.4,30.9,8.6,31,9,31h13.5l-0.1,10.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/note.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/note.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:#FFFFFF;stroke-width:12.1438;stroke-linejoin:round;">
+	<!ENTITY st1 "fill:none;stroke-width:1.2429;">
+	<!ENTITY st2 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
+	<!ENTITY st4 "fill:#FFFFFF;stroke-width:6.3824;stroke-linejoin:round;">
+	<!ENTITY st5 "fill:none;stroke:none;">
+	<!ENTITY st6 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st7 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
+	<!ENTITY st8 "stroke:none;">
+	<!ENTITY st9 "fill:none;stroke-width:4.9715;stroke-linejoin:round;">
+]>
+<svg  xmlns="http://www.w3.org/2000/svg"; width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st6;">
+		<path style="&st0;" d="M35.7,19.8v18.9H11V8.8h13.9l10.8,11z"/>
+		<path style="&st3;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st7;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+		<path style="&st4;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+		<path style="&st2;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+	</g>
+	<g id="Layer_x0020_4" style="&st6;">
+		<path style="&st9;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st8;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st8;" d="M20.6,14.7l-2.5,2.5L17,13.4l3.6,1.3z"/>
+		<path style="&st1;" d="M19.6,22.2l3-0.3l2.4-2.4l0.4-2.8"/>
+		<path style="&st2;" d="M20.4,14.9L18.3,17l1.6,5.2l2.7-0.3l2.4-2.4l0.3-2.4l-5-2.2z"/>
+	</g>
+	<g id="crop" style="&st6;">
+		<path style="&st5;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:#FFFFFF;stroke-width:12.1438;stroke-linejoin:round;">
+	<!ENTITY st1 "fill:none;stroke-width:1.2429;">
+	<!ENTITY st2 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
+	<!ENTITY st4 "fill:#FFFFFF;stroke-width:6.3824;stroke-linejoin:round;">
+	<!ENTITY st5 "fill:none;stroke:none;">
+	<!ENTITY st6 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st7 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
+	<!ENTITY st8 "stroke:none;">
+	<!ENTITY st9 "fill:none;stroke-width:4.9715;stroke-linejoin:round;">
+]>
+<svg  xmlns="http://www.w3.org/2000/svg"; width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st6;">
+		<path style="&st0;" d="M35.7,19.8v18.9H11V8.8h13.9l10.8,11z"/>
+		<path style="&st3;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st7;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+		<path style="&st4;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+		<path style="&st2;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+	</g>
+	<g id="Layer_x0020_4" style="&st6;">
+		<path style="&st9;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st8;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
+		<path style="&st8;" d="M20.6,14.7l-2.5,2.5L17,13.4l3.6,1.3z"/>
+		<path style="&st1;" d="M19.6,22.2l3-0.3l2.4-2.4l0.4-2.8"/>
+		<path style="&st2;" d="M20.4,14.9L18.3,17l1.6,5.2l2.7-0.3l2.4-2.4l0.3-2.4l-5-2.2z"/>
+	</g>
+	<g id="crop" style="&st6;">
+		<path style="&st5;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/prev.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/prev.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
+			<path style="&st3;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
+			<path style="&st3;" d="M25.6,6.9c0-0.3-0.3-0.3-0.5-0.2L8.4,23.6c-0.5,0.5-0.4,0.7,0,1l16.6,16.6c0.1,0.1,0.4,0.1,0.4-0.1v-10h13.6c0.3,0,0.5-0.2,0.5-0.4l0-13.3c0-0.3-0.2-0.5-0.5-0.5H25.5l0.1-10.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/tip.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/tip.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:#000000;stroke-width:1.0944;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#FFFFFF;stroke-width:5.6139;stroke-miterlimit:4;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path d="M9.5,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.8,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
+			<path d="M28.1,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path d="M28.1,34.8l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path d="M28.1,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8s0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8s-0.9-1.5-1.8-1.4z"/>
+			<path d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6c0.9,0,1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
+			<path style="&st1;" d="M35.9,18.7c0,6.6-5.4,12-12,12c-6.6,0-12-5.4-12-12s5.4-12,12-12c6.6,0,12,5.4,12,12z"/>
+			<path style="&st5;" d="M9.6,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.9,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
+			<path style="&st5;" d="M28.2,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M28.2,34.7l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M28.2,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6s1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
+			<path style="&st0;" d="M22.3,28.3l-3.5-10.7c0,0,6.6,3.9,10.5,0"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:#000000;stroke-width:1.0944;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:none;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#FFFFFF;stroke-width:5.6139;stroke-miterlimit:4;">
+	<!ENTITY st3 "fill:none;stroke:none;">
+	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st5 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path d="M9.5,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.8,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
+			<path d="M28.1,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path d="M28.1,34.8l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path d="M28.1,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8s0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8s-0.9-1.5-1.8-1.4z"/>
+			<path d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6c0.9,0,1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
+			<path style="&st1;" d="M35.9,18.7c0,6.6-5.4,12-12,12c-6.6,0-12-5.4-12-12s5.4-12,12-12c6.6,0,12,5.4,12,12z"/>
+			<path style="&st5;" d="M9.6,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.9,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
+			<path style="&st5;" d="M28.2,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M28.2,34.7l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M28.2,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
+			<path style="&st5;" d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6s1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
+			<path style="&st0;" d="M22.3,28.3l-3.5-10.7c0,0,6.6,3.9,10.5,0"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st4;">
+		<path style="&st3;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/up.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/up.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
+			<path style="&st3;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:none;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7.5901;stroke-linejoin:round;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_3" style="&st2;">
+		<g>
+			<path style="&st1;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
+			<path style="&st3;" d="M41.1,25.6c0.3,0,0.3-0.3,0.2-0.5L24.4,8.4c-0.5-0.5-0.7-0.4-1,0L6.7,25.1c-0.1,0.1-0.1,0.4,0.1,0.4h10v13.6c0,0.3,0.2,0.5,0.4,0.5l13.3,0c0.3,0,0.5-0.2,0.5-0.5V25.5l10.1,0.1z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st2;">
+		<path style="&st0;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Added: trunk/doc/html/images/warning.svg
==============================================================================
--- (empty file)
+++ trunk/doc/html/images/warning.svg	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#000000;stroke:#FFFFFF;stroke-width:7.9139;stroke-linejoin:round;">
+	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st2 "fill:none;stroke:none;">
+	<!ENTITY st3 "fill:#000000;">
+	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
+	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_4" style="&st1;">
+		<g style="&st4;">
+			<path style="&st0;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
+			<path style="&st3;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
+			<path d="M11.7,17.7l18.7,18.7l5.9-5.9L17.6,11.7l-5.9,5.9z"/>
+			<path d="M11.7,30.5l5.9,5.9l18.7-18.7l-5.9-5.9L11.7,30.5z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st5;">
+		<path style="&st2;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY st0 "fill:#000000;stroke:#FFFFFF;stroke-width:7.9139;stroke-linejoin:round;">
+	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st2 "fill:none;stroke:none;">
+	<!ENTITY st3 "fill:#000000;">
+	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
+	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg";>
+	<g id="Layer_x0020_4" style="&st1;">
+		<g style="&st4;">
+			<path style="&st0;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
+			<path style="&st3;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
+			<path d="M11.7,17.7l18.7,18.7l5.9-5.9L17.6,11.7l-5.9,5.9z"/>
+			<path d="M11.7,30.5l5.9,5.9l18.7-18.7l-5.9-5.9L11.7,30.5z"/>
+		</g>
+	</g>
+	<g id="crop_x0020_marks" style="&st5;">
+		<path style="&st2;" d="M48,48H0V0h48v48z"/>
+	</g>
+</svg>

Modified: trunk/doc/pl/Makefile.am
==============================================================================
--- trunk/doc/pl/Makefile.am	(original)
+++ trunk/doc/pl/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,13 +1,31 @@
-figdir=graphics
 docname=dia
 lang=pl
-omffile=
+figdir=graphics
+omffile=dia-pl.omf
 entities=
+progname = dia
+progfiles_extension = dia
+PAPERSIZE = A4
+## postscript ouput resolution (dpi)
+RESOLUTION = 600
+## document encoding
+DOCUMENT_ENCODING = ISO-8859-2
+## dblatex tex document charset
+ENCODING = utf8
+UNICODE = 1
+## TeX papersize/sides
+LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside' -P 'latex.babel.use=0'
+
 
 include $(top_srcdir)/xmldocs.make
+
 dist-hook: app-dist-hook
 
-EXTRA_DIST += \
+nodist_include_EXTRAS = dia.1
+
+
+
+xml_files += \
 	authors.xml \
 	dia.xml \
 	intro.xml \
@@ -19,9 +37,80 @@
 	usage-objects-selecting.xml \
 	usage-objects-special.xml \
 	usage-objects.xml \
-	usage-quickstart.xml \
-	graphics/line_props.png \
+	usage-quickstart.xml 
+
+##	usage-objects-basic.xml \
+##	dia-cmdline.xml \
+##	entities.xml \
+##	dia-1.xml
+
+
+EXTRA_DIST +=
+
+##	dia.dbk \
+##	dia-1.xml
+##	dia-dbk-to-chapter.sed
+##	graphics/line_props.png \
+##	graphics/home_network.png \
+##	graphics/line_icon.png \
+##	graphics/greendots.png
+
+pngfigures = \
+	graphics/greendots.png \
 	graphics/home_network.png \
-	graphics/greendots.png
+	graphics/line_props.png
+
+##	graphics/line_icon.png \
+
+epsfigures = 
+
+xmlsources = \
+	authors.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	dia.xml \
+	usage-loadsave.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml
+
+##
+##	dia-cmdline.xml \
+##	usage-objects-basic.xml \
+##	entities.xml \
+##	dia-1.xml \
+
+htmlstyle = \
+	html.xsl
+
+
+metadata = \
+	dia-eu.omf \
+	topic.dat
+
+examples = \
+	../shape.dtd \
+	../diagram.dtd \
+	../sheet.dtd
+
+##	$(progname).$(progfiles_extension) \
+
+DISTCLEANFILES = 
 
-#	usage-objects-basic.xml
+##if HAVE_DB2MAN
+### Anyone out there who understands automake?
+##DISTCLEANFILES += dia.1
+### If we want misconfigured XML catalogs to not try net access, use
+### --nonet.  But I don't think that's going to solve more problems
+### than it causes.
+##dia.1: dia.dbk
+##	xsltproc --novalid $(DB2MAN) $< >dia.1
+##
+##man_MANS = dia.1
+##endif
+##
+##

Modified: trunk/doc/pl/authors.xml
==============================================================================
--- trunk/doc/pl/authors.xml	(original)
+++ trunk/doc/pl/authors.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="9" id="authors-chap">
 <title>Authors</title>
   <para>

Modified: trunk/doc/pl/dia-pl.omf
==============================================================================
--- trunk/doc/pl/dia-pl.omf	(original)
+++ trunk/doc/pl/dia-pl.omf	Sun Jun 22 14:59:45 2008
@@ -1,14 +1,36 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
+<!DOCTYPE omf PUBLIC "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
 <omf>
   <resource>
-    <title>
+   <creator>Henry House</creator>
+   <creator>Judith Samson</creator>
+   <creator>Kevin Breit</creator>
+   <creator>Alan Horkan</creator>
+   <maintainer>docs gnome org</maintainer>
+   <contributor>James Henstridge</contributor>
+   <contributor>Dolores Alia de Saravia</contributor>
+   <contributor>Fredrik Hallenberg</contributor>
+   <contributor>W. Borgert</contributor>
+   <title>
       Podrênik Dia
     </title>
-    <subject>
-      <category>GNOME|Office</category>
-   </subject>
-   <format mime="text/sgml"/>
-   <identifier url="panel.sgml"/>
+   <date>05/20/2007</date>
+   <version id="dia-manual-pl-0.1" identifier="0.1" date="05-26-2008" description="no changes" />
+   <!-- please specify subject for your distribution 
+        as ANOTHER "subject" element -->
+   <subject category="GNOME|Applications|Graphics"></subject>
+   <subject category="GNOME|Applications|Office"></subject>
+   <subject category="Applications|Multimedia|Graphics"></subject>
+   <subject category="GNOME|Office"></subject>
+   <description>
+	Podrênik Dia
+   </description>
+   <type>
+     user's guide
+   </type>
+   <format mime="application/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN" />
+   <identifier url="file:///usr/local/share/dia/doc/dia.xml"/>
    <language code="pl" />
+   <relation seriesid="dia" />
  </resource>
 </omf>

Modified: trunk/doc/pl/dia.xml
==============================================================================
--- trunk/doc/pl/dia.xml	(original)
+++ trunk/doc/pl/dia.xml	Sun Jun 22 14:59:45 2008
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding='iso-8859-2' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "http://docbook.org/xml/4.4/docbookx.dtd";
 
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.96">
+[
+<!ENTITY VERSION "0.92.2">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">
 <!ENTITY OBJECTS SYSTEM "usage-objects.xml">
-<!--<!ENTITY BASIC-OBJECTS SYSTEM "usage-objects-basic.xml">-->
+<!ENTITY BASIC-OBJECTS SYSTEM "usage-objects-basic.xml">
 <!ENTITY SPECIAL-OBJECTS SYSTEM "usage-objects-special.xml">
 <!ENTITY SELECTING-OBJECTS SYSTEM "usage-objects-selecting.xml">
 <!ENTITY LOADING-SAVING SYSTEM "usage-loadsave.xml">
@@ -17,7 +18,7 @@
 <!ENTITY LICENSE SYSTEM "license.xml">
 ]>
 
-<book id="index" lang="pl"> <!-- proszêie zmieniaædentyfikatora -->
+<book id="index"> <!-- proszêie zmieniaædentyfikatora -->
 
  <bookinfo>
   <title>Dia</title>

Modified: trunk/doc/pl/intro.xml
==============================================================================
--- trunk/doc/pl/intro.xml	(original)
+++ trunk/doc/pl/intro.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="1" id="intro-chapter">
 <title>Wprowadzenie</title>
  <sect1 id="intro">

Modified: trunk/doc/pl/license.xml
==============================================================================
--- trunk/doc/pl/license.xml	(original)
+++ trunk/doc/pl/license.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="10" id="license-chapter">
 <title>Licencja</title>
  <sect1 id="license">

Modified: trunk/doc/pl/usage-canvas.xml
==============================================================================
--- trunk/doc/pl/usage-canvas.xml	(original)
+++ trunk/doc/pl/usage-canvas.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="2" id="canvas-chapter">
 <title>P³ó</title>
  <sect1 id="canvas">

Modified: trunk/doc/pl/usage-customization.xml
==============================================================================
--- trunk/doc/pl/usage-customization.xml	(original)
+++ trunk/doc/pl/usage-customization.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="8" id="usage-customization">
 <title>Dostosowywanie</title>
  <sect1 id="prefs">

Modified: trunk/doc/pl/usage-layers.xml
==============================================================================
--- trunk/doc/pl/usage-layers.xml	(original)
+++ trunk/doc/pl/usage-layers.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="?" id="layers-chapter">
 <title>Zarz±dzanie warstwami</title> 
   <!-- (informacja wprowadzaj±ca...)  --> 

Modified: trunk/doc/pl/usage-loadsave.xml
==============================================================================
--- trunk/doc/pl/usage-loadsave.xml	(original)
+++ trunk/doc/pl/usage-loadsave.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="7" id="loadsave-chapter">
 <title>Wczytywanie i zapisywanie diagramótitle>
 <sect1 id="loadsave-intro">

Modified: trunk/doc/pl/usage-objects-selecting.xml
==============================================================================
--- trunk/doc/pl/usage-objects-selecting.xml	(original)
+++ trunk/doc/pl/usage-objects-selecting.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="6" id="selecting-chapter">
 <title>Wybieranie obiektótitle>
   <sect1 id="selecting-introduction">

Modified: trunk/doc/pl/usage-objects-special.xml
==============================================================================
--- trunk/doc/pl/usage-objects-special.xml	(original)
+++ trunk/doc/pl/usage-objects-special.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="5" id="special-objects-chapter">
 <title>Obiekty specjalne</title>
  <sect1 id="special-objects">

Modified: trunk/doc/pl/usage-objects.xml
==============================================================================
--- trunk/doc/pl/usage-objects.xml	(original)
+++ trunk/doc/pl/usage-objects.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="3" id="objects-chapter">
 <title>Obiekty</title>
   <sect1 id="objects-introduction">
@@ -56,7 +56,7 @@
        <title>Kropki dopasowuj±ce</title>
        <screenshot>
          <screeninfo>Zielone kropki umo¿liwiaj± zmianêozmiaru obrazu.</screeninfo>
-         <graphic format="png" fileref="graphics/greendots" srccredit="Kevin Breit" />
+         <graphic format="PNG" fileref="graphics/greendots" srccredit="Kevin Breit" />
        </screenshot>
      </figure>
      Przestrzeñwn±trz ramek jest przestrzeni± obiektu. Klikniêe i
@@ -129,7 +129,7 @@
     <title>W³a¶ciwo¶ci linii</title>
       <screenshot>
         <screeninfo>Poni¿ej zosta³y opisane wszystkie trzy akapity.</screeninfo>
-        <graphic format="png" fileref="graphics/line_props" srccredit="Kevin Breit" />
+        <graphic format="PNG" fileref="graphics/line_props" srccredit="Kevin Breit" />
       </screenshot>
     </figure>
     <para>

Modified: trunk/doc/pl/usage-quickstart.xml
==============================================================================
--- trunk/doc/pl/usage-quickstart.xml	(original)
+++ trunk/doc/pl/usage-quickstart.xml	Sun Jun 22 14:59:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <chapter label="1" id="quickstart-chapter">
 <title>Quickstart</title>
   <sect1 id="what-can-you-do">
@@ -18,7 +18,7 @@
         <screeninfo>To jest diagram sieci domowej stworzonym w 5 minut
         przy u¿yciu <application>Dia</application>.
         </screeninfo>
-        <graphic format="png" fileref="graphics/home_network" srccredit="Kevin Breit" />
+        <graphic format="PNG" fileref="graphics/home_network" srccredit="Kevin Breit" />
       </screenshot>
     </figure>
   </para>

Added: trunk/hardcopies.make
==============================================================================
--- (empty file)
+++ trunk/hardcopies.make	Sun Jun 22 14:59:45 2008
@@ -0,0 +1,181 @@
+
+##
+## hardcopies.make
+##
+## HTML, PDF and Postcript documentation generation
+## DO NOT MODIFY THIS FILE 
+##
+## COPY doc/en/Makefile.am in your doc/[language] directory,
+## then edit variables as needed
+##
+##
+
+sysdoc = $(datadir)/doc/$(docname)/$(lang)
+
+if WITH_HTMLDOC
+htmldoc = $(progname)_html
+html_install = install-html
+html_uninstall = uninstall-html
+html_clean = clean-html
+endif
+
+if WITH_JW
+pdfdoc = $(progname).pdf
+pdf_install = install-pdf
+psdoc = $(progname).ps
+ps_install = install-ps
+endif
+
+if WITH_PDFDOC
+pdfdoc = $(progname).pdf
+pdf_install = install-pdf
+endif
+
+if WITH_PSDOC
+psdoc = $(progname).ps
+ps_install = install-ps
+endif
+
+all: omf $(htmldoc) $(pdfdoc) $(psdoc)
+
+install-data-local: install-data-xml \
+	$(html_install) $(pdf_install) $(ps_install) 
+
+## install-examples
+
+uninstall-local: uninstall-local-xml  \
+	uninstall-html uninstall-pdf uninstall-ps \
+	uninstall-ps uninstall-pdf
+
+## uninstall-examples
+
+clean-local: clean-local-xml \
+	clean-html clean-ps clean-pdf
+
+$(progname)_html: $(progname)-cmdline.xml $(pngfigures) \
+	$(xmlsources) $(htmlstyle)
+	$(mkinstalldirs) $(srcdir)/$(progname)_html
+	$(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir)
+	$(mkinstalldirs) $(srcdir)/$(progname)_html/images
+	$(mkinstalldirs) $(srcdir)/$(progname)_html/images/callouts
+	$(mkinstalldirs) $(srcdir)/$(progname)_html/css
+	-cp ../html/images/*.png $(srcdir)/$(progname)_html/images
+	-cp ../html/images/callouts/*.png \
+	  $(srcdir)/$(progname)_html/images/callouts
+	-cp ../html/css/*.css $(srcdir)/$(progname)_html/css
+	-cp $(srcdir)/$(figdir)/*.png $(srcdir)/$(progname)_html/$(figdir)
+	cd $(srcdir)/$(progname)_html \
+	  && xsltproc --stringparam graphic.default.extension png \
+	    ../$(htmlstyle) ../$(progname).xml
+	touch $(progname)_html
+
+if WITH_PDFDOC
+$(progname).pdf: $(srcdir)/$(progname).xml $(progname)-cmdline.xml \
+	$(pngfigures) $(xmlsources)
+	-$(DBLATEX) -t pdf -T  native \
+		-P 'latex.unicode.use=$(UNICODE)' \
+		-P latex.encoding='$(ENCODING)' \
+		$(LATEX_CLASS_OPTIONS) \
+		$<
+endif
+
+.epsfigures: $(epsfigures) $(pngfigures)
+	-if test -d "$(srcdir)/$(figdir)"; then \
+	  for file in $(pngfigures) ; do \
+	    destfile=$(srcdir)/$(figdir)/`basename $$file .png`.eps ; \
+	    convert $$file $$destfile; \
+	  done ; \
+	fi
+	-if test -d "$(srcdir)/ps/$(figdir)"; then \
+	  for file in $(epsfigures) ; do \
+	    cp  $$file $(srcdir)/$(figdir)/ ; \
+	  done ; \
+	fi
+	touch .epsfigures
+
+if WITH_PSDOC
+$(progname).ps: $(srcdir)/$(progname).xml \
+	$(progname)-cmdline.xml .epsfigures $(xmlsources)
+	-$(DBLATEX) -t ps -T native \
+	        $(stylesheet) \
+		-P 'latex.unicode.use=$(UNICODE)' \
+		-P 'latex.encoding=$(ENCODING)' \
+		$(LATEX_CLASS_OPTIONS) \
+		$(srcdir)/$<
+endif
+
+if WITH_JW
+.jw: $(srcdir)/$(progname).xml \
+	$(progname)-cmdline.xml .epsfigures $(xmlsources)
+	rm -rf jw
+	mkdir -p jw
+	cp -r graphics jw
+	cp *.xml jw
+	flip -b -u *.xml
+	cd jw && recode -d '$(DOCUMENT_ENCODING)..XML-standalone' *.xml
+	touch .jw
+
+$(progname).ps: jw
+	cd jw && $(JW) -b ps -V paper-type=$(PAPERSIZE) $(progname).xml
+	cp jw/$(progname).ps .
+
+$(progname).pdf: jw
+	cd jw && $(JW) -b pdf -V paper-type=$(PAPERSIZE) $(progname).xml
+	cp jw/$(progname).pdf .
+endif
+
+install-html: $(progname)_html
+	$(mkinstalldirs) $(sysdoc)/html
+	cp -r $(srcdir)/$(progname)_html/* $(sysdoc)/html
+
+uninstall-html:
+	-rm -f $(sysdoc)/html/*.html
+	-rm -f $(sysdoc)/html/$(figdir)/*
+	-rm -f $(sysdoc)/html/images/callouts/*
+	-rm -f $(sysdoc)/html/images/*
+	-rm -f $(sysdoc)/html/css/*
+
+clean-html:
+	-rm -rf $(srcdir)/$(progname)_html
+
+
+install-pdf: $(progname).pdf
+	$(mkinstalldirs) $(sysdoc)
+	-$(INSTALL_DATA) $< $(sysdoc)/$<
+
+uninstall-pdf:
+	-rm -f $(sysdoc)/$(progname).pdf
+
+clean-pdf:
+	rm -f $(progname).pdf
+	-rm -rf $(srcdir)/jw
+	rm -f .jw
+
+install-ps: $(progname).ps
+	$(mkinstalldirs) $(sysdoc)
+	-$(INSTALL_DATA) $< $(sysdoc)/$<
+
+uninstall-ps:
+	-rm -f $(sysdoc)/$(progname).ps
+
+clean-ps:
+	-rm -rf $(srcdir)/tex
+	-rm -f $(progname).ps
+	-rm -f .epsfigures
+	-rm -f $(srcdir)/graphics/*.eps
+	-rm -rf $(srcdir)/jw
+	rm -f .jw
+
+install-examples: $(examples)
+	$(mkinstalldirs) $(sysdoc)/examples
+	for i in $^; do \
+	  if test -f "$$i"; then  \
+	    echo "installing $$i" ;\
+	    $(INSTALL_DATA) $$i $(sysdoc)/examples/$$(basename $$i) ; \
+	  fi ; \
+	done
+
+uninstall-examples: $(examples)
+	for i in $^; do \
+	  rm -f $(sysdoc)/examples/$$(basename $$i) ;\
+	done

Modified: trunk/omf.make
==============================================================================
--- trunk/omf.make	(original)
+++ trunk/omf.make	Sun Jun 22 14:59:45 2008
@@ -37,7 +37,7 @@
 omf_timestamp: $(omffile)
 	-if test "$(omffile)"; then \
 	  for file in $(omffile); do \
-	    scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
+	    scrollkeeper-preinstall $(DESTDIR)$(helpdocdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
 	  done; \
 	fi;
 	touch omf_timestamp

Modified: trunk/samples/Makefile.am
==============================================================================
--- trunk/samples/Makefile.am	(original)
+++ trunk/samples/Makefile.am	Sun Jun 22 14:59:45 2008
@@ -1,9 +1,19 @@
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ER-demo.dia UML-demo.dia \
-	SADT.dia chronograms.dia grafcet.dia \
-	Istar.dia Jackson.dia KAOS.dia all_objects.dia \
-	render-test.dia UMLPackages.dia TexChars.dia \
-	Metapost-Testcase.dia CompositeAction.dia \
-	dia_gnome_icon.png dia_logo.png
+EXTRA_DIST = \
+	ER-demo.dia \
+	UML-demo.dia \
+	SADT.dia \
+	chronograms.dia \
+	grafcet.dia \
+	Istar.dia \
+	Jackson.dia \
+	KAOS.dia \
+	render-test.dia \
+	UMLPackages.dia \
+	TexChars.dia \
+	Metapost-Testcase.dia \
+	CompositeAction.dia \
+	dia_gnome_icon.png \
+	dia_logo.png
 

Modified: trunk/xmldocs.make
==============================================================================
--- trunk/xmldocs.make	(original)
+++ trunk/xmldocs.make	Sun Jun 22 14:59:45 2008
@@ -49,8 +49,7 @@
 CLEANFILES = omf_timestamp
 
 include $(top_srcdir)/omf.make
-
-all: omf
+include $(top_srcdir)/hardcopies.make
 
 $(docname).xml: $(entities)
 	-ourdir=`pwd`;  \
@@ -66,7 +65,7 @@
 	  done \
 	fi
 
-install-data-local: omf
+install-data-xml: omf
 	$(mkinstalldirs) $(DESTDIR)$(helpdocdir)
 	for file in $(xml_files); do \
 	  cp $(srcdir)/$$file $(DESTDIR)$(helpdocdir); \
@@ -81,19 +80,13 @@
 
 install-data-hook: install-data-hook-omf
 
-uninstall-local: uninstall-local-doc uninstall-local-omf
+uninstall-local-xml: uninstall-local-doc uninstall-local-omf
 
 uninstall-local-doc:
-	-if test "$(figdir)"; then \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(DESTDIR)$(helpdocdir)/$(figdir)/$$basefile; \
-	  done; \
-	  rmdir $(DESTDIR)$(helpdocdir)/$(figdir); \
-	fi
-	-for file in $(xml_files); do \
-	  rm -f $(DESTDIR)$(helpdocdir)/$$file; \
-	done
+	-rm -f $(DESTDIR)$(helpdocdir)/$(figdir)/*
+	-rmdir $(DESTDIR)$(helpdocdir)/$(figdir)
+	-rm -f $(DESTDIR)$(helpdocdir)/*
+	-rmdir $(DESTDIR)$(helpdocdir)/*
 	-rmdir $(DESTDIR)$(helpdocdir)
 
-clean-local: clean-local-omf
+clean-local-xml: clean-local-omf



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]