提交: c50dd864e789dc6aad63f7d7439e8b4e86fcc126 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: c50dd864e789dc6aad63f7d7439e8b4e86fcc126 (tree)
• 時間: 2006-03-13 05:02:18
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

UML fixes, autogaps, security fixes, dia.spec move...

Change Summary

• add: COPYING
• modified: ChangeLog
• modified: Makefile.am
• modified: NEWS
• modified: RELEASE-PROCESS
• modified: config.h.win32
• modified: configure.in
• delete: dia.spec => installer/rpm/dia.spec
• modified: doc/en/dia.1
• modified: doc/en/dia.xml
• modified: doc/eu/dia.1
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml
• add: installer/rpm/README
• modified: installer/win32/dia.nsi
• modified: lib/connection.c
• modified: lib/connection.h
• modified: lib/diagdkrenderer.c
• modified: lib/dialibartrenderer.c
• modified: lib/object.c
• modified: objects/FS/flow.c
• modified: objects/Istar/link.c
• modified: objects/Jackson/phenomenon.c
• modified: objects/KAOS/metaandorrel.c
• modified: objects/KAOS/metabinrel.c
• modified: objects/SADT/annotation.c
• modified: objects/UML/class.c
• modified: objects/UML/class.h
• modified: objects/UML/constraint.c
• modified: objects/UML/implements.c
• modified: objects/UML/message.c
• modified: objects/UML/uml.h
• modified: objects/UML/umloperation.c
• modified: objects/network/bus.c
• modified: objects/network/wanlink.c
• modified: objects/standard/line.c
• modified: plug-ins/xfig/xfig-import.c
• modified: plug-ins/xfig/xfig.h

差異

--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* installer/win32/dia.nsi: 
+	* doc/en/dia.xml: 
+	* doc/eu/dia.xml: 
+	* doc/pl/dia.xml: 
+	* config.h.win32: 
+	* configure.in: 
+	* NEWS: -pre5
+
+	* objects/UML/constraint.c (constraint_update_data): 
+	* objects/UML/message.c (message_update_data): 
+	* objects/UML/implements.c (implements_update_data): 
+	* objects/SADT/annotation.c (annotation_update_data): 
+	* objects/Jackson/phenomenon.c (message_update_data): 
+	* objects/network/wanlink.c (wanlink_update_data): 
+	* objects/FS/flow.c (flow_update_data): Added autogap adjustment.
+
+	* objects/standard/line.c: 
+	* lib/connection.[ch] (connection_adjust_for_autogap): Moved autogap
+	functionality for connections.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* lib/diagdkrenderer.c (draw_object): 
+	* lib/dialibartrenderer.c (draw_object): Don't draw highlighting
+	in the non-interactive rendering.
+
+	* dia.spec:
+	* installer/rpm/dia.spec:
+	* installer/rpm/README:
+	Moving dia.spec to installer directory, where distribution
+	maintainers can keep their own copies.
+
+	* objects/UML/uml.h: 
+	* objects/UML/class.h: 
+	* objects/UML/umloperation.c: 
+	* objects/UML/class.c: 
+	Preparations to fix bug #334037: Clean away the Lisp-like
+	constructs confusing the issue.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* lib/object.c: Don't compare floats with ==, even in sanity checks.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* plug-ins/xfig/xfig-import.c: Fix three buffer overflows in color
+	reading, depth reading, and points reading.  Thanks to 
+	
+	* COPYING: Added copyright info again.
+
 2006-03-09  Steffen Macke <[e-mail]>
 
 	* installer/win32/dia.nsi: don't uninstall old version; overwrite

--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollke
 #	@:
 
 EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png \
-	dia.desktop.in dia.spec KNOWN_BUGS $(pkgdata_DATA) \
+	dia.desktop.in KNOWN_BUGS $(pkgdata_DATA) \
 	dia-diagram.png dia.mime dia.keys.in \
 	po-checktrans.py po-checktrans \
 	intltool-extract.in intltool-merge.in intltool-update.in \

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+dia-0.95-pre5: 12-Mar-2006
+
+* Fixed positioning and height of UML operations when wrapped.
+
+* Three security holes in the XFig importer fixed after review.
+
+* COPYING file readded.
+
 dia-0.95-pre4: 6-Mar-2006
 
 * Fixed Fig import locale issues, TeX export escape issues.

--- a/RELEASE-PROCESS
+++ b/RELEASE-PROCESS
@@ -98,7 +98,7 @@ How to make a tarball
 
 Script to update version:
 
-find . -name configure.in -o -name config.h.win32 -o -name dia.xml -o -name dia.dbk | xargs sed -i 's/0\.95-pre[0-9]*/0.95-pre5/;'
+find . -name configure.in -o -name config.h.win32 -o -name dia.xml  | xargs sed -i 's/0\.95-pre[0-9]*/0.95-pre5/;'
 
 Issues to solve
 ---------------

--- a/config.h.win32
+++ b/config.h.win32
@@ -18,7 +18,7 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
-#define VERSION "0.95-pre4"
+#define VERSION "0.95-pre5"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.95-pre4, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.95-pre5, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/doc/en/dia.1
+++ b/doc/en/dia.1
@@ -1,189 +1,197 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "DIA" 1 "2004-11-26" "" ""
-.SH NAME
+.\" ** 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" "2004\-11\-26" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
 dia \- a diagram drawing program
 .SH "SYNOPSIS"
-.ad l
-.hy 0
 .HP 4
-\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fIOUTPUT\fR\fR] [\fB\-\-export=\fIOUTPUT\fR\fR] [\fB\-L\ \fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-\-show\-layers=\fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fIWxH\fR\fR] [\fB\-\-size=\fIWxH\fR\fR] [\fB\-t\ \fIFORMAT\fR\fR] [\fB\-\-export\-to\-format=\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \&.\&.\&.]
-.ad
-.hy
-
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] [\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-L\ \fR\fB\fILAYER,LAYER,...\fR\fR] [\fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\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\-\-export\-to\-format=\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 sheets\&. 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 have handles\&. 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 
+have 
+\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 accepts the following options:
-
+\fBDia\fR 
+accepts the following options:
 .TP
 \fB\-c\fR \fB\-\-credits\fR
-Display credits list and exit\&.
-
+Display credits list and exit.
 .TP
-\fB\-e \fIOUTPUT\fR\fR \fB\-\-export=\fIOUTPUT\fR\fR
-Export loaded file to OUTPUT and exit\&.
-
+\fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
+Export loaded file to OUTPUT and exit.
 .TP
 \fB\-h\fR \fB\-\-help\fR
-Display a list of all commandline options\&.
-
+Display a list of all commandline options.
 .TP
 \fB\-n\fR \fB\-\-nosplash\fR
-Do not show the splash screen\&.
-
+Do not show the splash screen.
+.TP
+\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.
+.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
-\fB\-s \fIWxH\fR\fR \fB\-\-size=\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=\fI520x\fR\fR exports an image that is 520 pixels wide, while \fB\-\-size=\fIx900\fR\fR exports an image of 900 pixels height\&.
-
-.RS
-.Sh "Note"
-This option is currently only implemented for the PNG export filter\&.
-
-.RE
-
+\fB\-L \fR\fB\fILAYER,LAYER,...\fR\fR \fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\fR\fR
+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.
 .TP
-\fB\-L \fILAYER,LAYER,\&.\&.\&.\fR\fR \fB\-\-show\-layers=\fILAYER,LAYER,\&.\&.\&.\fR\fR
-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\&.
-
-.TP
-\fB\-t \fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fIFORMAT\fR\fR
-Export loaded file in FORMAT and exit\&. Format are described below\&.
-
+\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
 \fB\-v\fR \fB\-\-version\fR
-Display \fBdia\fR version and exit\&.
-
+Display 
+\fBdia\fR 
+version and exit.
 .SH "EXPORT FORMATS"
-
 .PP
-The following export formats are supported by \fBdia\fR\&.
-
+The following export formats are supported by 
+\fBdia\fR.
 .TP 3
 \(bu
-cgm (Computer Graphics Metafile, ISO 8632)
+cgm 
+(Computer Graphics Metafile, ISO 8632)
 .TP
 \(bu
-dia (Native dia diagram)
+dia 
+(Native dia diagram)
 .TP
 \(bu
-dxf (Drawing Interchange File)
+dxf 
+(Drawing Interchange File)
 .TP
 \(bu
-eps or epsi oreps\-builtin or eps\-pango (Encapsulated PostScript)
+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, whileeps\-builtin uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try eps\-builtin instead\&.
+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 (XFig format)
+fig 
+(XFig format)
 .TP
 \(bu
-mp (TeX MetaPost macros)
+mp 
+(TeX MetaPost macros)
 .TP
 \(bu
-plt or hpgl (HP Graphics Language)
+plt 
+or 
+hpgl 
+(HP Graphics Language)
 .TP
 \(bu
-png (Portable Network Graphics)
+png 
+(Portable Network Graphics)
 .TP
 \(bu
-shape (Dia Shape File)
+shape 
+(Dia Shape File)
 .TP
 \(bu
-svg (Scalable Vector Graphics)
+svg 
+(Scalable Vector Graphics)
 .TP
 \(bu
-tex (TeX PSTricks macros)
+tex 
+(TeX PSTricks macros)
 .TP
 \(bu
-wpg (WordPerfect Graphics)
+wpg 
+(WordPerfect Graphics)
 .TP
 \(bu
-wmf (Windows MetaFile)
-.LP
-
+wmf 
+(Windows MetaFile)
 .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:
-
+\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)\&.
+\fIdefaults.dia\fR: contains default values for elements (XML format).
 .TP
 \(bu
-\fIdiarc\fR: keeps\fBdia\fR preferences (ASCII)\&.
+\fIdiarc\fR: keeps 
+\fBdia\fR 
+preferences (ASCII).
 .TP
 \(bu
-\fIhistory\fR: keeps the list of last edited diagrams (ASCII)\&.
+\fIhistory\fR: keeps the list of last edited diagrams (ASCII).
 .TP
 \(bu
-\fImenurc\fR: contains an automated accelerator map dump (Lisp)\&.
+\fImenurc\fR: contains an automated accelerator map dump (Lisp).
 .TP
 \(bu
-\fIpersistence\fR: contains GUI information, e\&.g\&. open windows (XML)\&.
+\fIpersistence\fR: contains GUI information, e.g. open windows (XML).
 .TP
 \(bu
-\fIpluginrc\fR: the list of loaded plugins (XML)\&.
-.LP
-
+\fIpluginrc\fR: the list of loaded plugins (XML).
 .SH "SEE ALSO"
-
 .PP
-Pango: \fIhttp://www.pango.org/\fR
-
+[1]\&\fIPango\fR
 .PP
 X (1)
-
 .PP
 xfig (1)
-
 .PP
 inkscape (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 AUTHORS
-Fredrik Hallenberg, W\&. Borgert, Alan Horkan.
+This manual was written by 
+Fredrik Hallenberg.
+.SH "AUTHOR"
+Fredrik Hallenberg <[e-mail]>, W. Borgert <[e-mail]>, Alan Horkan <[e-mail]>. 
+.SH "REFERENCES"
+.TP 3
+1.\ Pango
+\%http://www.pango.org/

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.95-pre4">
+    <!ENTITY VERSION "0.95-pre5">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/eu/dia.1
+++ b/doc/eu/dia.1
@@ -1,51 +1,190 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dia</title><meta name="generator" content="DocBook XSL Stylesheets V1.48"></head><body text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry"><a name="id2750613"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>dia &#8212; a diagram drawing program</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><tt>dia</tt>  [<tt>-c</tt>] [<tt>--credits</tt>] [<tt>-e <i><tt>OUTPUT</tt></i></tt>] [<tt>--export=<i><tt>OUTPUT</tt></i></tt>] [<tt>-h</tt>] [<tt>--help</tt>] [<tt>-n</tt>] [<tt>--nosplash</tt>] [<tt>-s <i><tt>WxH</tt></i></tt>] [<tt>--size=<i><tt>WxH</tt></i></tt>] [<tt>-t <i><tt>FORMAT</tt></i></tt>] [<tt>--export-to-format=<i><tt>FORMAT</tt></i></tt>] [<tt>-v</tt>] [<tt>--version</tt>] [file ...]</p></div></div><div class="refsect1"><h2>Description</h2><p><b>Dia</b> is used to create diagrams.  Dia has
-    a number of basic tools, like lines and boxes but can also
-    dynamically load <span class="emphasis"><i>sheets</i></span>.  A sheet is a
-    collection of tools that are used in a certain type of
-    diagram.</p><p>Most diagram objects in <b>Dia</b> has
-    <span class="emphasis"><i>handles</i></span>.  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.</p><p>Diagrams drawn in <b>Dia</b> can be exported
-    PostScript.</p></div><div class="refsect1"><h2>Options</h2><p><b>Dia</b> accepts the following options:</p><div class="variablelist"><dl><dt><span class="term"><tt>-c</tt>
-	  <tt>--credits</tt></span></dt><dd><p>Display credits list and exit.</p></dd><dt><span class="term"><tt>-e <i><tt>OUTPUT</tt></i></tt>
-	  <tt>--export=<i><tt>OUTPUT</tt></i></tt></span></dt><dd><p>Export loaded file to OUTPUT and exit.</p></dd><dt><span class="term"><tt>-h</tt>
-	  <tt>--help</tt></span></dt><dd><p>Display a list of all commandline options.</p></dd><dt><span class="term"><tt>-n</tt>
-	  <tt>--nosplash</tt></span></dt><dd><p>Do not show the splash screen.</p></dd><dt><span class="term"><tt>-s <i><tt>WxH</tt></i></tt>
-	  <tt>--size=<i><tt>WxH</tt></i></tt></span></dt><dd><p>Export loaded file in decimal given width and/or
-	  height.  It is allowed to only select width or height.
-	  E.g. <tt>--size=<i><tt>520x</tt></i></tt>
-	  exports an image that is 520 pixels wide, while
-	  <tt>--size=<i><tt>x900</tt></i></tt>
-	  exports an image of 900 pixels height.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>This option is currently only implemented for the
-	    PNG export filter.</p></div></dd><dt><span class="term"><tt>-t <i><tt>FORMAT</tt></i></tt>
-	  <tt>--export-to-format=<i><tt>FORMAT</tt></i></tt></span></dt><dd><p>Export loaded file in FORMAT and exit.  Format are
-	  described below.</p></dd><dt><span class="term"><tt>-v</tt>
-	  <tt>--version</tt></span></dt><dd><p>Display <b>dia</b> version and exit.</p></dd></dl></div></div><div class="refsect1"><h2>Export Formats</h2><p>The following export formats are supported by
-    <b>dia</b>.</p><div class="itemizedlist"><ul type="disc"><li><p><tt>cgm</tt> (Computer Graphics Metafile, ISO
-        8632)</p></li><li><p><tt>dia</tt> (Native dia diagram)</p></li><li><p><tt>dxf</tt> (Drawing Interchange File)</p></li><li><p><tt>eps</tt> or <tt>epsi</tt> or
-	<tt>eps-builtin</tt> or <tt>eps-pango</tt>
-	(Encapsulated PostScript)</p><p>The format specifications <tt>eps</tt>,
-	<tt>epsi</tt>, and <tt>eps-pango</tt> all
-	use the font renderer of the Pango library, while
-	<tt>eps-builtin</tt> uses a dia specific font
-	renderer.  If you have problems with Pango rendering,
-	e.g. Unicode, try <tt>eps-builtin</tt>
-	instead.</p></li><li><p><tt>fig</tt> (XFig format)</p></li><li><p><tt>mp</tt> (TeX MetaPost macros)</p></li><li><p><tt>plt</tt> or <tt>hpgl</tt> (HP
-	Graphics Language)</p></li><li><p><tt>png</tt> (Portable Network
-	Graphics)</p></li><li><p><tt>shape</tt> (Dia shape file)</p></li><li><p><tt>svg</tt> (Scalable Vector Graphics)</p></li><li><p><tt>tex</tt> (TeX PSTricks macros)</p></li><li><p><tt>wpg</tt> (WordPerfect Graphics)</p></li><li><p><tt>wmf</tt> (Windows MetaFile)</p></li></ul></div></div><div class="refsect1"><h2>Files</h2><p><b>dia</b> creates a directory
-    <tt>.dia</tt> in the user's home, which contains
-    different files to store user preferences.  To reset
-    <b>dia</b> to it's default behaviour, just remove
-    the respective file:</p><div class="itemizedlist"><ul type="disc"><li><p><tt>defaults.dia</tt>: contains default
-        values for elements (XML format).</p></li><li><p><tt>diarc</tt>: keeps
-	<b>dia</b> preferences (ASCII).</p></li><li><p><tt>history</tt>: keeps the list of last
-        edited diagrams (ASCII).</p></li><li><p><tt>menurc</tt>: contains an automated
-	accelerator map dump (Lisp).</p></li><li><p><tt>persistence</tt>: contains GUI
-	information, e.g. open windows (XML).</p></li><li><p><tt>pluginrc</tt>: the list of loaded
-	plugins (XML).</p></li></ul></div></div><div class="refsect1"><h2>See Also</h2><p><a href="http://www.pango.org/" target="_top">Pango</a></p><p>X (1)</p></div><div class="refsect1"><h2>Copyright</h2><p>Copyright 1999 Alexander Larsson.</p><p>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.</p></div><div class="refsect1"><h2>Authors</h2><p><span class="author">Alexander Larsson</span></p><p>This manual was written by
-    <span class="author">Fredrik Hallenberg</span>.</p></div></div></body></html>
+.\" ** 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" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+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\-\-export\-to\-format=\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:
+.TP
+\fB\-c\fR \fB\-\-credits\fR
+Display credits list and exit.
+.TP
+\fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
+Export loaded file to OUTPUT and exit.
+.TP
+\fB\-h\fR \fB\-\-help\fR
+Display a list of all commandline options.
+.TP
+\fB\-n\fR \fB\-\-nosplash\fR
+Do not show the splash screen.
+.TP
+\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.
+.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
+\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
+\fB\-v\fR \fB\-\-version\fR
+Display 
+\fBdia\fR 
+version and exit.
+.SH "EXPORT FORMATS"
+.PP
+The following export formats are supported by 
+\fBdia\fR.
+.TP 3
+\(bu
+cgm 
+(Computer Graphics Metafile, ISO 8632)
+.TP
+\(bu
+dia 
+(Native dia diagram)
+.TP
+\(bu
+dxf 
+(Drawing Interchange File)
+.TP
+\(bu
+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 
+(XFig format)
+.TP
+\(bu
+mp 
+(TeX MetaPost macros)
+.TP
+\(bu
+plt 
+or 
+hpgl 
+(HP Graphics Language)
+.TP
+\(bu
+png 
+(Portable Network Graphics)
+.TP
+\(bu
+shape 
+(Dia shape file)
+.TP
+\(bu
+svg 
+(Scalable Vector Graphics)
+.TP
+\(bu
+tex 
+(TeX PSTricks macros)
+.TP
+\(bu
+wpg 
+(WordPerfect Graphics)
+.TP
+\(bu
+wmf 
+(Windows MetaFile)
+.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).
+.SH "SEE ALSO"
+.PP
+[1]\&\fIPango\fR
+.PP
+X (1)
+.SH "COPYRIGHT"
+.PP
+Copyright 1999 Alexander Larsson.
+.PP
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation.
+.SH "AUTHORS"
+.PP
+Alexander Larsson
+.PP
+This manual was written by 
+Fredrik Hallenberg.
+.SH "AUTHOR"
+Fredrik Hallenberg <[e-mail]>, W. Borgert <[e-mail]>. 
+.SH "REFERENCES"
+.TP 3
+1.\ Pango
+\%http://www.pango.org/

--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -4,7 +4,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
 
-    <!ENTITY VERSION "0.95-pre4">
+    <!ENTITY VERSION "0.95-pre5">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.95-pre4">
+<!ENTITY VERSION "0.95-pre5">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- /dev/null
+++ b/installer/rpm/README
@@ -0,0 +1,15 @@
+This directory contains dia.spec files for various distributions.  The
+dia.spec file can be used as a template at first, but will be removed
+later.  Maintainers of Dia on various distributions should update the spec
+files as things like package names change.  The files should be named to
+indicate which distribution they belong to, e.g. dia.spec.suse or
+dia.spec.redhat.el3.
+
+This step has been necessary because distributions cannot agree to what
+their packages are called, mainly, but also some other details differ, and
+I will not spend my time trying to fix one file back and forth. If a
+distribution maintainer does not have CVS access, I am willing to apply
+patches for them.
+
+-Lars
+11/3/2006

--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -94,8 +94,8 @@ VIAddVersionKey "ProductName" "Dia for Windows"
 VIAddVersionKey "CompanyName" "The Dia Developers"
 VIAddVersionKey "LegalCopyright" "(c) 2003-2006 Alexander Larsson and others"
 VIAddVersionKey "FileDescription" "Dia for Windows Installer"
-VIAddVersionKey "FileVersion" "0.95.0.4"
-VIProductVersion "0.95.0.4"
+VIAddVersionKey "FileVersion" "0.95.0.5"
+VIProductVersion "0.95.0.5"
 
 ;--------------------------------
 ;Modern UI Configuration

--- a/lib/connection.c
+++ b/lib/connection.c
@@ -26,6 +26,41 @@
 #include "connection.h"
 #include "message.h"
 
+/** Adjust connection endings for autogap.  This function actually moves the
+ * ends of the connection, but only when the end is connected to 
+ * a mainpoint.
+ */
+void
+connection_adjust_for_autogap(Connection *connection)
+{
+  Point endpoints[2];
+  ConnectionPoint *start_cp, *end_cp;
+
+  start_cp = connection->endpoint_handles[0].connected_to;
+  end_cp = connection->endpoint_handles[1].connected_to;
+
+  endpoints[0] = connection->endpoints[0];
+  endpoints[1] = connection->endpoints[1];
+
+  if (connpoint_is_autogap(start_cp)) {
+    endpoints[0] = start_cp->pos;
+  }
+  if (connpoint_is_autogap(end_cp)) {    
+    endpoints[1] = end_cp->pos;
+  }
+
+  if (connpoint_is_autogap(start_cp)) {
+    connection->endpoints[0] = calculate_object_edge(&endpoints[0],
+						     &endpoints[1],
+						     start_cp->object);
+  }
+  if (connpoint_is_autogap(end_cp)) {    
+    connection->endpoints[1] = calculate_object_edge(&endpoints[1],
+						     &endpoints[0],
+						     end_cp->object);
+  }
+}
+
 /** Function called to move one of the handles associated with the
  *  object. 
  *  This is an object_ops function.

--- a/lib/connection.h
+++ b/lib/connection.h
@@ -51,6 +51,8 @@ ObjectChange* connection_move_handle(Connection *conn, HandleId id,
 				     HandleMoveReason reason, 
 				     ModifierKeys modifiers);
 
+void connection_adjust_for_autogap(Connection *conn);
+
 /* base property stuff... */
 #define CONNECTION_COMMON_PROPERTIES \
   OBJECT_COMMON_PROPERTIES, \

--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -965,7 +965,8 @@ draw_polygon (DiaRenderer *self,
 static void
 draw_object (DiaRenderer *renderer, DiaObject *object)
 {
-  if (object->highlight_color != NULL) {
+  if (renderer->is_interactive &&
+      object->highlight_color != NULL) {
     DiaGdkRenderer *gdk_rend = DIA_GDK_RENDERER(renderer);
     gdk_rend->highlight_color = object->highlight_color;
     object->ops->draw(object, renderer);

--- a/lib/dialibartrenderer.c
+++ b/lib/dialibartrenderer.c
@@ -1331,7 +1331,8 @@ draw_image(DiaRenderer *self,
 static void
 draw_object (DiaRenderer *renderer, DiaObject *object)
 {
-  if (object->highlight_color != NULL) {
+  if (renderer->is_interactive &&
+      object->highlight_color != NULL) {
     DiaLibartRenderer *libart_rend = DIA_LIBART_RENDERER(renderer);
     libart_rend->highlight_color = object->highlight_color;
     object->ops->draw(object, renderer);

--- a/lib/object.c
+++ b/lib/object.c
@@ -889,7 +889,8 @@ dia_object_sanity_check(const DiaObject *obj, const gchar *msg) {
 				 g_utf8_validate(cp->object->type->name, -1, NULL),
 				 "%s:  Handle %d (%p) on object %p connects to CP %p with untyped object %p\n",
 				 msg, i, h, obj, cp, cp->object)) break;
-	    dia_assert_true(cp->pos.x == h->pos.x && cp->pos.y == h->pos.y,
+	    dia_assert_true(fabs(cp->pos.x - h->pos.x) < 0.0000001 &&
+			    fabs(cp->pos.y - h->pos.y) < 0.0000001,
 			    "%s: Handle %d (%p) on object %p has pos %f, %f,\nbut its CP %p of object %p has pos %f, %f\n",
 			    msg, i, h, obj, h->pos.x, h->pos.y, 
 			    cp, cp->object, cp->pos.x, cp->pos.y);

--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -470,6 +470,10 @@ flow_update_data(Flow *flow)
   Rectangle rect;
   Color* color = NULL;
   
+  if (connpoint_is_autogap(flow->connection.endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(flow->connection.endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(flow);
+  }
   obj->position = conn->endpoints[0];
 
   switch (flow->type) {

--- a/objects/Istar/link.c
+++ b/objects/Istar/link.c
@@ -629,6 +629,13 @@ link_update_data(Link *link)
   Rectangle rect;
   Point p1,p2,p3,p4,pa;
 
+/* Too complex to easily decide */
+/*
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
+*/
   obj->position = conn->endpoints[0];
 
   link->pm_handle.pos = link->pm;

--- a/objects/Jackson/phenomenon.c
+++ b/objects/Jackson/phenomenon.c
@@ -377,6 +377,10 @@ message_update_data(Message *message)
   DiaObject *obj = &conn->object;
   Rectangle rect;
 
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   obj->position = conn->endpoints[0];
 
   message->text_handle.pos = message->text_pos;

--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -578,7 +578,13 @@ maor_update_data(Maor *maor)
   Rectangle rect;
   Point p1,p2,p3,p4;
 
-  obj->position = conn->endpoints[0];
+/* Too complex to easily decide */
+/*
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
+*/  obj->position = conn->endpoints[0];
 
   maor->text_handle.pos = maor->text_pos;
 

--- a/objects/KAOS/metabinrel.c
+++ b/objects/KAOS/metabinrel.c
@@ -536,6 +536,13 @@ mbr_update_data(Mbr *mbr)
   Point p3,p4;
   gchar *text;
 
+/* Too complex to easily decide */
+/*
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
+*/
   obj->position = conn->endpoints[0];
 
   mbr->pm_handle.pos = mbr->pm;

--- a/objects/SADT/annotation.c
+++ b/objects/SADT/annotation.c
@@ -399,6 +399,10 @@ annotation_update_data(Annotation *annotation)
   DiaObject *obj = &conn->object;
   Rectangle textrect;
   
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   obj->position = conn->endpoints[0];
 
   annotation->text_handle.pos = annotation->text->position;

--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -909,18 +909,16 @@ umlclass_draw_operationbox(UMLClass *umlclass, DiaRenderer *renderer, Element *e
 
       wrapping_needed = 0;
       if( umlclass->wrap_operations ) {
-        wrapsublist = (GList*)g_list_nth( umlclass->operations_wrappos, i)->data;
-        wrapping_needed = GPOINTER_TO_INT( wrapsublist->data );
+	wrapsublist = op->wrappos;
       }
 
       ascent = dia_font_ascent(opstr, font, font_height);
+      op->ascent = ascent;
       renderer_ops->set_font(renderer, font, font_height);
 
-      if( umlclass->wrap_operations && wrapping_needed) {
-
-        wrapsublist = g_list_next( wrapsublist);
-        ident = GPOINTER_TO_INT( wrapsublist->data);
-        wrapsublist = g_list_next( wrapsublist);
+      if( umlclass->wrap_operations && op->needs_wrapping) {
+	ident = op->wrap_indent;
+	wrapsublist = op->wrappos;
         wrap_pos = last_wrap_pos = 0;
 
         while( wrapsublist != NULL)   {
@@ -1192,10 +1190,15 @@ umlclass_update_data(UMLClass *umlclass)
     op->right_connection->pos.y = y;
     op->right_connection->directions = DIR_EAST;
 
-    y += umlclass->font_height;
+    if (op->needs_wrapping) { /* Wrapped */
+      int lines = g_list_length(op->wrappos);
+      y += umlclass->font_height - op->ascent;
+      y += op->ascent * lines;
+    } else {
+      y += umlclass->font_height;
+    }
     if (umlclass->visible_comments && op->comment != NULL && op->comment[0] != '\0')
-      y += umlclass->comment_font_height;
-
+      y += umlclass->comment_font_height; /* Not adjusted for wrap */
     list = g_list_next(list);
   }
   
@@ -1292,12 +1295,6 @@ static real
 umlclass_calculate_attribute_data(UMLClass *umlclass) 
 {
   int    i;
-  int    pos_next_comma;
-  int    pos_brace;
-  int    wrap_pos;
-  int    last_wrap_pos;
-  int    maxlinewidth;
-  int    length;
   real   maxwidth = 0.0;
   real   width    = 0.0;
   GList *list;
@@ -1377,25 +1374,17 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
   int    pos_brace;
   int    wrap_pos;
   int    last_wrap_pos;
-  int    ident;
+  int    indent;
   int    offset;
   int    maxlinewidth;
   int    length;
   real   maxwidth = 0.0;
   real   width    = 0.0;
   GList *list;
-  GList *sublist;
   GList *wrapsublist;
 
   /* operations box: */
   umlclass->operationsbox_height = 2*0.1;
-  /* dont leak string wrappings */
-  if (umlclass->operations_wrappos != NULL)
-  {
-    g_list_foreach(umlclass->operations_wrappos, (GFunc)g_list_free, NULL);
-    g_list_free(umlclass->operations_wrappos);
-    umlclass->operations_wrappos = NULL;
-  }
 
   if (0 != g_list_length(umlclass->operations))
   {
@@ -1405,35 +1394,60 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
     {
       UMLOperation *op = (UMLOperation *) list->data;
       gchar *opstr = uml_get_operation_string(op);
+      DiaFont   *Font;
+      real       FontHeight;
+
+      length = strlen( (const gchar*)opstr);
+
+      if (op->wrappos != NULL) {
+	g_list_free(op->wrappos);
+      }
+      op->wrappos = NULL;
+      
+      switch(op->inheritance_type)
+      {
+	  case UML_ABSTRACT:
+	    Font       =  umlclass->abstract_font;
+	    FontHeight =  umlclass->abstract_font_height;
+	    break;
+	  case UML_POLYMORPHIC:
+	    Font       =  umlclass->polymorphic_font;
+	    FontHeight =  umlclass->polymorphic_font_height;
+	    break;
+	  case UML_LEAF:
+	  default:
+	    Font       = umlclass->normal_font;
+	    FontHeight = umlclass->font_height;
+      }
+      op->ascent = dia_font_ascent(opstr, Font, FontHeight);
 
-      length = 0;
       if( umlclass->wrap_operations )
       {
-        length = strlen( (const gchar*)opstr);
-        sublist = NULL;
         if( length > umlclass->wrap_after_char)
         {
           gchar *part_opstr;
-          sublist = g_list_append( sublist, GINT_TO_POINTER( 1));
+	  op->needs_wrapping = TRUE;
 
           /* count maximal line width to create a secure buffer (part_opstr)
           and build the sublist with the wrapping data for the current operation, which will be used by umlclass_draw(), too. 
-          The content of the sublist is:
-          1st element: (bool) wrapping needed or not, 2nd: indentation in chars, 3rd-last: absolute wrapping positions */
-          pos_next_comma = pos_brace = wrap_pos = offset = maxlinewidth = umlclass->max_wrapped_line_width = 0;
+	  */
+          pos_next_comma = pos_brace = wrap_pos = offset 
+	    = maxlinewidth = umlclass->max_wrapped_line_width = 0;
           while( wrap_pos + offset < length)
           {
             do
             {
               pos_next_comma = strcspn( (const gchar*)opstr + wrap_pos + offset, ",");
               wrap_pos += pos_next_comma + 1;
-            } while( wrap_pos < umlclass->wrap_after_char - pos_brace && wrap_pos + offset < length);
+            } while( wrap_pos < umlclass->wrap_after_char - pos_brace 
+		     && wrap_pos + offset < length);
 
             if( offset == 0){
               pos_brace = strcspn( opstr, "(");
-              sublist = g_list_append( sublist, GINT_TO_POINTER( pos_brace+1));
+	      op->wrap_indent = pos_brace + 1;
             }
-            sublist = g_list_append( sublist, GINT_TO_POINTER( wrap_pos + offset));
+	    op->wrappos = g_list_append(op->wrappos, 
+					GINT_TO_POINTER(wrap_pos + offset));
 
             maxlinewidth = MAX(maxlinewidth, wrap_pos);
 
@@ -1442,17 +1456,13 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
           }
           umlclass->max_wrapped_line_width = MAX( umlclass->max_wrapped_line_width, maxlinewidth+1);
 
-          wrapsublist = g_list_next( sublist);
-          ident = GPOINTER_TO_INT( wrapsublist->data);
-          part_opstr = g_alloca(umlclass->max_wrapped_line_width+ident+1);
-          pos_next_comma = pos_brace = wrap_pos = offset = 0;
+	  indent = op->wrap_indent;
+          part_opstr = g_alloca(umlclass->max_wrapped_line_width+indent+1);
 
-          wrapsublist = g_list_next( wrapsublist);
+	  wrapsublist = op->wrappos;
           wrap_pos = last_wrap_pos = 0;
 
           while( wrapsublist != NULL){
-            DiaFont   *Font;
-            real       FontHeight;
             wrap_pos = GPOINTER_TO_INT( wrapsublist->data);
             if( last_wrap_pos == 0){
               strncpy( part_opstr, opstr, wrap_pos);
@@ -1460,28 +1470,16 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
             }
             else
             {
-              memset( part_opstr, ' ', ident);
-              memset( part_opstr+ident, '\0', 1);
+              memset( part_opstr, ' ', indent);
+              memset( part_opstr+indent, '\0', 1);
               strncat( part_opstr, opstr+last_wrap_pos, wrap_pos-last_wrap_pos);
             }
 
-            switch(op->inheritance_type)
-            {
-            case UML_ABSTRACT:
-              Font       =  umlclass->abstract_font;
-              FontHeight =  umlclass->abstract_font_height;
-              break;
-            case UML_POLYMORPHIC:
-              Font       =  umlclass->polymorphic_font;
-              FontHeight =  umlclass->polymorphic_font_height;
-              break;
-            case UML_LEAF:
-            default:
-              Font       = umlclass->normal_font;
-              FontHeight = umlclass->font_height;
-            }
             width = dia_font_string_width(part_opstr,Font,FontHeight);
-            umlclass->operationsbox_height += FontHeight;
+            umlclass->operationsbox_height += op->ascent;
+	    if (last_wrap_pos == 0) {
+	      umlclass->operationsbox_height += (FontHeight - op->ascent);
+	    }
 
             maxwidth = MAX(width, maxwidth);
             last_wrap_pos = wrap_pos;
@@ -1490,15 +1488,11 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
         }
         else
         {
-          sublist = g_list_append( sublist, GINT_TO_POINTER( 0));
+	  op->needs_wrapping = FALSE;
         }
-        umlclass->operations_wrappos = g_list_append( umlclass->operations_wrappos, sublist);
       }
 
-      if( !umlclass->wrap_operations || !(length > umlclass->wrap_after_char)) {
-        DiaFont   *Font;
-        real       FontHeight;
-
+      if (!(umlclass->wrap_operations && length > umlclass->wrap_after_char)) {
         switch(op->inheritance_type)
         {
         case UML_ABSTRACT:
@@ -1532,7 +1526,8 @@ umlclass_calculate_operation_data(UMLClass *umlclass)
                                       umlclass->comment_font_height);
 
         g_free(Wrapped);
-        umlclass->operationsbox_height += (umlclass->comment_font_height * (NumberOfLines+1));
+        umlclass->operationsbox_height += 
+	  (umlclass->comment_font_height * (NumberOfLines+1));
 
         maxwidth = MAX(width, maxwidth);
       }
@@ -1568,21 +1563,10 @@ void
 umlclass_calculate_data(UMLClass *umlclass)
 {
   int    i;
-  int    pos_next_comma;
-  int    pos_brace;
-  int    wrap_pos;
-  int    last_wrap_pos;
-  int    ident;
-  int    offset;
-  int    maxlinewidth;
-  int    length;
   int    num_templates;
   real   maxwidth = 0.0;
   real   width;
   GList *list;
-  GList *sublist;
-  GList *wrapsublist;
-
 
   if (!umlclass->destroyed)
   {
@@ -1748,7 +1732,6 @@ umlclass_create(Point *startpoint,
   umlclass->formal_params = NULL;
   
   umlclass->stereotype_string = NULL;
-  umlclass->operations_wrappos = NULL;
   
   umlclass->text_color = color_black;
   umlclass->line_color = attributes_get_foreground();
@@ -1785,7 +1768,6 @@ umlclass_create(Point *startpoint,
 static void
 umlclass_destroy(UMLClass *umlclass)
 {
-  int i;
   GList *list;
   UMLAttribute *attr;
   UMLOperation *op;
@@ -1840,12 +1822,6 @@ umlclass_destroy(UMLClass *umlclass)
     g_free(umlclass->stereotype_string);
   }
 
-  if (umlclass->operations_wrappos != NULL) {
-    g_list_foreach(umlclass->operations_wrappos, (GFunc)g_list_free, NULL);
-    g_list_free(umlclass->operations_wrappos);
-    umlclass->operations_wrappos = NULL;
-  }
-
   if (umlclass->properties_dialog != NULL) {
     g_list_free(umlclass->properties_dialog->deleted_connections);
     gtk_widget_destroy(umlclass->properties_dialog->dialog);
@@ -1958,7 +1934,6 @@ umlclass_copy(UMLClass *umlclass)
   newumlclass->properties_dialog = NULL;
      
   newumlclass->stereotype_string = NULL;
-  newumlclass->operations_wrappos = NULL;
 
   for (i=0;i<UMLCLASS_CONNECTIONPOINTS;i++) {
     newobj->connections[i] = &newumlclass->connections[i];
@@ -2250,7 +2225,6 @@ static DiaObject *umlclass_load(ObjectNode obj_node, int version,
   fill_in_fontdata(umlclass);
   
   umlclass->stereotype_string = NULL;
-  umlclass->operations_wrappos = NULL;
 
   umlclass_calculate_data(umlclass);
 

--- a/objects/UML/class.h
+++ b/objects/UML/class.h
@@ -126,7 +126,8 @@ struct _UMLClass {
   real attributesbox_height;
 
   real operationsbox_height;
-  GList *operations_wrappos;
+/*
+  GList *operations_wrappos;*/
   int max_wrapped_line_width;
 
   real templates_height;

--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -350,6 +350,10 @@ constraint_update_data(Constraint *constraint)
     constraint->brtext = string_to_bracketted(constraint->text, "{", "}");
   }
   
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   obj->position = conn->endpoints[0];
 
   constraint->text_width = dia_font_string_width(constraint->brtext, 

--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -366,6 +366,10 @@ implements_update_data(Implements *implements)
                                                    implements_font,
                                                    IMPLEMENTS_FONTHEIGHT);
 
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   obj->position = conn->endpoints[0];
 
   implements->text_handle.pos = implements->text_pos;

--- a/objects/UML/message.c
+++ b/objects/UML/message.c
@@ -420,6 +420,10 @@ message_update_data(Message *message)
   DiaObject *obj = &conn->object;
   Rectangle rect;
   
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   obj->position = conn->endpoints[0];
 
   message->text_handle.pos = message->text_pos;

--- a/objects/UML/uml.h
+++ b/objects/UML/uml.h
@@ -92,8 +92,14 @@ struct _UMLOperation {
 
   ConnectionPoint* left_connection; /**< left */
   ConnectionPoint* right_connection; /**< right */
+
+  gboolean needs_wrapping; /** Whether this operation needs wrapping */
+  gint wrap_indent; /** The amount of indentation in chars */
+  GList *wrappos; /** Absolute wrapping positions */
+  real ascent; /** The ascent amount used for line distance in wrapping */
 };
 
+
 /** \brief A list of UMLParameter is contained in UMLOperation
  * Some would call them functions parameters ;)
  */

--- a/objects/UML/umloperation.c
+++ b/objects/UML/umloperation.c
@@ -108,15 +108,10 @@ uml_operation_new(void)
   op = g_new0(UMLOperation, 1);
   op->internal_id = next_id++;
   op->name = g_strdup("");
-  op->type = NULL;
-  op->stereotype = NULL;
   op->comment = g_strdup("");
   op->visibility = UML_PUBLIC;
-  op->class_scope = FALSE;
   op->inheritance_type = UML_LEAF;
-  op->query = FALSE;
 
-  op->parameters = NULL;
 #if 0 /* setup elsewhere */
   op->left_connection = g_new0(ConnectionPoint, 1);
   op->right_connection = g_new0(ConnectionPoint, 1);
@@ -238,6 +233,10 @@ uml_operation_destroy(UMLOperation *op)
     uml_parameter_destroy(param);
     list = g_list_next(list);
   }
+  if (op->wrappos) {
+    g_list_free(op->wrappos);
+  }
+
 #if 0 /* freed elsewhere */
   /* These are merely temporary reminders, don't need to unconnect */
   g_free(op->left_connection);

--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -445,7 +445,16 @@ bus_update_data(Bus *bus)
   Point *endpoints;
   real ulen;
   real min_par, max_par;
-  
+
+/*
+ * This seems to break stuff wildly.
+ */
+/*  
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
+*/
   endpoints = &conn->endpoints[0]; 
   obj->position = endpoints[0];
 

--- a/objects/network/wanlink.c
+++ b/objects/network/wanlink.c
@@ -380,6 +380,10 @@ wanlink_update_data(WanLink *wanlink)
   width = wanlink->width;
   width_2 = width / 2.0;
   
+  if (connpoint_is_autogap(conn->endpoint_handles[0].connected_to) ||
+      connpoint_is_autogap(conn->endpoint_handles[1].connected_to)) {
+    connection_adjust_for_autogap(conn);
+  }
   endpoints = &conn->endpoints[0]; 
   obj->position = endpoints[0];
 

--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -85,8 +85,7 @@ static void line_save(Line *line, ObjectNode obj_node, const char *filename);
 static DiaObject *line_load(ObjectNode obj_node, int version, const char *filename);
 static DiaMenu *line_get_object_menu(Line *line, Point *clickedpoint);
 
-void line_adjust_for_autogap(Line *line);
-void line_adjust_for_absolute_gap(Line *line, Point *gap_endpoints);
+void Line_adjust_for_absolute_gap(Line *line, Point *gap_endpoints);
 
 static ObjectTypeOps line_type_ops =
 {
@@ -305,41 +304,6 @@ calculate_object_edge(Point *objmid, Point *end, DiaObject *obj)
 }
 
 
-/** Adjust line endings for autogap.  This function actually moves the
- * ends of the line, but only when the end is connected to 
- * a mainpoint.
- */
-void
-line_adjust_for_autogap(Line *line)
-{
-  Point endpoints[2];
-  ConnectionPoint *start_cp, *end_cp;
-
-  start_cp = line->connection.endpoint_handles[0].connected_to;
-  end_cp = line->connection.endpoint_handles[1].connected_to;
-
-  endpoints[0] = line->connection.endpoints[0];
-  endpoints[1] = line->connection.endpoints[1];
-
-  if (connpoint_is_autogap(start_cp)) {
-    endpoints[0] = start_cp->pos;
-  }
-  if (connpoint_is_autogap(end_cp)) {    
-    endpoints[1] = end_cp->pos;
-  }
-
-  if (connpoint_is_autogap(start_cp)) {
-    line->connection.endpoints[0] = calculate_object_edge(&endpoints[0],
-							  &endpoints[1],
-							  start_cp->object);
-  }
-  if (connpoint_is_autogap(end_cp)) {    
-    line->connection.endpoints[1] = calculate_object_edge(&endpoints[1],
-							  &endpoints[0],
-							  end_cp->object);
-  }
-}
-
 /** Calculate the absolute gap -- this gap is 'transient', in that
  * the actual end of the line is not moved, but it is made to look like
  * it is shorter.
@@ -560,7 +524,7 @@ line_update_data(Line *line)
 
   if (connpoint_is_autogap(line->connection.endpoint_handles[0].connected_to) ||
       connpoint_is_autogap(line->connection.endpoint_handles[1].connected_to)) {
-    line_adjust_for_autogap(line);
+    connection_adjust_for_autogap(line);
   }
   if (line->absolute_start_gap || line->absolute_end_gap ) {
     Point gap_endpoints[2];

--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -441,11 +441,17 @@ create_standard_group(GList *items, DiagramData *dia) {
 static Color
 fig_color(int color_index) 
 {
-    if (color_index == -1) 
+    if (color_index <= -1) 
         return color_black; /* Default color */
-    if (color_index < FIG_MAX_DEFAULT_COLORS) 
+    else if (color_index < FIG_MAX_DEFAULT_COLORS) 
         return fig_default_colors[color_index];
-    else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
+    else if (color_index < FIG_MAX_USER_COLORS) 
+	return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
+    else {
+	message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."),
+		      color_index);
+	return color_black;
+    }
 }
 
 static Color
@@ -563,23 +569,25 @@ fig_simple_properties(DiaObject *obj,
 static int
 fig_read_n_points(FILE *file, int n, Point **points) {
     int i;
-    Point *new_points;
-
-    new_points = (Point*)g_malloc(sizeof(Point)*n);
+    GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n);
 
     for (i = 0; i < n; i++) {
 	int x,y;
+	Point p;
 	if (fscanf(file, " %d %d ", &x, &y) != 2) {
 	    message_error(_("Error while reading %dth of %d points: %s\n"),
 			  i, n, strerror(errno));
-	    g_free(new_points);
+	    g_array_free(points, TRUE);
 	    return FALSE;
 	}
-	new_points[i].x = x/FIG_UNIT;
-	new_points[i].y = y/FIG_UNIT;
+	p.x = x/FIG_UNIT;
+	p.y = y/FIG_UNIT;
+	g_array_append_val(points_list, p);
     }
     fscanf(file, "\n");
-    *points = new_points;
+    
+    *points = (Point *)points_list->data;
+    g_array_free(points, FALSE);
     return TRUE;
 }
 
@@ -698,6 +706,26 @@ static GSList *compound_stack = NULL;
    level.  Best we can do now. */
 static int compound_depth;
 
+/** Add an object at a given depth.  This function checks for depth limits
+ * and updates the compound depth if needed.
+ *
+ * @param newobj An object to add.  If we're inside a compound, this
+ * doesn't really add the object.
+ * @param depth A depth as in the Fig format, max 999
+ */
+static void
+add_at_depth(DiaObject *newobj, int depth) {
+    if (depth < 0 || depth >= FIG_MAX_DEPTHS) {
+	message_error(_("Depth %d of of range, only 0-%d allowed.\n"),
+		      depth, FIG_MAX_DEPTHS-1);
+	depth = FIG_MAX_DEPTHS - 1;
+    }
+    if (compound_stack == NULL) 
+	depths[depth] = g_list_append(depths[depth], newobj);
+    else 
+	if (compound_depth > depth) compound_depth = depth;
+}
+
 static DiaObject *
 fig_read_ellipse(FILE *file, DiagramData *dia) {
     int sub_type;
@@ -758,10 +786,7 @@ fig_read_ellipse(FILE *file, DiagramData *dia) {
     /* Angle -- can't rotate yet */
 
     /* Depth field */
-    if (compound_stack == NULL)
-	depths[depth] = g_list_append(depths[depth], newobj);
-    else
-	if (compound_depth > depth) compound_depth = depth;
+    add_at_depth(newobj, depth);
 
     return newobj;
 }
@@ -896,10 +921,7 @@ fig_read_polyline(FILE *file, DiagramData *dia) {
     /* Cap style */
      
     /* Depth field */
-    if (compound_stack == NULL)
-	depths[depth] = g_list_append(depths[depth], newobj);
-    else
-	if (compound_depth > depth) compound_depth = depth;
+    add_at_depth(newobj, depth);
  exit:
     setlocale(LC_NUMERIC, old_locale);
     prop_list_free(props);
@@ -1125,10 +1147,7 @@ fig_read_spline(FILE *file, DiagramData *dia) {
     /* Cap style */
      
     /* Depth field */
-    if (compound_stack == NULL)
-	depths[depth] = g_list_append(depths[depth], newobj);
-    else
-	if (compound_depth > depth) compound_depth = depth;
+    add_at_depth(newobj, depth);
  exit:
     setlocale(LC_NUMERIC, old_locale);
     prop_list_free(props);
@@ -1219,10 +1238,7 @@ fig_read_arc(FILE *file, DiagramData *dia) {
     /* Cap style */
      
     /* Depth field */
-    if (compound_stack == NULL)
-	depths[depth] = g_list_append(depths[depth], newobj);
-    else
-	if (compound_depth > depth) compound_depth = depth;
+    add_at_depth(newobj, depth);
 
  exit:
     setlocale(LC_NUMERIC, old_locale);
@@ -1319,10 +1335,7 @@ fig_read_text(FILE *file, DiagramData *dia) {
     newobj->ops->set_props(newobj, props);
     
     /* Depth field */
-    if (compound_stack == NULL)
-	depths[depth] = g_list_append(depths[depth], newobj);
-    else
-	if (compound_depth > depth) compound_depth = depth;
+    add_at_depth(newobj, depth);
 
  exit:
     setlocale(LC_NUMERIC, old_locale);
@@ -1369,6 +1382,12 @@ fig_read_object(FILE *file, DiagramData *dia) {
 	    return FALSE;
 	}
 
+	if (colornumber < 0 || colornumber > FIG_MAX_USER_COLORS) {
+	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
+			  colornumber, FIG_MAX_USER_COLORS);
+	    return FALSE;
+	}
+
 	color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0;
 	color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0;
 	color.blue = (colorvalues & 0x000000ff) / 255.0;
@@ -1415,7 +1434,7 @@ fig_read_object(FILE *file, DiagramData *dia) {
 	}
 	/* Group extends don't really matter */
 	if (compound_stack == NULL)
-	    compound_depth = 999;
+	    compound_depth = FIG_MAX_DEPTHS - 1;
 	compound_stack = g_slist_append(compound_stack, NULL);
 	return TRUE;
 	break;
@@ -1577,7 +1596,7 @@ import_fig(const gchar *filename, DiagramData *dia, void* user_data) {
     for (i = 0; i < FIG_MAX_USER_COLORS; i++) {
 	fig_colors[i] = color_black;
     }
-    for (i = 0; i < 1000; i++) {
+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
 	depths[i] = NULL;
     }
 
@@ -1633,7 +1652,7 @@ import_fig(const gchar *filename, DiagramData *dia, void* user_data) {
     } while (TRUE);
 
     /* Now we can reorder for the depth fields */
-    for (i = 0; i < 1000; i++) {
+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
 	if (depths[i] != NULL)
 	    layer_add_objects_first(dia->active_layer, depths[i]);
     }

--- a/plug-ins/xfig/xfig.h
+++ b/plug-ins/xfig/xfig.h
@@ -6,6 +6,7 @@ extern char *fig_fonts[];
 
 #define FIG_MAX_DEFAULT_COLORS 32
 #define FIG_MAX_USER_COLORS 512
+#define FIG_MAX_DEPTHS 1000
 /* 1200 PPI */
 #define FIG_UNIT 472.440944881889763779527559055118
 /* 1/80 inch */