summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2008-06-22 14:59:45 +0000
committerHans Breuer <hans@src.gnome.org>2008-06-22 14:59:45 +0000
commit0e57f7de313403b11b0d00c0576cf8da8715e65f (patch)
treee3adb5dc9082b4e1c2596136ae5f6b2298a11844
parenta44bb79e906dee92da1228bcf54d227d60fc9273 (diff)
downloaddia-0e57f7de313403b11b0d00c0576cf8da8715e65f.tar.xz
[Patch from Thomas Harding improving the documentation generation] moved
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 svn path=/trunk/; revision=4070
-rw-r--r--ChangeLog43
-rw-r--r--configure.in43
-rw-r--r--doc/Makefile.am21
-rw-r--r--doc/en/Makefile.am98
-rw-r--r--doc/en/README.hardcopies14
-rw-r--r--doc/en/dia-1.xml694
-rw-r--r--doc/en/dia-C.omf34
-rw-r--r--doc/en/dia-cmdline.xml21
-rw-r--r--doc/en/dia-dbk-to-chapter.sed19
-rw-r--r--doc/en/dia.xml21
-rw-r--r--doc/en/hardcopies.makefile250
-rw-r--r--doc/en/html.xsl34
-rw-r--r--doc/en/ps/graphics/preferences_fig.eps (renamed from doc/en/ps/graphics/preferences-fig.eps)0
-rw-r--r--doc/en/usage-customization.xml2
-rw-r--r--doc/en/usage-objects.xml8
-rw-r--r--doc/en/usage-quickstart.xml2
-rw-r--r--doc/eu/Makefile.am95
-rw-r--r--doc/eu/dia-eu.omf39
-rw-r--r--doc/eu/dia.1754
-rw-r--r--doc/eu/dia.dbk327
-rw-r--r--doc/eu/dia.xml4
-rw-r--r--doc/eu/usage-objects.xml530
-rw-r--r--doc/eu/usage-quickstart.xml320
-rw-r--r--doc/fr/Makefile.am76
-rw-r--r--doc/fr/README.hardcopies14
-rw-r--r--doc/fr/custom-shapes.xml4
-rw-r--r--doc/fr/dia-1.xml724
-rw-r--r--doc/fr/dia-dbk-to-chapter.sed19
-rw-r--r--doc/fr/dia-fr.omf33
-rw-r--r--doc/fr/dia.xml30
-rw-r--r--doc/fr/hardcopies.makefile267
-rw-r--r--doc/fr/html.xsl34
-rw-r--r--doc/fr/notes.xml6
-rw-r--r--doc/fr/usage-customization.xml30
-rw-r--r--doc/fr/usage-layers.xml32
-rw-r--r--doc/fr/usage-loadsave.xml10
-rw-r--r--doc/fr/usage-objects-basic.xml16
-rw-r--r--doc/fr/usage-objects-selecting.xml24
-rw-r--r--doc/fr/usage-objects.xml40
-rw-r--r--doc/fr/usage-quickstart.xml8
-rw-r--r--doc/html/css/dia.css273
-rw-r--r--doc/html/images/caution.svg50
-rw-r--r--doc/html/images/home.svg52
-rw-r--r--doc/html/images/important.svg50
-rw-r--r--doc/html/images/next.svg38
-rw-r--r--doc/html/images/note.svg66
-rw-r--r--doc/html/images/prev.svg38
-rw-r--r--doc/html/images/tip.svg62
-rw-r--r--doc/html/images/up.svg38
-rw-r--r--doc/html/images/warning.svg46
-rw-r--r--doc/pl/Makefile.am103
-rw-r--r--doc/pl/authors.xml2
-rw-r--r--doc/pl/dia-pl.omf36
-rw-r--r--doc/pl/dia.xml11
-rw-r--r--doc/pl/intro.xml2
-rw-r--r--doc/pl/license.xml2
-rw-r--r--doc/pl/usage-canvas.xml2
-rw-r--r--doc/pl/usage-customization.xml2
-rw-r--r--doc/pl/usage-layers.xml2
-rw-r--r--doc/pl/usage-loadsave.xml2
-rw-r--r--doc/pl/usage-objects-selecting.xml2
-rw-r--r--doc/pl/usage-objects-special.xml2
-rw-r--r--doc/pl/usage-objects.xml6
-rw-r--r--doc/pl/usage-quickstart.xml4
-rw-r--r--hardcopies.make181
-rw-r--r--omf.make2
-rw-r--r--samples/Makefile.am22
-rw-r--r--xmldocs.make23
68 files changed, 3451 insertions, 2408 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b3e6c56..369c0b28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+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
+
2008-06-07 Steffen Macke <sdteffen@sdteffen.de>
* shapes/Cisco/telecommuter_house_router.png:
diff --git a/configure.in b/configure.in
index e187b667..4c1fb1c3 100644
--- a/configure.in
+++ b/configure.in
@@ -474,6 +474,47 @@ if test "x$with_swig" != xno; then
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 @@ Configuration:
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..."
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cd287e69..7f8d826a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
+docname = dia
-SUBDIRS = en eu pl fr
+SUBDIRS = en fr eu pl
EXTRA_DIST = \
custom-shapes \
@@ -8,13 +9,27 @@ EXTRA_DIST = \
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)/*
+
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index c98cb6f3..167b27b2 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -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 @@ xml_files += \
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
-
diff --git a/doc/en/README.hardcopies b/doc/en/README.hardcopies
deleted file mode 100644
index 42aee3cc..00000000
--- a/doc/en/README.hardcopies
+++ /dev/null
@@ -1,14 +0,0 @@
-
-to build pdf, postscript and html, run:
-
-Make -f hardcopies.makefile dia.pdf dia.ps dia.html
-
-from this directory
-
-
-REQUIREMENTS:
- - "convert" from ImageMagick (only for postscript output)
- - openjade
- - "jw" (from docbook-utils package in Debian)
- depends on jadetex
- - sed
diff --git a/doc/en/dia-1.xml b/doc/en/dia-1.xml
index 857f9e35..164a5eaa 100644
--- a/doc/en/dia-1.xml
+++ b/doc/en/dia-1.xml
@@ -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>
diff --git a/doc/en/dia-C.omf b/doc/en/dia-C.omf
index 5979ca1c..1d8e7005 100644
--- a/doc/en/dia-C.omf
+++ b/doc/en/dia-C.omf
@@ -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>
diff --git a/doc/en/dia-cmdline.xml b/doc/en/dia-cmdline.xml
new file mode 100644
index 00000000..8e717b40
--- /dev/null
+++ b/doc/en/dia-cmdline.xml
@@ -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>
diff --git a/doc/en/dia-dbk-to-chapter.sed b/doc/en/dia-dbk-to-chapter.sed
index c98b3ae4..e69de29b 100644
--- a/doc/en/dia-dbk-to-chapter.sed
+++ b/doc/en/dia-dbk-to-chapter.sed
@@ -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>
diff --git a/doc/en/dia.xml b/doc/en/dia.xml
index e00962bb..a35b46b9 100644
--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -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>
diff --git a/doc/en/hardcopies.makefile b/doc/en/hardcopies.makefile
index 01c27a4a..e69de29b 100644
--- a/doc/en/hardcopies.makefile
+++ b/doc/en/hardcopies.makefile
@@ -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
-
diff --git a/doc/en/html.xsl b/doc/en/html.xsl
index 763ba923..a4e4f0b2 100644
--- a/doc/en/html.xsl
+++ b/doc/en/html.xsl
@@ -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>
diff --git a/doc/en/ps/graphics/preferences-fig.eps b/doc/en/ps/graphics/preferences_fig.eps
index ac35780c..ac35780c 100644
--- a/doc/en/ps/graphics/preferences-fig.eps
+++ b/doc/en/ps/graphics/preferences_fig.eps
diff --git a/doc/en/usage-customization.xml b/doc/en/usage-customization.xml
index 1576b1ae..4c83ccfd 100644
--- a/doc/en/usage-customization.xml
+++ b/doc/en/usage-customization.xml
@@ -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>
diff --git a/doc/en/usage-objects.xml b/doc/en/usage-objects.xml
index e7854384..f5282e93 100644
--- a/doc/en/usage-objects.xml
+++ b/doc/en/usage-objects.xml
@@ -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>
diff --git a/doc/en/usage-quickstart.xml b/doc/en/usage-quickstart.xml
index a4c8fc6b..39236a7e 100644
--- a/doc/en/usage-quickstart.xml
+++ b/doc/en/usage-quickstart.xml
@@ -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>
diff --git a/doc/eu/Makefile.am b/doc/eu/Makefile.am
index 9562946f..5e12827c 100644
--- a/doc/eu/Makefile.am
+++ b/doc/eu/Makefile.am
@@ -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 @@ EXTRA_DIST += \
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
+
diff --git a/doc/eu/dia-eu.omf b/doc/eu/dia-eu.omf
index 27988122..1d5d3acf 100644
--- a/doc/eu/dia-eu.omf
+++ b/doc/eu/dia-eu.omf
@@ -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>
-
diff --git a/doc/eu/dia.1 b/doc/eu/dia.1
index 4b45ca17..c297cb88 100644
--- a/doc/eu/dia.1
+++ b/doc/eu/dia.1
@@ -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.
+\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.
+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.
+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
+.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\.
+.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
-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\.
+.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
diff --git a/doc/eu/dia.dbk b/doc/eu/dia.dbk
index 1de59778..9dca60de 100644
--- a/doc/eu/dia.dbk
+++ b/doc/eu/dia.dbk
@@ -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>
diff --git a/doc/eu/dia.xml b/doc/eu/dia.xml
index 189ff61c..78c47f59 100644
--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -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 -->
diff --git a/doc/eu/usage-objects.xml b/doc/eu/usage-objects.xml
index 04ad7b9b..9301bf72 100644
--- a/doc/eu/usage-objects.xml
+++ b/doc/eu/usage-objects.xml
@@ -1,265 +1,265 @@
-<chapter label="3" id="objects-chapter">
-<title>Objektuak</title>
- <sect1 id="objects-introduction">
- <title>Objektuen sarrera</title>
-
-<para>
-Objektuak dira diagrama osatzen dutenak. Aurrez definitutako edo
-erabiltzaileak definitutako formak dira objektuak.
-</para>
-</sect1>
-<sect1 id="using-objects">
- <title>Objektuak erabiltzea</title>
- <sect2 id="adding-objects">
- <title>Objektuak gehitzea</title>
-
-<para>
-<application>Dia</application>-ren oihalean objektuak gehitzeko,
-egin klik tresna-barrako objektu batean, zuk nahi duzun objektua
-hautatzeko. Oihalean klik egitean objektua bertan kokatuta geratuko da.
-</para>
-
-<para>
-<application>Dia</application>-k bi motatako objektuak eskaintzen ditu:
-<itemizedlist>
-
-<listitem>
-
-<para>
-Erabiltzaileak definitutako objektuak - Erabiltzaileak sortzen dituen
-objektuak txantiloi prefabrikatu batean oinarrituta.
-</para>
-
-<para>
-Adibidez, objektu karratu batean klik egin eta oihalean jarrita, karratu
-bat sortzen da. Nahi izanez gero, objektuaren neurriak alda daitezke.
-Ikus Objektuen tamaina aldatzeari buruzko atala.
-<!-- Add link to resizing objects -->
-</para>
-
-</listitem>
-
-<listitem>
-
-<para>
-Aurrez definitutako objektuak - Editatu ezin diren diseinuak izaten dira.
-Tamaina alda dakieke, baina objektua bera ezin da editatu.
-</para>
-
-</listitem>
-
-</itemizedlist>
-
-</para>
-</sect2>
-<sect2 id="moving-objects">
- <title>Objektuak lekuz aldatzea</title>
-
-<para>
-Objektu bat oihalean txertatzen denean, ertzak markatzen dituzten koadro
-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"
-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.
-</para>
-</sect2> <sect2 id="resizing-objects">
- <title>Objektuei tamaina aldatzea</title>
-
-<para>
-Aurreko paragrafoan azaldu da koadro berdeen kontzeptua. Objektuaren tamaina
-manipulatzeko erabiltzen dira koadro horiek. Tamaina aldatzeko, egin klik
-botoi berde batean, eta ez askatu. Arrastatu tamaina egokia emateko, eta
-askatu.
-</para>
-
-<para>
-Izkinetako botoi berdeek altuera eta zabalera batera aldatzen dituzte.
-Goiko eta beheko ertzetan erdian dauden bi botoiek altuera editatzen dute;
-ezkerreko eta eskuineko ertzetan erdian daudenek, zabalera.
-</para>
- <tip>
-<para>
-Izkinako botoi bat arrastatzen denean proportzioa mantentzeko, eduki
-sakatuta maiuskulen tekla arrastatzen den bitartean.
- Objektu bereziei bakarrik aplikatzen zaie hori, ez forma erregularrei.
-</para>
-</tip>
-</sect2>
-<sect2 id="deleting-objects">
- <title>Objektuak ezabatzea</title>
-
-<para>
-Objektu bat ezabatzeko, egin klik objektuan, hautatzeko. Koadro
-berdeak azalduko dira. Sakatu Ktrl+D eta objektua desagertu egingo da.
-</para>
-</sect2>
-<!--
- <sect3 id="aligning-objects">
- <title>Aligning Objects</title>
-
-<para>
- Add this when you feel like explaining.
-
-</para>
- </sect3>
- <title>Grouping Objects</title>
-
-<para>
- Add this when you feel like explaining.
-
-</para>
- </sect3>
--->
-<sect2 id="line-properties">
- <title>Marraren propietateak</title>
-
-<para>
-<application>Dia</application>-ko objektuetako bat marra da.
-Hau da marra objektuaren ikonoa:
-</para>
- <figure>
- <title>Marraren ikonoa</title>
- <screenshot><screeninfo>Marraren ikonoa</screeninfo>
-<graphic format="PNG" fileref="graphics/line_icon.png"
-srccredit="Steffen Macke"/></screenshot></figure></sect2>
-<sect2 id="line-styles">
- <title>Marra-estiloak</title>
-
-<para>
-Marrak erraz edita daitezke geziak eta horrelako elementuak
-sortzeko. Tresna-koadroaren behealdean 3 botoi daude marrekin.
- Klik egin eta sakatuta edukita, menu bat azalduko da aldaketaren
-emaitza ikusteko.
-</para>
- <figure>
- <title>Marraren propietateak</title>
- <screenshot><screeninfo>Hiru atalak behean azaltzen
-dira.</screeninfo>
-<graphic format="PNG" fileref="graphics/line_props.png"
-srccredit="Kevin Breit"/></screenshot></figure>
-<para>
-Estilo askotako marrak daude:
-<itemizedlist>
-
-<listitem>
-
-<para>
-Betea
-</para>
-
-</listitem>
-
-<listitem>
-<para>
-Marratxoduna
-</para>
-</listitem>
-
-<listitem>
-<para>
-Marratxoa-Puntua
-</para>
-</listitem>
-
-<listitem>
-<para>
-Marratxoa-Puntua-Puntua
-</para>
-</listitem>
-
-<listitem>
-<para>
-Puntukatua
-</para>
-</listitem>
-
-</itemizedlist>
-
-</para>
-</sect2> <sect2 id="line-thickness">
- <title>Marraren lodiera</title>
-
-<para>
-Marren lodiera editatzeko, kolore-hautatzailearen eskuineko bost
-aukeretako batean klik egin daiteke.
-</para>
-</sect2>
-<sect2 id="arrows">
- <title>Geziak</title>
-
-<para>
-Geziak sortzeko, marren tresna erabil daiteke. Tresna-koadroaren
-behealdeko alboko bi botoietan klik eginda, menu bat azalduko da
-aukeran dauden gezi-hasiera eta -amaierekin.
-</para>
-</sect2> <sect2 id="line-colors">
- <title>Marra-koloreak</title>
-
-<para>
-Marraren kolorea editatzeko, egin klik bikoitza marran oihalean ipini
-ondoren. Leiho bat azalduko da. Bigarren lerroa &quot;Marra-kolorea&quot;
-da eta barra bat dauka hautatutako kolorea erakusteko. Barran klik eginda,
-marraren kolorea alda daiteke.
-</para>
-</sect2>
-</sect1>
-<sect1 id="object-properties">
- <title>Objektuaren propietateak</title>
-
-<para>
-Objektu bakoitzak bere propietateak ditu. Oihalean dagoen objektu batean
-klik bikoitza eginda ikus daitezke. Leiho bat azalduko da hainbat eta
-hainbat propietate editatzeko aukerarekin, besteak beste:
-<itemizedlist>
-
-<listitem>
-<para>
-Marra-zabalera
-</para>
-</listitem>
-
-<listitem>
-<para>
-Marra-kolorea
-</para>
-</listitem>
-
-</itemizedlist>
-
-.</para>
-</sect1>
-<sect1 id="colors">
- <title>Koloreak</title>
-
-<para>
-Objektu guztiei eman dakieke kolorea hainbat modutan, erabiltzaileak
-definitutako ezarpenaren arabera.
-</para>
-
-<para>
-Kolorearen kontrola tresna-koadroaren behealdetik gertu dago. Bi karratuk
-egiten dute kontrola. Goian ezkerrean dagoena aurreko planoaren kolorea da.
-Azpian eskuinean dagoena atzeko planoarena. Koloreak editatzeko, egin klik
-koadroetako batean, eta hautatu kolorea azaltzen den kolore-leihoan.
-<note>
-<para>
-Kontrol honek oraindik oihalean jarri ez diren objektuen kolorea hautatzeko
-aukera bakarrik ematen du.
-</para>
-</note> <tip>
-<para>
-Koloreak alderantzikatzeko, egin klik bi koadroen goialdean eskuinean
-dagoen gezi txikian.
-</para>
-</tip> <tip>
-<para>
-Berriz ere kolore lehenetsiak ezartzeko, egin klik kolore-hautatzailearen
-behealdeko ezkerreko koadro zuri-beltzean.
-</para>
-</tip>
-</para>
-</sect1>
-</chapter>
+<chapter label="3" id="objects-chapter">
+<title>Objektuak</title>
+ <sect1 id="objects-introduction">
+ <title>Objektuen sarrera</title>
+
+<para>
+Objektuak dira diagrama osatzen dutenak. Aurrez definitutako edo
+erabiltzaileak definitutako formak dira objektuak.
+</para>
+</sect1>
+<sect1 id="using-objects">
+ <title>Objektuak erabiltzea</title>
+ <sect2 id="adding-objects">
+ <title>Objektuak gehitzea</title>
+
+<para>
+<application>Dia</application>-ren oihalean objektuak gehitzeko,
+egin klik tresna-barrako objektu batean, zuk nahi duzun objektua
+hautatzeko. Oihalean klik egitean objektua bertan kokatuta geratuko da.
+</para>
+
+<para>
+<application>Dia</application>-k bi motatako objektuak eskaintzen ditu:
+<itemizedlist>
+
+<listitem>
+
+<para>
+Erabiltzaileak definitutako objektuak - Erabiltzaileak sortzen dituen
+objektuak txantiloi prefabrikatu batean oinarrituta.
+</para>
+
+<para>
+Adibidez, objektu karratu batean klik egin eta oihalean jarrita, karratu
+bat sortzen da. Nahi izanez gero, objektuaren neurriak alda daitezke.
+Ikus Objektuen tamaina aldatzeari buruzko atala.
+<!-- Add link to resizing objects -->
+</para>
+
+</listitem>
+
+<listitem>
+
+<para>
+Aurrez definitutako objektuak - Editatu ezin diren diseinuak izaten dira.
+Tamaina alda dakieke, baina objektua bera ezin da editatu.
+</para>
+
+</listitem>
+
+</itemizedlist>
+
+</para>
+</sect2>
+<sect2 id="moving-objects">
+ <title>Objektuak lekuz aldatzea</title>
+
+<para>
+Objektu bat oihalean txertatzen denean, ertzak markatzen dituzten koadro
+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"
+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.
+</para>
+</sect2> <sect2 id="resizing-objects">
+ <title>Objektuei tamaina aldatzea</title>
+
+<para>
+Aurreko paragrafoan azaldu da koadro berdeen kontzeptua. Objektuaren tamaina
+manipulatzeko erabiltzen dira koadro horiek. Tamaina aldatzeko, egin klik
+botoi berde batean, eta ez askatu. Arrastatu tamaina egokia emateko, eta
+askatu.
+</para>
+
+<para>
+Izkinetako botoi berdeek altuera eta zabalera batera aldatzen dituzte.
+Goiko eta beheko ertzetan erdian dauden bi botoiek altuera editatzen dute;
+ezkerreko eta eskuineko ertzetan erdian daudenek, zabalera.
+</para>
+ <tip>
+<para>
+Izkinako botoi bat arrastatzen denean proportzioa mantentzeko, eduki
+sakatuta maiuskulen tekla arrastatzen den bitartean.
+ Objektu bereziei bakarrik aplikatzen zaie hori, ez forma erregularrei.
+</para>
+</tip>
+</sect2>
+<sect2 id="deleting-objects">
+ <title>Objektuak ezabatzea</title>
+
+<para>
+Objektu bat ezabatzeko, egin klik objektuan, hautatzeko. Koadro
+berdeak azalduko dira. Sakatu Ktrl+D eta objektua desagertu egingo da.
+</para>
+</sect2>
+<!--
+ <sect3 id="aligning-objects">
+ <title>Aligning Objects</title>
+
+<para>
+ Add this when you feel like explaining.
+
+</para>
+ </sect3>
+ <title>Grouping Objects</title>
+
+<para>
+ Add this when you feel like explaining.
+
+</para>
+ </sect3>
+-->
+<sect2 id="line-properties">
+ <title>Marraren propietateak</title>
+
+<para>
+<application>Dia</application>-ko objektuetako bat marra da.
+Hau da marra objektuaren ikonoa:
+</para>
+ <figure>
+ <title>Marraren ikonoa</title>
+ <screenshot><screeninfo>Marraren ikonoa</screeninfo>
+<graphic format="PNG" fileref="graphics/line_icon"
+srccredit="Steffen Macke"/></screenshot></figure></sect2>
+<sect2 id="line-styles">
+ <title>Marra-estiloak</title>
+
+<para>
+Marrak erraz edita daitezke geziak eta horrelako elementuak
+sortzeko. Tresna-koadroaren behealdean 3 botoi daude marrekin.
+ Klik egin eta sakatuta edukita, menu bat azalduko da aldaketaren
+emaitza ikusteko.
+</para>
+ <figure>
+ <title>Marraren propietateak</title>
+ <screenshot><screeninfo>Hiru atalak behean azaltzen
+dira.</screeninfo>
+<graphic format="PNG" fileref="graphics/line_props"
+srccredit="Kevin Breit"/></screenshot></figure>
+<para>
+Estilo askotako marrak daude:
+<itemizedlist>
+
+<listitem>
+
+<para>
+Betea
+</para>
+
+</listitem>
+
+<listitem>
+<para>
+Marratxoduna
+</para>
+</listitem>
+
+<listitem>
+<para>
+Marratxoa-Puntua
+</para>
+</listitem>
+
+<listitem>
+<para>
+Marratxoa-Puntua-Puntua
+</para>
+</listitem>
+
+<listitem>
+<para>
+Puntukatua
+</para>
+</listitem>
+
+</itemizedlist>
+
+</para>
+</sect2> <sect2 id="line-thickness">
+ <title>Marraren lodiera</title>
+
+<para>
+Marren lodiera editatzeko, kolore-hautatzailearen eskuineko bost
+aukeretako batean klik egin daiteke.
+</para>
+</sect2>
+<sect2 id="arrows">
+ <title>Geziak</title>
+
+<para>
+Geziak sortzeko, marren tresna erabil daiteke. Tresna-koadroaren
+behealdeko alboko bi botoietan klik eginda, menu bat azalduko da
+aukeran dauden gezi-hasiera eta -amaierekin.
+</para>
+</sect2> <sect2 id="line-colors">
+ <title>Marra-koloreak</title>
+
+<para>
+Marraren kolorea editatzeko, egin klik bikoitza marran oihalean ipini
+ondoren. Leiho bat azalduko da. Bigarren lerroa &quot;Marra-kolorea&quot;
+da eta barra bat dauka hautatutako kolorea erakusteko. Barran klik eginda,
+marraren kolorea alda daiteke.
+</para>
+</sect2>
+</sect1>
+<sect1 id="object-properties">
+ <title>Objektuaren propietateak</title>
+
+<para>
+Objektu bakoitzak bere propietateak ditu. Oihalean dagoen objektu batean
+klik bikoitza eginda ikus daitezke. Leiho bat azalduko da hainbat eta
+hainbat propietate editatzeko aukerarekin, besteak beste:
+<itemizedlist>
+
+<listitem>
+<para>
+Marra-zabalera
+</para>
+</listitem>
+
+<listitem>
+<para>
+Marra-kolorea
+</para>
+</listitem>
+
+</itemizedlist>
+
+.</para>
+</sect1>
+<sect1 id="colors">
+ <title>Koloreak</title>
+
+<para>
+Objektu guztiei eman dakieke kolorea hainbat modutan, erabiltzaileak
+definitutako ezarpenaren arabera.
+</para>
+
+<para>
+Kolorearen kontrola tresna-koadroaren behealdetik gertu dago. Bi karratuk
+egiten dute kontrola. Goian ezkerrean dagoena aurreko planoaren kolorea da.
+Azpian eskuinean dagoena atzeko planoarena. Koloreak editatzeko, egin klik
+koadroetako batean, eta hautatu kolorea azaltzen den kolore-leihoan.
+<note>
+<para>
+Kontrol honek oraindik oihalean jarri ez diren objektuen kolorea hautatzeko
+aukera bakarrik ematen du.
+</para>
+</note> <tip>
+<para>
+Koloreak alderantzikatzeko, egin klik bi koadroen goialdean eskuinean
+dagoen gezi txikian.
+</para>
+</tip> <tip>
+<para>
+Berriz ere kolore lehenetsiak ezartzeko, egin klik kolore-hautatzailearen
+behealdeko ezkerreko koadro zuri-beltzean.
+</para>
+</tip>
+</para>
+</sect1>
+</chapter>
diff --git a/doc/eu/usage-quickstart.xml b/doc/eu/usage-quickstart.xml
index e7cd773f..0d174d2a 100644
--- a/doc/eu/usage-quickstart.xml
+++ b/doc/eu/usage-quickstart.xml
@@ -1,160 +1,160 @@
-<chapter label="1" id="quickstart-chapter">
-<title>Bizkor hasteko</title>
- <sect1 id="what-can-you-do">
- <title>Zer egin dezakezu?</title>
-
-<para>
-<application>Dia</application> jende askok erabiltzeko moduko
-diagrama-aplikazioa da. Lan handirik gabe ikasten da erabiltzen,
-eta malgutasun handikoa da, bestalde, erabiltzaile adituak eroso
-senti daitezen tresna komertzialak erabiltzen dituztenean. Behean
-ikus daiteke <application>Dia</application>-k zer eman dezakeen
-bost minututan. <figure>
- <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"
-srccredit="Kevin Breit"/></screenshot></figure>
-</para>
-</sect1>
-<sect1 id="starting-dia">
- <title>Dia abiarazteko</title>
-
-<para>
-Joan Menu nagusiko Aplikazioak atalera, eta egin klik Dia-ren ikonoan.
-Edo, idatzi <command>dia</command> komandoa xterm leiho batean.
-</para>
-</sect1> <sect1 id="quickstart-intro">
- <title>Bizkor hasteko sarrera</title>
-
-<para>
-Oinarrizko diagramak egiteko eskuliburu osoa irakurtzeko gogorik ez
-duten erabiltzaileentzat.
-</para>
-</sect1> <sect1 id="creating-canvas">
- <title>Oihala sortzea</title>
-
-<para>
-Diagrama bakoitza bere <emphasis>oihalean</emphasis> marrazten da.
-Oihal berria sortzeko, hautatu <menuchoice><guimenu>Fitxategia</guimenu>
-<guimenuitem>Diagrama berria</guimenuitem></menuchoice> Oihal-leiho
-berria azalduko da.
-</para>
-</sect1>
-<sect1 id="making-diagram">
- <title>Diagrama egitea</title>
-
-<para>
-Diagramak objektuz osatzen dira. Kolore. itxura eta tamaina desberdinetako
-formak dira objektuak. 2 biteko irudiak, irudi koloretsuak, testua, edo
-beste edozer izan daitezke.
-</para>
-
-<para>
-Oihalean objektuak gehitzeko, egin klik tresna-koadroko objektu batean, eta
-egin klik oihalean. Hautatutako objektua oihalean azalduko da. Izkinetako
-botoi berdeetan klik egin eta arrastatuz manipulatzen dira nagusiki objektuak.
-</para>
-
-<para>
-Objektu baten propietate aurreratuak ikusteko, egin klik tresna-koadroan,
-ikusi nahi duzun objektuan. Biltegiatuta dagoen bildumako forma zure gustura
-pertsonalizatzeko aukera izango duzu.
-</para>
-
-<para>
-Geruzek irudi anitz sortzen dituzte, irudi bakarra osatuz. Horrela,
-erabiltzaileak aldiko geruza bat edita dezake, gainerako geruzetan dagoena
-ukitu gabe.
-</para>
-
-<para>
-Gardentasunak objektu zati batzuk garden egiteko aukera ematen du, zati
-gardenaren atzean dagoen guztia ikusi ahal izateko.
-</para>
-
-<para>
-Plugin-en bidez erabiltzaileak objektu-mota berriak gehi ditzake Dia-n,
-funtzionalitatea areagotzeko.
-</para>
-</sect1> <sect1 id="save-print-diagram">
- <title>Diagramak gorde eta inprimatzea</title>
-
-<para>
-Diagramak gorde eta inprimatzea dokumentua sortu eta aldatzea bezain erraza da.
-</para>
-
-<para>
-Dia-rekin inprimagailuan inprimatu eta gorde egin daiteke. gnome-print
-instalatuta badaukazu, oso erraz inprimatuko duzu!
-</para>
-
-<para>
-Inprimatzeko komandoa Fitxategia menuan dago, oihalean eskuin-klika egitean
-azalduko zaizu.
-</para>
-
-<para>
-Dia-rekin formatu askotara esporta dezakezu web-ean bikain argitaratzeko.
-Esate baterako: <itemizedlist>
-<listitem>
-
-<para>
-Computer Graphics Metafile (.cgm)
-</para>
-</listitem>
-
-<listitem>
-<para>
-Encapsulated Postscript (.eps)
-</para>
-</listitem>
-
-<listitem>
-<para>
-Native Dia Format (.dia)
-</para>
-</listitem>
-
-<listitem>
-<para>
-Portable Network Graphics (.png)
-</para>
-</listitem>
-
-<listitem>
-<para>
-Scalable Vector Graphics (.svg)
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</sect1>
-<sect1 id="who-appeal-too">
- <title>Norentzat da erakargarria Dia?</title>
-
-<para>
-Industria askotako jende askorentzat izan daiteke erakargarria Dia. <itemizedlist>
-<listitem>
-
-<para>
-Ingeniari elektriko batek zirkuituaren funtzionamendua erakusteko sor
-dezake <application>Dia</application>-ko diagrama.
-</para>
-</listitem>
-
-<listitem>
-<para>
-Informatikako programatzaile batek programaren eskema irudikatzeko erabil dezake fluxu-diagrama.
-</para>
-</listitem>
-
-<listitem>
-<para>
-Sare-administratzaileak enpresako sarearen diseinua erakusteko sor dezake diagrama bat.
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</sect1>
-</chapter>
+<chapter label="1" id="quickstart-chapter">
+<title>Bizkor hasteko</title>
+ <sect1 id="what-can-you-do">
+ <title>Zer egin dezakezu?</title>
+
+<para>
+<application>Dia</application> jende askok erabiltzeko moduko
+diagrama-aplikazioa da. Lan handirik gabe ikasten da erabiltzen,
+eta malgutasun handikoa da, bestalde, erabiltzaile adituak eroso
+senti daitezen tresna komertzialak erabiltzen dituztenean. Behean
+ikus daiteke <application>Dia</application>-k zer eman dezakeen
+bost minututan. <figure>
+ <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"
+srccredit="Kevin Breit"/></screenshot></figure>
+</para>
+</sect1>
+<sect1 id="starting-dia">
+ <title>Dia abiarazteko</title>
+
+<para>
+Joan Menu nagusiko Aplikazioak atalera, eta egin klik Dia-ren ikonoan.
+Edo, idatzi <command>dia</command> komandoa xterm leiho batean.
+</para>
+</sect1> <sect1 id="quickstart-intro">
+ <title>Bizkor hasteko sarrera</title>
+
+<para>
+Oinarrizko diagramak egiteko eskuliburu osoa irakurtzeko gogorik ez
+duten erabiltzaileentzat.
+</para>
+</sect1> <sect1 id="creating-canvas">
+ <title>Oihala sortzea</title>
+
+<para>
+Diagrama bakoitza bere <emphasis>oihalean</emphasis> marrazten da.
+Oihal berria sortzeko, hautatu <menuchoice><guimenu>Fitxategia</guimenu>
+<guimenuitem>Diagrama berria</guimenuitem></menuchoice> Oihal-leiho
+berria azalduko da.
+</para>
+</sect1>
+<sect1 id="making-diagram">
+ <title>Diagrama egitea</title>
+
+<para>
+Diagramak objektuz osatzen dira. Kolore. itxura eta tamaina desberdinetako
+formak dira objektuak. 2 biteko irudiak, irudi koloretsuak, testua, edo
+beste edozer izan daitezke.
+</para>
+
+<para>
+Oihalean objektuak gehitzeko, egin klik tresna-koadroko objektu batean, eta
+egin klik oihalean. Hautatutako objektua oihalean azalduko da. Izkinetako
+botoi berdeetan klik egin eta arrastatuz manipulatzen dira nagusiki objektuak.
+</para>
+
+<para>
+Objektu baten propietate aurreratuak ikusteko, egin klik tresna-koadroan,
+ikusi nahi duzun objektuan. Biltegiatuta dagoen bildumako forma zure gustura
+pertsonalizatzeko aukera izango duzu.
+</para>
+
+<para>
+Geruzek irudi anitz sortzen dituzte, irudi bakarra osatuz. Horrela,
+erabiltzaileak aldiko geruza bat edita dezake, gainerako geruzetan dagoena
+ukitu gabe.
+</para>
+
+<para>
+Gardentasunak objektu zati batzuk garden egiteko aukera ematen du, zati
+gardenaren atzean dagoen guztia ikusi ahal izateko.
+</para>
+
+<para>
+Plugin-en bidez erabiltzaileak objektu-mota berriak gehi ditzake Dia-n,
+funtzionalitatea areagotzeko.
+</para>
+</sect1> <sect1 id="save-print-diagram">
+ <title>Diagramak gorde eta inprimatzea</title>
+
+<para>
+Diagramak gorde eta inprimatzea dokumentua sortu eta aldatzea bezain erraza da.
+</para>
+
+<para>
+Dia-rekin inprimagailuan inprimatu eta gorde egin daiteke. gnome-print
+instalatuta badaukazu, oso erraz inprimatuko duzu!
+</para>
+
+<para>
+Inprimatzeko komandoa Fitxategia menuan dago, oihalean eskuin-klika egitean
+azalduko zaizu.
+</para>
+
+<para>
+Dia-rekin formatu askotara esporta dezakezu web-ean bikain argitaratzeko.
+Esate baterako: <itemizedlist>
+<listitem>
+
+<para>
+Computer Graphics Metafile (.cgm)
+</para>
+</listitem>
+
+<listitem>
+<para>
+Encapsulated Postscript (.eps)
+</para>
+</listitem>
+
+<listitem>
+<para>
+Native Dia Format (.dia)
+</para>
+</listitem>
+
+<listitem>
+<para>
+Portable Network Graphics (.png)
+</para>
+</listitem>
+
+<listitem>
+<para>
+Scalable Vector Graphics (.svg)
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</sect1>
+<sect1 id="who-appeal-too">
+ <title>Norentzat da erakargarria Dia?</title>
+
+<para>
+Industria askotako jende askorentzat izan daiteke erakargarria Dia. <itemizedlist>
+<listitem>
+
+<para>
+Ingeniari elektriko batek zirkuituaren funtzionamendua erakusteko sor
+dezake <application>Dia</application>-ko diagrama.
+</para>
+</listitem>
+
+<listitem>
+<para>
+Informatikako programatzaile batek programaren eskema irudikatzeko erabil dezake fluxu-diagrama.
+</para>
+</listitem>
+
+<listitem>
+<para>
+Sare-administratzaileak enpresako sarearen diseinua erakusteko sor dezake diagrama bat.
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</sect1>
+</chapter>
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 81c49e1b..150f6f16 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -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 @@ EXTRA_DIST += \
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)
diff --git a/doc/fr/README.hardcopies b/doc/fr/README.hardcopies
deleted file mode 100644
index 42aee3cc..00000000
--- a/doc/fr/README.hardcopies
+++ /dev/null
@@ -1,14 +0,0 @@
-
-to build pdf, postscript and html, run:
-
-Make -f hardcopies.makefile dia.pdf dia.ps dia.html
-
-from this directory
-
-
-REQUIREMENTS:
- - "convert" from ImageMagick (only for postscript output)
- - openjade
- - "jw" (from docbook-utils package in Debian)
- depends on jadetex
- - sed
diff --git a/doc/fr/custom-shapes.xml b/doc/fr/custom-shapes.xml
index 22b09656..704557e0 100644
--- a/doc/fr/custom-shapes.xml
+++ b/doc/fr/custom-shapes.xml
@@ -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>
diff --git a/doc/fr/dia-1.xml b/doc/fr/dia-1.xml
index 8e9a90d1..2911d828 100644
--- a/doc/fr/dia-1.xml
+++ b/doc/fr/dia-1.xml
@@ -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>
diff --git a/doc/fr/dia-dbk-to-chapter.sed b/doc/fr/dia-dbk-to-chapter.sed
index 8c1442a1..e69de29b 100644
--- a/doc/fr/dia-dbk-to-chapter.sed
+++ b/doc/fr/dia-dbk-to-chapter.sed
@@ -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>
diff --git a/doc/fr/dia-fr.omf b/doc/fr/dia-fr.omf
index 88d4b511..e9d7035e 100644
--- a/doc/fr/dia-fr.omf
+++ b/doc/fr/dia-fr.omf
@@ -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>
diff --git a/doc/fr/dia.xml b/doc/fr/dia.xml
index fa20fd83..efa26521 100644
--- a/doc/fr/dia.xml
+++ b/doc/fr/dia.xml
@@ -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;
diff --git a/doc/fr/hardcopies.makefile b/doc/fr/hardcopies.makefile
index f029048f..e69de29b 100644
--- a/doc/fr/hardcopies.makefile
+++ b/doc/fr/hardcopies.makefile
@@ -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
-
diff --git a/doc/fr/html.xsl b/doc/fr/html.xsl
index 763ba923..c8482908 100644
--- a/doc/fr/html.xsl
+++ b/doc/fr/html.xsl
@@ -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>
diff --git a/doc/fr/notes.xml b/doc/fr/notes.xml
index a247a707..e69de29b 100644
--- a/doc/fr/notes.xml
+++ b/doc/fr/notes.xml
@@ -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>
-
diff --git a/doc/fr/usage-customization.xml b/doc/fr/usage-customization.xml
index 7f89c995..45dc00eb 100644
--- a/doc/fr/usage-customization.xml
+++ b/doc/fr/usage-customization.xml
@@ -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>
diff --git a/doc/fr/usage-layers.xml b/doc/fr/usage-layers.xml
index 3e6d1311..7e54e7c2 100644
--- a/doc/fr/usage-layers.xml
+++ b/doc/fr/usage-layers.xml
@@ -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>
diff --git a/doc/fr/usage-loadsave.xml b/doc/fr/usage-loadsave.xml
index bca22210..72d57e4a 100644
--- a/doc/fr/usage-loadsave.xml
+++ b/doc/fr/usage-loadsave.xml
@@ -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>
diff --git a/doc/fr/usage-objects-basic.xml b/doc/fr/usage-objects-basic.xml
index 38eea379..cf7a5406 100644
--- a/doc/fr/usage-objects-basic.xml
+++ b/doc/fr/usage-objects-basic.xml
@@ -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>
diff --git a/doc/fr/usage-objects-selecting.xml b/doc/fr/usage-objects-selecting.xml
index 0d709b76..6ef18482 100644
--- a/doc/fr/usage-objects-selecting.xml
+++ b/doc/fr/usage-objects-selecting.xml
@@ -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.
diff --git a/doc/fr/usage-objects.xml b/doc/fr/usage-objects.xml
index 777bdace..df944420 100644
--- a/doc/fr/usage-objects.xml
+++ b/doc/fr/usage-objects.xml
@@ -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.
diff --git a/doc/fr/usage-quickstart.xml b/doc/fr/usage-quickstart.xml
index bcd08f1f..0168b2be 100644
--- a/doc/fr/usage-quickstart.xml
+++ b/doc/fr/usage-quickstart.xml
@@ -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>
diff --git a/doc/html/css/dia.css b/doc/html/css/dia.css
new file mode 100644
index 00000000..6031155d
--- /dev/null
+++ b/doc/html/css/dia.css
@@ -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 */
diff --git a/doc/html/images/caution.svg b/doc/html/images/caution.svg
new file mode 100644
index 00000000..f24a81cd
--- /dev/null
+++ b/doc/html/images/caution.svg
@@ -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>
diff --git a/doc/html/images/home.svg b/doc/html/images/home.svg
new file mode 100644
index 00000000..6361abbc
--- /dev/null
+++ b/doc/html/images/home.svg
@@ -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>
diff --git a/doc/html/images/important.svg b/doc/html/images/important.svg
new file mode 100644
index 00000000..f24a81cd
--- /dev/null
+++ b/doc/html/images/important.svg
@@ -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>
diff --git a/doc/html/images/next.svg b/doc/html/images/next.svg
new file mode 100644
index 00000000..cec6bbbd
--- /dev/null
+++ b/doc/html/images/next.svg
@@ -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>
diff --git a/doc/html/images/note.svg b/doc/html/images/note.svg
new file mode 100644
index 00000000..4b02edad
--- /dev/null
+++ b/doc/html/images/note.svg
@@ -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>
diff --git a/doc/html/images/prev.svg b/doc/html/images/prev.svg
new file mode 100644
index 00000000..f8079dfb
--- /dev/null
+++ b/doc/html/images/prev.svg
@@ -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>
diff --git a/doc/html/images/tip.svg b/doc/html/images/tip.svg
new file mode 100644
index 00000000..7b5f7d2b
--- /dev/null
+++ b/doc/html/images/tip.svg
@@ -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>
diff --git a/doc/html/images/up.svg b/doc/html/images/up.svg
new file mode 100644
index 00000000..ce057049
--- /dev/null
+++ b/doc/html/images/up.svg
@@ -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>
diff --git a/doc/html/images/warning.svg b/doc/html/images/warning.svg
new file mode 100644
index 00000000..4ddec0b8
--- /dev/null
+++ b/doc/html/images/warning.svg
@@ -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>
diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am
index 0a71ae77..c2e7b28b 100644
--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -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 @@ EXTRA_DIST += \
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
+##
+##
diff --git a/doc/pl/authors.xml b/doc/pl/authors.xml
index 94ec6bb7..999f37cc 100644
--- a/doc/pl/authors.xml
+++ b/doc/pl/authors.xml
@@ -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>
diff --git a/doc/pl/dia-pl.omf b/doc/pl/dia-pl.omf
index 731b3761..3bbd4101 100644
--- a/doc/pl/dia-pl.omf
+++ b/doc/pl/dia-pl.omf
@@ -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>
Podrcznik 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>
+ Podrcznik 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>
diff --git a/doc/pl/dia.xml b/doc/pl/dia.xml
index 171cc447..bde4f433 100644
--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -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 nie zmienia identyfikatora -->
+<book id="index"> <!-- prosz nie zmienia identyfikatora -->
<bookinfo>
<title>Dia</title>
diff --git a/doc/pl/intro.xml b/doc/pl/intro.xml
index 90d13cdc..1291dc16 100644
--- a/doc/pl/intro.xml
+++ b/doc/pl/intro.xml
@@ -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">
diff --git a/doc/pl/license.xml b/doc/pl/license.xml
index 74b84667..e4c26c28 100644
--- a/doc/pl/license.xml
+++ b/doc/pl/license.xml
@@ -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">
diff --git a/doc/pl/usage-canvas.xml b/doc/pl/usage-canvas.xml
index 0051371b..d0ecc3e3 100644
--- a/doc/pl/usage-canvas.xml
+++ b/doc/pl/usage-canvas.xml
@@ -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>Ptna</title>
<sect1 id="canvas">
diff --git a/doc/pl/usage-customization.xml b/doc/pl/usage-customization.xml
index 34041df3..6b0fe7ad 100644
--- a/doc/pl/usage-customization.xml
+++ b/doc/pl/usage-customization.xml
@@ -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">
diff --git a/doc/pl/usage-layers.xml b/doc/pl/usage-layers.xml
index 8aa34eb1..ea0b1474 100644
--- a/doc/pl/usage-layers.xml
+++ b/doc/pl/usage-layers.xml
@@ -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>Zarzdzanie warstwami</title>
<!-- (informacja wprowadzajca...) -->
diff --git a/doc/pl/usage-loadsave.xml b/doc/pl/usage-loadsave.xml
index 4e0422b5..eff06134 100644
--- a/doc/pl/usage-loadsave.xml
+++ b/doc/pl/usage-loadsave.xml
@@ -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 diagramw</title>
<sect1 id="loadsave-intro">
diff --git a/doc/pl/usage-objects-selecting.xml b/doc/pl/usage-objects-selecting.xml
index b77f354c..e484d70e 100644
--- a/doc/pl/usage-objects-selecting.xml
+++ b/doc/pl/usage-objects-selecting.xml
@@ -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 obiektw</title>
<sect1 id="selecting-introduction">
diff --git a/doc/pl/usage-objects-special.xml b/doc/pl/usage-objects-special.xml
index b60b147b..81a9c366 100644
--- a/doc/pl/usage-objects-special.xml
+++ b/doc/pl/usage-objects-special.xml
@@ -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">
diff --git a/doc/pl/usage-objects.xml b/doc/pl/usage-objects.xml
index 3879f29f..0c9b5a81 100644
--- a/doc/pl/usage-objects.xml
+++ b/doc/pl/usage-objects.xml
@@ -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 dopasowujce</title>
<screenshot>
<screeninfo>Zielone kropki umoliwiaj zmian rozmiaru obrazu.</screeninfo>
- <graphic format="png" fileref="graphics/greendots" srccredit="Kevin Breit" />
+ <graphic format="PNG" fileref="graphics/greendots" srccredit="Kevin Breit" />
</screenshot>
</figure>
Przestrze wewntrz ramek jest przestrzeni obiektu. Kliknicie i
@@ -129,7 +129,7 @@
<title>Waciwoci linii</title>
<screenshot>
<screeninfo>Poniej zostay 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>
diff --git a/doc/pl/usage-quickstart.xml b/doc/pl/usage-quickstart.xml
index 1eb1ef61..a0bbd9f8 100644
--- a/doc/pl/usage-quickstart.xml
+++ b/doc/pl/usage-quickstart.xml
@@ -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 uyciu <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>
diff --git a/hardcopies.make b/hardcopies.make
new file mode 100644
index 00000000..0f84b946
--- /dev/null
+++ b/hardcopies.make
@@ -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
diff --git a/omf.make b/omf.make
index b990dc07..2edd5f54 100644
--- a/omf.make
+++ b/omf.make
@@ -37,7 +37,7 @@ omf: omf_timestamp
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
diff --git a/samples/Makefile.am b/samples/Makefile.am
index def36549..a22431ca 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -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
diff --git a/xmldocs.make b/xmldocs.make
index 7806396e..e2940442 100644
--- a/xmldocs.make
+++ b/xmldocs.make
@@ -49,8 +49,7 @@ EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp
include $(top_srcdir)/omf.make
-
-all: omf
+include $(top_srcdir)/hardcopies.make
$(docname).xml: $(entities)
-ourdir=`pwd`; \
@@ -66,7 +65,7 @@ app-dist-hook:
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-local: omf
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