dia r4048 - in trunk/doc: en fr fr/ps/graphics



Author: hans
Date: Sun May 25 13:08:48 2008
New Revision: 4048
URL: http://svn.gnome.org/viewvc/dia?rev=4048&view=rev

Log:
2008-05-18  Hans Breuer  <hans breuer org>

	[
	  Patch from Thomas Harding:
	  Bug 534656 â French manual update + addressing bug #510537
	]
	* doc/en/dia-1.xml doc/fr/dia-1.xml doc/en/dia.dbk 
	  doc/en/dia.xml doc/en/Makefile.am doc/fr/custom-shapes.xml
	  doc/fr/dia.dbk doc/fr/dia.xml doc/fr/Makefile.am
	  doc/fr/ps/graphics/preferences-fig.eps
	  doc/fr/ps/graphics/preferences_fig.eps
	  doc/fr/usage-customization.xml
	  doc/fr/usage-objects-basic.xml :
	- rename /doc/fr/ps/graphics/preferences-fig.ps ->
	..../preferences_fig.ps
	- fix typo in usage-customization.xml about above (png).
	- Makefile.am: 
	  - re-enable above png file
	  - disable sed-script (Bug #510537), superceded by inclusion of
	  dia-1.xml as SYSTEM ENTITY in dia-cmdline.xml and dia.dbk (for en/fr) 
	- usage-objects-basic.xml: add the tricks about text entries cut and paste
	- dia.xml: delete attribute lang from <?xml ... first line
	- custom-shapes.xml: add para about default-(width|height)



Added:
   trunk/doc/en/dia-1.xml
   trunk/doc/fr/dia-1.xml
   trunk/doc/fr/ps/graphics/preferences_fig.eps
      - copied unchanged from r4043, /trunk/doc/fr/ps/graphics/preferences-fig.eps
Removed:
   trunk/doc/fr/ps/graphics/preferences-fig.eps
Modified:
   trunk/doc/en/Makefile.am
   trunk/doc/en/dia.dbk
   trunk/doc/en/dia.xml
   trunk/doc/fr/Makefile.am
   trunk/doc/fr/custom-shapes.xml
   trunk/doc/fr/dia.dbk
   trunk/doc/fr/dia.xml
   trunk/doc/fr/usage-customization.xml
   trunk/doc/fr/usage-objects-basic.xml

Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am	(original)
+++ trunk/doc/en/Makefile.am	Sun May 25 13:08:48 2008
@@ -7,8 +7,6 @@
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
-all: include-cmdline
-
 nodist_include_EXTRAS = dia.1
 
 xml_files += \
@@ -26,13 +24,15 @@
 	usage-objects-special.xml \
 	usage-objects.xml \
 	usage-quickstart.xml \
+	custom-shapes.xml \
 	dia-cmdline.xml \
-	custom-shapes.xml
+	dia-1.xml
 
 
 EXTRA_DIST += \
 	dia.dbk \
-	dia-dbk-to-chapter.sed
+	dia-1.xml
+#	dia-dbk-to-chapter.sed
 #	graphics/line_props.png \
 #	graphics/home_network.png \
 #	graphics/line_icon.png \
@@ -52,8 +52,4 @@
 man_MANS = dia.1
 endif
 
-#outputs and filter dia.dbk into documentation chapter
-include-cmdline: dia.dbk
-	sed -f $(srcdir)/dia-dbk-to-chapter.sed $< >dia-cmdline.xml
-
 

Added: trunk/doc/en/dia-1.xml
==============================================================================
--- (empty file)
+++ trunk/doc/en/dia-1.xml	Sun May 25 13:08:48 2008
@@ -0,0 +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>

Modified: trunk/doc/en/dia.dbk
==============================================================================
--- trunk/doc/en/dia.dbk	(original)
+++ trunk/doc/en/dia.dbk	Sun May 25 13:08:48 2008
@@ -1,353 +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>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>
+&DIA-1;
 </refentry>

Modified: trunk/doc/en/dia.xml
==============================================================================
--- trunk/doc/en/dia.xml	(original)
+++ trunk/doc/en/dia.xml	Sun May 25 13:08:48 2008
@@ -39,6 +39,8 @@
     <!ENTITY LICENSE SYSTEM "license.xml">
 
     <!ENTITY pngfile "png">
+
+    <!ENTITY DIA-1 SYSTEM "dia-1.xml">
   ]
 
 >
@@ -151,3 +153,4 @@
 
 </book>
 
+

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Sun May 25 13:08:48 2008
@@ -8,8 +8,6 @@
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
-all: include-cmdline
-
 nodist_include_EXTRAS = dia.1
 
 xml_files += \
@@ -28,16 +26,19 @@
 	usage-objects.xml \
 	usage-quickstart.xml \
 	custom-shapes.xml \
-	dia-cmdline.xml
+	dia-cmdline.xml \
+	dia-1.xml
 
 EXTRA_DIST += \
 	dia.dbk \
-	dia-dbk-to-chapter.sed \
+	dia-1.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \
 	graphics/greendots.png \
+	graphics/preferences_fig.png \
 	graphics/color_selector.png
+	#dia-dbk-to-chapter.sed \
 
 ##missing	graphics/preferences-fig.png
 
@@ -58,8 +59,5 @@
 #adding lang to man path
 mandir = $(datadir)/man/$(lang)
 
-#outputs and filter dia.dbk into documentation chapter
-include-cmdline: dia.dbk
-	sed -f $(srcdir)/dia-dbk-to-chapter.sed $< >dia-cmdline.xml
 
 

Modified: trunk/doc/fr/custom-shapes.xml
==============================================================================
--- trunk/doc/fr/custom-shapes.xml	(original)
+++ trunk/doc/fr/custom-shapes.xml	Sun May 25 13:08:48 2008
@@ -154,6 +154,15 @@
         description SVG de la forme.
     </para>
     <para>
+	Ã leur crÃation, les formes ont une taille par dÃfaut.
+	Si leur dimension ne correspond pas à vos besoins, vous
+	pouvez remplacer celles-ci par l'une ou les deux directives:
+	<simplelist>
+	<member><literal><![CDATA[ <default-width>1cm</default-width> ]]></literal></member>
+	<member><literal><![CDATA[ <default-height>1cm</default-height>  ]]></literal></member>
+	</simplelist>
+    </para>
+    <para>
         L'ÃlÃment <literal>svg</literal> dÃcrit la forme.
         les attributs width et height
         sont ignorÃs, et donnÃs seulement pour compatibilità avec la

Added: trunk/doc/fr/dia-1.xml
==============================================================================
--- (empty file)
+++ trunk/doc/fr/dia-1.xml	Sun May 25 13:08:48 2008
@@ -0,0 +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è 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éour cré des diagrammes.
+        Dia possè des outils de base, comme les lignes et les boîs, mais
+        peut élement charger dynamiquement des <emphasis>feuilles</emphasis>.
+        Une feuille est une collection d&apos;outils utilisé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
+        êe connecté àes points de connexion, et par ce moyen des
+        structures de graphe peuvent êe mises en forme.  Lorsque les
+        objets sont déacé ou leurs dimensions changé, les
+        connexions suivent ces objets.</para>
+
+        <para>les diagrammes dessinéavec <command>Dia</command> peuvent
+        êe exporté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éans 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;éan 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éans la largeur et/ou la hauteur
+      démale donné  Il est possible de ne séctionner 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énté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éfiélors de
+            l&apos;exportation.  Les calques peuvent êe spéfié+            par leur nom, leur numé, ou une éndue numéque X-Y de
+            calques. --show-layers=background,2-5 montre
+            les calques nommébackground et les calques 2 à,
+            --show-layers=2- montre les calques 2 et supéeurs.</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éans le FORMAT et quitte.  Les
+            FORMATS D&apos;EXPORTATION sont déits 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é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éfications de format <literal>eps</literal> et
+        <literal>eps-pango</literal> utilisent toutes-deux le rendu de fontes
+        de la bibliothèe Pango, alors que <literal>eps-builtin</literal>
+        utilise le rendu de fontes spéfique de dia.  Si vous avez des
+        problès avec le rendu de Pango, p.ex. avec Unicode, utilisez
+        <literal>eps-builtin</literal> àa 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éun rértoire
+    <filename>.dia</filename> dans le rértoire « home » de
+    l&apos;utilisateur, contenant diffénts fichiers qui enregistrent ses
+    prérences.  Pour initialiser
+    <command>dia</command> dans son comportement par déut, il suffit
+    d&apos;effacer les fichiers suivants :</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><filename>defaults.dia</filename>: contient les valeurs par
+        déut des éments (format XML).</para>
+      </listitem>
+      <listitem>
+        <para><filename>diarc</filename>: garde les prérences de
+        <command>dia</command> (ASCII).</para>
+      </listitem>
+      <listitem>
+        <para><filename>history</filename>: garde la liste des derniers
+        diagrammes été(ASCII).</para>
+      </listitem>
+      <listitem>
+        <para><filename>menurc</filename>: contient une emprunte de carte
+        d&apos;accération automatisé(Lisp).</para>
+      </listitem>
+      <listitem>
+        <para><filename>persistence</filename>: contient les information
+        d&apos;interface graphique, p.ex. les fenêes ouvertes
+        (XML).</para>
+      </listitem>
+      <listitem>
+        <para><filename>pluginrc</filename>: la liste des plugins chargé+        (XML).</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>VOIR AUSSI</title>
+
+    <para><ulink url="http://www.pango.org/";>Pango</ulink></para>
+    <para>X (1)</para>
+    <para>xfig (1)</para>
+    <para>inkscape (1)</para>
+  </refsect1>
+
+  <refsect1>
+    <title>COPYRIGHT</title>
+
+    <para>Copyright 1999 Alexander Larsson.</para>
+
+    <para>Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without fee is
+    hereby granted, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTEURS</title>
+
+    <para><author><firstname>Alexander</firstname>
+	<surname>Larsson</surname>
+	<email>alla lysator liu se</email></author></para>
+
+    <para>This manual was written by
+    <author><firstname>Fredrik</firstname>
+	<surname>Hallenberg</surname>
+	<email>hallon lysator liu se</email></author>.</para>
+  </refsect1>
+  <refsect1>
+    <title>TRADUCTION</title>
+    <para>
+    <author>
+    <firstname>Thomas</firstname>
+    <surname>Harding</surname>
+    <email>thomas harding laposte net</email>
+    </author>
+    </para>
+  </refsect1>

Modified: trunk/doc/fr/dia.dbk
==============================================================================
--- trunk/doc/fr/dia.dbk	(original)
+++ trunk/doc/fr/dia.dbk	Sun May 25 13:08:48 2008
@@ -1,368 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!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>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>
+&DIA-1;
 </refentry>

Modified: trunk/doc/fr/dia.xml
==============================================================================
--- trunk/doc/fr/dia.xml	(original)
+++ trunk/doc/fr/dia.xml	Sun May 25 13:08:48 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" lang="fr"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 
 
@@ -47,6 +47,8 @@
     <!ENTITY fg "&nbsp;Â">
 
     <!ENTITY pngfile "png">
+
+    <!ENTITY DIA-1 SYSTEM "dia-1.xml">
   ]
 
 >
@@ -167,3 +169,4 @@
 
 </book>
 
+

Modified: trunk/doc/fr/usage-customization.xml
==============================================================================
--- trunk/doc/fr/usage-customization.xml	(original)
+++ trunk/doc/fr/usage-customization.xml	Sun May 25 13:08:48 2008
@@ -17,7 +17,7 @@
  <title>La boÃte de dialogue prÃfÃrences</title>
  <screenshot>
   <screeninfo>La boÃte de dialogue <interface>PrÃfÃrences.</interface></screeninfo>
-   <graphic format="PNG" fileref="graphics/preferences-fig.&pngfile;"
+   <graphic format="PNG" fileref="graphics/preferences_fig.&pngfile;"
         srccredit="Thomas Harding" />
  </screenshot>
  </figure>

Modified: trunk/doc/fr/usage-objects-basic.xml
==============================================================================
--- trunk/doc/fr/usage-objects-basic.xml	(original)
+++ trunk/doc/fr/usage-objects-basic.xml	Sun May 25 13:08:48 2008
@@ -15,6 +15,50 @@
     son propre type d'objet. Un texte peut Ãtre placà sur le canevas en
     cliquant sur le bouton <guibutton>T</guibutton> (texte) dans la &toolbox;.
    </para>
+   <para>
+	L'objet texte, et plusieurs autres objets, offrent une entrÃe directe
+	de texte dans le diagramme. Le texte peut Ãtre saisi en sÃlectionnant
+	l'objet et en tapant le texte. La fonte, la taille, et autres
+	propriÃtÃs de format peuvent Ãtre changÃes en double-cliquant l'objet.
+   </para>
+   <para>
+    Voici quelques trucs importants Ã-propos des raccourcis clavier dans
+    les entrÃes de texte.
+   </para>
+   <itemizedlist>
+   <listitem>
+   <para>
+   Les combinaisons normales Couper / Copier / Coller (CTRL-C, CTRL-X, CTRL-V)
+   ne fonctionnent pas pour le texte, mais pour l'ensemble de l'objet.
+   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Ã
+   selon les propriÃtÃs de l'objet de destination et non de celui du texte source.
+   </para></note>
+   </listitem>
+   <listitem>
+   <para>On ne peut pas sÃlectionner de portion de texte à la souris (cela
+   dÃplace l'objet). Vous pouvez insÃrer des caractÃres à la position
+   courante du curseur simplement en les tapant. Vous pouvez supprimer le
+   caractÃre à gauche du pointeur de la souris avec la touche retour arriÃre
+   (backspace).
+   </para>
+   <note><para>
+   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>
+   </listitem>
+   <listitem><para>
+   Si vous utilizez une police ou une taille de police autre que celle par 
+   dÃfaut, une astuce pour Ãtre plus productif est de crÃer une palette
+   d'objets vides avec les attributs voulus sur un diagramme sÃparÃ.
+   Copiez et collez ces objets sur votre diagramme de  travail au fur et
+   à mesure des besoins, plutÃt que d'utiliser la boÃte à outils.
+   </para></listitem>
+   </itemizedlist>
    <note>
     <para>
      Le <emphasis>Texte</emphasis> dans <application>Dia</application> peut
@@ -141,3 +185,4 @@
    </sect2>
   </sect1>
 </chapter>
+<!-- vim: set expandtab tabstop=4 shiftwidth=4: -->



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