Commit f2cbfd8d authored by Lars Clausen's avatar Lars Clausen

Update to pre3: VDX v 0.8

svn path=/trunk/; revision=3595
parent 8d027874
2007-01-22 Lars Clausen <lars@raeder.dk>
* plug-ins/vdx/vdx-import.c:
* plug-ins/vdx/vdx-export.c:
* plug-ins/vdx/vdx-common.c:
* plug-ins/vdx/vdx-xml.c:
* plug-ins/vdx/vdx.[ch]:
* plug-ins/vdx/visio-types.h: Updated to version 0.8.
* NEWS:
* RELEASE-PROCESS:
* config.h.win32:
* doc/en/dia.xml:
* doc/pl/dia.xml:
* doc/eu/dia.xml:
* configure.in: Pre3
2007-01-21 Lars Clausen <lars@raeder.dk>
* installer/rpm/dia.spec:
......
dia-0.96-pre2: 21-Jan-2006
dia-0.96-pre3: 22-Jan-2007
* Third prerelease for 0.96. This one adds a new version (0.8) of the
VDX plugin for extended testing. More versions are coming up, but
extra testing is useful.
dia-0.96-pre2: 21-Jan-2007
* Second release candidate for 0.96. Main improvements:
......
......@@ -104,7 +104,7 @@ How to make a tarball
Script to update version:
find . -name configure.in -o -name config.h.win32 -o -name dia.xml | xargs sed -i 's/0\.95*/0.95-1/;'
find . -name configure.in -o -name config.h.win32 -o -name dia.xml | xargs sed -i 's/0\.96-pre[0-9]/0.96-pre3/;'
Issues to solve
---------------
......
......@@ -18,7 +18,7 @@
#undef LOCALEDIR /* needs to be calculated at runtime */
/* NOT: #define LOCALEDIR "../lib/locale" */
#define VERSION "0.96-pre2"
#define VERSION "0.96-pre3"
/*
* We are linking libxml as DLL with either msvc or mingw, but this
......
dnl Process this -*- autoconf -*- file with autoconf to produce a
dnl configure script.
AC_INIT(dia, 0.96-pre2, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
AC_INIT(dia, 0.96-pre3, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
AC_CONFIG_SRCDIR(app/diagram.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
......
......@@ -8,7 +8,7 @@
[
<!ENTITY VERSION "0.96-pre2">
<!ENTITY VERSION "0.96-pre3">
<!ENTITY INTRODUCTION SYSTEM "intro.xml">
......
......@@ -4,7 +4,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
<!ENTITY VERSION "0.96-pre2">
<!ENTITY VERSION "0.96-pre3">
<!ENTITY INTRODUCTION SYSTEM "intro.xml">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
<!ENTITY VERSION "0.96-pre2">
<!ENTITY VERSION "0.96-pre3">
<!ENTITY INTRODUCTION SYSTEM "intro.xml">
<!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
<!ENTITY CANVAS SYSTEM "usage-canvas.xml">
......
......@@ -2,7 +2,7 @@
/* Dia -- a diagram creation/manipulation program
*
* vdx-common.c: Visio XML import filter for dia
* Copyright (C) 2006 Ian Redfern
* Copyright (C) 2006-2007 Ian Redfern
*
* 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
......@@ -29,18 +29,24 @@ char * vdx_Units[] =
{
"BOOL",
"CM",
"COLOR",
"DA",
"DATE",
"DEG",
"DL",
"DP",
"DT",
"FT",
"F_I",
"GUID",
"IN",
"IN_F",
"M",
"MM",
"NUM",
"NURBS",
"PNT",
"POLYLINE",
"PT",
"STR",
NULL
......@@ -51,9 +57,6 @@ char * vdx_Types[] =
"Act",
"Align",
"ArcTo",
"BegTrigger",
"BeginX",
"BeginY",
"Char",
"ColorEntry",
"Colors",
......@@ -69,10 +72,7 @@ char * vdx_Types[] =
"DocumentSheet",
"Ellipse",
"EllipticalArcTo",
"EndX",
"EndY",
"Event",
"EventDblClick",
"EventItem",
"EventList",
"FaceName",
......@@ -98,16 +98,15 @@ char * vdx_Types[] =
"Line",
"LineTo",
"Master",
"Menu",
"Misc",
"MoveTo",
"NURBSTo",
"NameUniv",
"Page",
"PageLayout",
"PageProps",
"PageSheet",
"Para",
"PolylineTo",
"PreviewPicture",
"PrintProps",
"PrintSetup",
......
......@@ -3,7 +3,7 @@
* Copyright (C) 1998 Alexander Larsson
*
* vdx-export.c: Visio XML export filter for dia
* Copyright (C) 2006 Ian Redfern
* Copyright (C) 2006-2007 Ian Redfern
* based on the xfig filter code
* Copyright (C) 2001 Lars Clausen
* based on the dxf filter code
......
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
* Copyright (C) 1998 Alexander Larsson
*
* vdx.c: Visio XML import filter for dia
* Copyright (C) 2006 Ian Redfern
* Copyright (C) 2006-2007 Ian Redfern
* based on the xfig filter code
* Copyright (C) 2001 Lars Clausen
* based on the dxf filter code
......
......@@ -3,7 +3,7 @@
* Copyright (C) 1998 Alexander Larsson
*
* vdx.h: Visio XML import and export filter for dia
* Copyright (C) 2006 Ian Redfern
* Copyright (C) 2006-2007 Ian Redfern
* based on the xfig filter code
* Copyright (C) 2001 Lars Clausen
* based on the dxf filter code
......@@ -41,6 +41,9 @@ struct VDXDocument
gboolean stop; /* Flag for whether to stop processing */
unsigned int Page; /* Page number */
unsigned int Background_Layers; /* Number to add when flattening */
gboolean debug_comments; /* Flag for g_debug() output */
unsigned int *debug_shape_ids; /* List to colour in */
unsigned int shape_id; /* For debugging */
};
typedef struct VDXDocument VDXDocument;
......@@ -53,11 +56,23 @@ static const double vdx_Y_Flip = -1.0; /* Upside down */
static const double vdx_Point_Scale = 2.54; /* Visio is in inches, Dia in cm */
static const double vdx_Line_Scale = 2.54; /* Visio is in inches, Dia in cm */
static const double vdx_Page_Width = 35.0; /* in cm */
static const double vdx_Arrow_Scale = 0.15; /* Empirical */
static const double vdx_Arrow_Scale = 0.13; /* Empirical */
static const double vdx_Dash_Length = 0.17; /* Empirical */
static const double EPSILON = 0.01; /* Sensitivity */
static const double EPSILON = 0.0001; /* Sensitivity */
static const double vdx_Arrow_Sizes[] =
{ 0.75, 1.0, 1.4, 1.6, 1.8, 2.0 }; /* Empirical */
static const double vdx_Arrow_Width_Height_Ratio = 0.7; /* Empirical */
static const ArrowType vdx_Arrows[] = { ARROW_NONE,
ARROW_LINES, ARROW_FILLED_TRIANGLE,
ARROW_FILLED_TRIANGLE, ARROW_FILLED_TRIANGLE,
ARROW_FILLED_CONCAVE, ARROW_FILLED_TRIANGLE,
ARROW_FILLED_TRIANGLE, ARROW_FILLED_TRIANGLE,
ARROW_SLASH_ARROW, ARROW_FILLED_ELLIPSE,
ARROW_FILLED_DIAMOND, ARROW_FILLED_TRIANGLE,
ARROW_FILLED_TRIANGLE, ARROW_HOLLOW_TRIANGLE,
ARROW_HOLLOW_TRIANGLE, ARROW_FILLED_TRIANGLE
};
#define VDX_NAMEU_LEN 30
#define DEG_TO_RAD M_PI/180.0 /* Degrees to radians */
......@@ -76,5 +91,7 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p);
const char *
vdx_convert_xml_string(const char *s);
char *
tempnam(const char *dir, const char *pfx);
#endif
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment