[SCM] Professional CAD system branch, master, updated. debian/2.0.5.0-1+090318-9-5-g1b227d9
Scott Howard
showard at debian.org
Wed Oct 12 13:40:43 UTC 2011
The following commit has been merged in the master branch:
commit 1b227d98b11485bf4a3600e9a4215c70d68682b6
Author: Scott Howard <showard at debian.org>
Date: Wed Oct 12 09:37:51 2011 -0400
qcad -> librecad
diff --git a/debian/NEWS b/debian/NEWS
index 5d4fb86..74c4c06 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,25 +1,19 @@
-qcad-data and qcad-doc have been removed from Debian:
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644786
-The QCad documentation, patterns, and fonts are non-free. The package is
- functional without documentation, but loses appeal without fonts
- or patterns. The LibreCAD package has free (GPL2) fonts and is working
- on free documentation.
-
-
-
-
-
-Also, QCad will be removed from Debian before wheezy:
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604595
-QCad depends on qt3 libraries, which are no longer maintained in Debian.
- QCad will be superseded by LibreCAD ("librecad" in Debian), the qt4
- community fork of QCad
-
-At that point, qcad will become a transitional package for librecad, the qt4
- community fork of QCad.
-
---Scott Howard <showard at debian.org> 11/11/11
-
-
+qcad (2.0.5.0-1+090318.1-1) unstable; urgency=high
+
+ qcad has been removed from Debian:
+ .
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644786
+ The QCad documentation, patterns, and fonts are non-free. The package is
+ functional without documentation, but loses appeal without fonts
+ or patterns. The LibreCAD package has free (GPL2) fonts and is working
+ on free documentation.
+ .
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604595
+ QCad depends on qt3 libraries, which are no longer maintained in Debian.
+ QCad will be superseded by LibreCAD ("librecad" in Debian), the qt4
+ community fork of QCad
+ .
+ qcad will become a transitional package for librecad, the qt4
+ community fork of QCad.
+
+ -- Scott Howard <showard at debian.org> Wed, 12 Oct 2011 09:36:44 -0400
diff --git a/debian/NEWS2 b/debian/NEWS2
new file mode 100644
index 0000000..8315d07
--- /dev/null
+++ b/debian/NEWS2
@@ -0,0 +1,19 @@
+qcad (2.0.5.0-1+090318.1-1) natty; urgency=high
+
+ qcad has been removed from Debian:
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644786
+ The QCad documentation, patterns, and fonts are non-free. The package is
+ functional without documentation, but loses appeal without fonts
+ or patterns. The LibreCAD package has free (GPL2) fonts and is working
+ on free documentation.
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604595
+ QCad depends on qt3 libraries, which are no longer maintained in Debian.
+ QCad will be superseded by LibreCAD ("librecad" in Debian), the qt4
+ community fork of QCad
+
+ qcad will become a transitional package for librecad, the qt4
+ community fork of QCad.
+
+-- Scott Howard <showard at debian.org> Wed, 12 Oct 2011 09:30:28 -0400
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index d43206e..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-RibbonSoft's community edition of QCad has been
-stalled for years (they are still working on their non-free version).
-A fork called qcad-free was started by Jani Frilander, including many
-bugfixes, polyline support, and additional arc modes.
-http://sites.google.com/site/qcadfree/
diff --git a/debian/changelog b/debian/changelog
index c0af790..514d139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-qcad (2.0.5.0-1+090318-10) unstable; urgency=high
+qcad (2.0.5.0-1+090318.1-1) unstable; urgency=high
+
+ * Made qcad a transitional package recommending librecad
+ because of non-distributable files (Closes: #644786) and the removal
+ of qt3-free from the archives (Closes: #604595)
+
+ -- Scott Howard <showard at debian.org> Wed, 12 Oct 2011 09:22:12 -0400
+
+qcad (2.0.5.0-1+090318-10) UNRELEASED; urgency=high
* updated debian copyright to include license for fparser and
dxflib test code. Thanks to Christoph Egger.
- * Removed non-distributable documentation, fonts, and patterns
- (Closes: #644786).
-- Scott Howard <showard at debian.org> Tue, 11 Oct 2011 18:19:52 -0400
diff --git a/debian/control b/debian/control
index fb3b588..a4e5b83 100644
--- a/debian/control
+++ b/debian/control
@@ -2,34 +2,18 @@ Source: qcad
Section: graphics
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Scott Howard <showard314 at gmail.com>, Ruben Molina <rmolina at udea.edu.co>
-Build-Depends: debhelper (>= 7.0.50~), automake,
- libqt3-mt-dev, libqt3-headers, qt3-dev-tools, qt3-apps-dev
-Standards-Version: 3.9.1
-Homepage: http://www.ribbonsoft.com/qcad.html
-DM-Upload-Allowed: yes
-Vcs-Git: git://git.debian.org/git/debian-science/packages/qcad.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/qcad.git
+Uploaders: Scott Howard <showard at debian.org>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.2
Package: qcad
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: cups-client, qcad-data (>= ${source:Version})
-Description: professional CAD system
- QCAD is an application for computer aided drafting (CAD) in two
- dimensions (2D). With QCAD you can create technical drawings such as
- plans for buildings, interiors, mechanical parts or schemas and
- diagrams.
-
-Package: qcad-data
-Section: doc
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: qcad (<< ${source:Version})
-Description: professional CAD system -- shared files
- QCAD is an application for computer aided drafting (CAD) in two
- dimensions (2D).
+Depends: ${misc:Depends}
+Recommends: librecad
+Description: Transitional package for QCad to LibreCAD
+ QCad has been removed from wheezy for depending on qt3 and containing non-
+ distributable fonts, patterns, libraries, and documentation.
.
- This package contains plataform independent files for QCAD, including
- interface translations.
+ LibreCAD is the community-maintained qt4 port of QCad and has superseded Qcad
+ in Debian as the package "librecad".
diff --git a/debian/copyright b/debian/copyright
index 5a4c591..560be7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,140 +1,9 @@
-This work was packaged for Debian by:
-
- Ruben Molina <rmolina at udea.edu.co> on Thu, 29 Oct 2009 10:07:25 -0500
-
-It was downloaded from:
-
- http://sites.google.com/site/qcadfree/
-
-Upstream Authors:
-
- Andrew Mustun <andrew at ribbonsoft.com>
- Jani Frilander <j.frilander at gmail.com>
-
-Copyright:
-
- Copyright (C) 2001-2003 RibbonSoft.
+Format: http://dep.debian.net/deps/dep5/
+Files: *
+Copyright: 2011, Scott Howard <showard at debian.org>
License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: ./dxflib/test/test_creationclass.h, ./dxflib/test/main.cpp, ./dxflib/test/test_creationclass.cpp
-Copyright: 2001, Andrew Mustun <andrew at ribbonsoft.com>
-License: LGPL
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation.
-
- 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 Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
- On Debian systems, the complete text of the GNU Library General Public License
- version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-Files: fparser/*
-Copyright: 2003, Juha Nieminen
- 2003, Joel Yliluoma <warp at iki.fi>
-License: other
- 1. This library is free for non-commercial usage. You can do whatever you
- like with it as long as you don't claim you made it yourself.
-
- 2. It is possible to use this library in a commercial program, but in this
- case you MUST contact me first (warp at iki.fi) and ask express permission
- for this. I want to know what type of program it is going to be, its
- price and so on.
- If you are making a free program or a shareware program with just a
- nominal price (5 US dollars or less), you don't have to ask for
- permission.
- In any case, I DON'T WANT MONEY for the usage of this library. It is
- free, period.
-
- 3. You can make any modifications you want to it so that it conforms your
- needs. If you make modifications to it, you have, of course, credits for
- the modified parts.
-
- 4. If you use this library in your own program, you don't have to provide
- the source code if you don't want to (ie. the source code of your program
- or this library).
- If you DO include the source code for this library, this text file
- must be included in its original intact form.
-
- 5. If you distribute a program which uses this library, and specially if you
- provide the source code, proper credits MUST be included. Trying to
- obfuscate the fact that this library is not made by you or that it is
- free is expressly prohibited. When crediting the usage of this library,
- it's enough to include my name and email address, that is:
- "Juha Nieminen (warp at iki.fi)". Also a URL to the library download page
- would be nice, although not required. The official URL is:
- http://iki.fi/warp/FunctionParser/
-
- 6. And the necessary "lawyer stuff":
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- The software is provided "as is", without warranty of any kind,
- express or implied, including but not limited to the warranties of
- merchantability, fitness for a particular purpose and noninfringement.
- In no event shall the authors or copyright holders be liable for any
- claim, damages or other liability, whether in an action of contract,
- tort or otherwise, arising from, out of or in connection with the
- software or the use or other dealings in the software.
-
-
-The Debian packaging is:
-
- Copyright (C) 2009 Ruben Molina <rmolina at udea.edu.co>
-
-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.
-
-./dxflib/test/test_creationclass.cpp:
- Copyright (C) 2001 Andrew Mustun
- Licensed under the GPL version 2, see above.
-
-./qcadlib/src/gui/rs_staticgraphicview.cpp are:
- Copyright (C) 2001 Andrew Mustun
- Licensed under the GPL version 2, see above.
-
-./dxflib/test/main.cpp is:
- Copyright (C) 2000-2001 Andrew Mustun
- Licensed under the GPL version 2, see above.
-
-./dxflib/src/dl_writer_ascii.cpp is:
- Copyright (C) 2001-2003 RibbonSoft.
- Copyright (C) 2001 Robert J. Campbell Jr.
- Licensed under the GPL version 2, see above.
-
-./qcadactions/src/rs_actiondrawpolyline.cpp is:
- Copyright (C) 2001-2003 RibbonSoft.
- Copyright (C) 2009 Jani Frilander.
- Licensed under the GPL version 2, see above.
-
-./qcadlib/src/scripting/rs_python_wrappers.cpp is:
- Copyright (C) 2003 Markus Meyer <meyer at mesw.de>
- Permission to copy, use, modify, sell and distribute this file is
- granted provided this copyright notice is not removed or altered.
- This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
+ Copying and distribution of this package, with or without
+ modification, are permitted in any medium without royalty
+ provided the copyright notice and this notice are
+ preserved.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 5cad07c..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.qcad-free
diff --git a/debian/patches/add-hint-about-qcad-doc.patch b/debian/patches/add-hint-about-qcad-doc.patch
deleted file mode 100644
index d8072f1..0000000
--- a/debian/patches/add-hint-about-qcad-doc.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: If launching the manual fails, print a hint to the qcad-doc
-Bug-Debian: http://bugs.debian.org/315867
-Author: Andreas Fester <Andreas.Fester at gmx.de>
---- qcad-free-dev.orig/qcad/src/qc_applicationwindow.cpp
-+++ qcad-free-dev/qcad/src/qc_applicationwindow.cpp
-@@ -117,6 +117,7 @@
-
- appWindow = this;
- assistant = NULL;
-+ qcadDocHint = false;
- workspace = NULL;
-
- RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: setting icon");
-@@ -1655,6 +1656,20 @@
- }
-
-
-+/**
-+ * Shows the given error which was caused by the QAssistantClient
-+ * on the command line.
-+ */
-+void QC_ApplicationWindow::slotAssistantError(const QString& msg) {
-+ QString message = msg;
-+ if (!qcadDocHint) {
-+ message += " (Package qcad-doc installed?)";
-+ qcadDocHint = true;
-+ }
-+ commandWidget->appendHistory(message);
-+}
-+
-+
-
- /**
- * Hands focus back to the application window. In the rare event
-@@ -2948,7 +2963,7 @@
- RS_SYSTEM->getAppDir().latin1());
- assistant = new QAssistantClient(QString::null, this);
- connect(assistant, SIGNAL(error(const QString&)),
-- this, SLOT(slotError(const QString&)));
-+ this, SLOT(slotAssistantError(const QString&)));
- QStringList args;
- args << "-profile";
- args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
-@@ -2958,6 +2973,7 @@
- assistant->setArguments(args);
- #endif
- }
-+ qcadDocHint = false;
- assistant->openAssistant();
- //assistant->showPage("index.html");
- }
---- qcad-free-dev.orig/qcad/src/qc_applicationwindow.h
-+++ qcad-free-dev/qcad/src/qc_applicationwindow.h
-@@ -122,6 +122,7 @@
- void slotEnter();
- void slotFocusCommandLine();
- void slotError(const QString& msg);
-+ void slotAssistantError(const QString& msg);
-
- void slotWindowActivated(QWidget* w);
- void slotWindowsMenuAboutToShow();
-@@ -456,6 +457,9 @@
- QAction *testResize800;
- QAction *testResize1024;
-
-+ // flag to print the hint for the qcad-doc package once
-+ // for each QAssistentClient call
-+ bool qcadDocHint;
- };
-
-
diff --git a/debian/patches/autosave.patch b/debian/patches/autosave.patch
deleted file mode 100644
index 988ff50..0000000
--- a/debian/patches/autosave.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-Description: enables autosave The autosave implementation doesn't clobber
- the original user file but prepends a "#" to the filename part. Upon a
- successful save of the user file, the autosave file will be deleted.
-Origin: http://tech.groups.yahoo.com/group/qcad-user/message/1838
-Bug: 94629
-
-Index: qcad/qcad/src/qc_applicationwindow.cpp
-===================================================================
---- qcad.orig/qcad/src/qc_applicationwindow.cpp 2010-11-03 00:22:48.000000000 -0400
-+++ qcad/qcad/src/qc_applicationwindow.cpp 2010-11-03 00:23:25.188938171 -0400
-@@ -163,6 +163,11 @@
- RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init MDI");
- initMDI();
-
-+ // Activate autosave timer
-+ autosaveTimer = new QTimer(this, "autosave");
-+ connect(autosaveTimer, SIGNAL(timeout()), this, SLOT(slotFileAutoSave()));
-+ autosaveTimer->start(autosaveTime);
-+
- // Disable menu and toolbar items
- emit windowsChanged(FALSE);
-
-@@ -2151,6 +2156,9 @@
- name = w->getDocument()->getFilename();
- recentFiles->add(name);
- w->setCaption(name);
-+ if (!autosaveTimer->isActive()) {
-+ autosaveTimer->start(autosaveTime);
-+ }
- }
- } else {
- // error
-@@ -2169,6 +2177,37 @@
- }
-
-
-+
-+/**
-+ * Autosave.
-+ */
-+void QC_ApplicationWindow::slotFileAutoSave() {
-+ RS_DEBUG->print("QC_ApplicationWindow::slotFileAutoSave()");
-+
-+ statusBar()->message(tr("Auto-saving drawing..."));
-+
-+ QC_MDIWindow* w = getMDIWindow();
-+ QString name;
-+ if (w!=NULL) {
-+ bool cancelled;
-+ if (w->slotFileSave(cancelled, true)) {
-+ // auto-save cannot be cancelled by user, so the
-+ // "cancelled" parameter is a dummy
-+ statusBar()->message(tr("Auto-saved drawing"), 2000);
-+ } else {
-+ // error
-+ autosaveTimer->stop();
-+ QMessageBox::information(this, QMessageBox::tr("Warning"),
-+ tr("Cannot auto-save the file\n%1\nPlease "
-+ "check the permissions.\n"
-+ "Auto-save disabled.")
-+ .arg(w->getDocument()->getAutoSaveFilename()),
-+ QMessageBox::Ok);
-+ }
-+ }
-+}
-+
-+
-
- /**
- * Menu file -> export.
-Index: qcad/qcad/src/qc_applicationwindow.h
-===================================================================
---- qcad.orig/qcad/src/qc_applicationwindow.h 2010-11-03 00:22:48.000000000 -0400
-+++ qcad/qcad/src/qc_applicationwindow.h 2010-11-03 00:24:52.828025775 -0400
-@@ -37,6 +37,7 @@
- #include <qsplitter.h>
- #include <qstatusbar.h>
- #include <qtable.h>
-+#include <qtimer.h>
- #include <qtoolbar.h>
- #include <qtoolbutton.h>
- #include <qwhatsthis.h>
-@@ -149,6 +150,8 @@
- void slotFileSave();
- /** saves a document under a different filename*/
- void slotFileSaveAs();
-+ /** auto-save document */
-+ void slotFileAutoSave();
- /** exports the document as bitmap */
- void slotFileExport();
- bool slotFileExport(const QString& name, const QString& format,
-@@ -457,6 +460,10 @@
- QAction *testResize800;
- QAction *testResize1024;
-
-+ QTimer *autosaveTimer;
-+
-+ const static int autosaveTime = 60 * 1000; // 1 minute
-+
- // flag to print the hint for the qcad-doc package once
- // for each QAssistentClient call
- bool qcadDocHint;
-Index: qcad/qcad/src/qc_mdiwindow.cpp
-===================================================================
---- qcad.orig/qcad/src/qc_mdiwindow.cpp 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcad/src/qc_mdiwindow.cpp 2010-11-03 00:27:59.139724105 -0400
-@@ -324,23 +324,32 @@
- /**
- * Saves the current file.
- *
-+ * @param isAutoSave true if this is an "autosave" operation.
-+ * false if this is "Save" operation requested
-+ * by the user.
- * @return true if the file was saved successfully.
- * false if the file could not be saved or the document
- * is invalid.
- */
--bool QC_MDIWindow::slotFileSave(bool &cancelled) {
-+bool QC_MDIWindow::slotFileSave(bool &cancelled, bool isAutoSave) {
- RS_DEBUG->print("QC_MDIWindow::slotFileSave()");
- bool ret = false;
- cancelled = false;
-
- if (document!=NULL) {
-- if (document->getFilename().isEmpty()) {
-- ret = slotFileSaveAs(cancelled);
-+ if (isAutoSave) {
-+ // Autosave filename is always supposed to be present.
-+ // Autosave does not change the cursor.
-+ ret = document->save(true);
- } else {
-- QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) );
-- ret = document->save();
-- QApplication::restoreOverrideCursor();
-- }
-+ if (document->getFilename().isEmpty()) {
-+ ret = slotFileSaveAs(cancelled);
-+ } else {
-+ QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) );
-+ ret = document->save();
-+ QApplication::restoreOverrideCursor();
-+ }
-+ }
- }
-
- return ret;
-Index: qcad/qcad/src/qc_mdiwindow.h
-===================================================================
---- qcad.orig/qcad/src/qc_mdiwindow.h 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcad/src/qc_mdiwindow.h 2010-11-03 00:23:25.188938171 -0400
-@@ -69,7 +69,7 @@
-
- void slotFileNew();
- bool slotFileOpen(const QString& fileName, RS2::FormatType type);
-- bool slotFileSave(bool &cancelled);
-+ bool slotFileSave(bool &cancelled, bool isAutoSave=false);
- bool slotFileSaveAs(bool &cancelled);
- bool slotFileClose(bool force);
- void slotFilePrint();
-Index: qcad/qcadlib/src/engine/rs_block.cpp
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_block.cpp 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_block.cpp 2010-11-03 00:23:25.188938171 -0400
-@@ -78,10 +78,10 @@
- }
-
-
--bool RS_Block::save() {
-+bool RS_Block::save(bool isAutoSave) {
- RS_Graphic* g = getGraphic();
- if (g!=NULL) {
-- return g->save();
-+ return g->save(isAutoSave);
- } else {
- return false;
- }
-Index: qcad/qcadlib/src/engine/rs_block.h
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_block.h 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_block.h 2010-11-03 00:23:25.188938171 -0400
-@@ -128,7 +128,7 @@
- /**
- * Reimplementation from RS_Document. Saves the parent graphic document.
- */
-- virtual bool save();
-+ virtual bool save(bool isAutoSave = false);
-
- /**
- * Reimplementation from RS_Document. Does nothing.
-Index: qcad/qcadlib/src/engine/rs_document.cpp
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_document.cpp 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_document.cpp 2010-11-03 00:23:25.188938171 -0400
-@@ -40,6 +40,7 @@
- RS_DEBUG->print("RS_Document::RS_Document() ");
-
- filename = "";
-+ autosaveFilename = "Unnamed";
- formatType = RS2::FormatUnknown;
- setModified(false);
- RS_Color col(RS2::FlagByLayer);
-Index: qcad/qcadlib/src/engine/rs_document.h
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_document.h 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_document.h 2010-11-03 00:23:25.188938171 -0400
-@@ -53,7 +53,7 @@
- virtual RS_BlockList* getBlockList() = 0;
-
- virtual void newDoc() = 0;
-- virtual bool save() = 0;
-+ virtual bool save(bool isAutoSave = false) = 0;
- virtual bool saveAs(const RS_String &filename, RS2::FormatType type) = 0;
- virtual bool open(const RS_String &filename, RS2::FormatType type) = 0;
-
-@@ -98,6 +98,13 @@
- }
-
- /**
-+ * @return Auto-save file name of the document currently loaded.
-+ */
-+ RS_String getAutoSaveFilename() const {
-+ return autosaveFilename;
-+ }
-+
-+ /**
- * Sets file name for the document currently loaded.
- */
- void setFilename(const RS_String& fn) {
-@@ -136,6 +143,8 @@
- RS_Pen activePen;
- /** File name of the document or empty for a new document. */
- RS_String filename;
-+ /** Auto-save file name of document. */
-+ RS_String autosaveFilename;
- /** Format type */
- RS2::FormatType formatType;
- };
-Index: qcad/qcadlib/src/engine/rs_graphic.cpp
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_graphic.cpp 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_graphic.cpp 2010-11-03 00:23:25.188938171 -0400
-@@ -24,6 +24,8 @@
- **
- **********************************************************************/
-
-+#include <qfile.h>
-+#include <qfileinfo.h>
-
- #include "rs_graphic.h"
-
-@@ -178,21 +180,46 @@
- /**
- * Saves this graphic with the current filename and settings.
- */
--bool RS_Graphic::save() {
-+bool RS_Graphic::save(bool isAutoSave) {
-
- bool ret = false;
-+
-
- RS_DEBUG->print("RS_Graphic::save");
-- RS_DEBUG->print(" file: %s", filename.latin1());
-- RS_DEBUG->print(" format: %d", (int)formatType);
--
-- RS_DEBUG->print(" export...");
-- ret = RS_FILEIO->fileExport(*this, filename, formatType);
--
-- if (ret) {
-- setModified(false);
-- layerList.setModified(false);
-- blockList.setModified(false);
-+ if (isAutoSave && !isModified()) {
-+ RS_DEBUG->print(" autsave and not modified => not saved");
-+ ret = true;
-+ } else {
-+ const RS_String *actualName;
-+ RS2::FormatType actualType;
-+
-+ actualType = formatType;
-+ if (isAutoSave) {
-+ actualName = new QString(autosaveFilename);
-+ if (formatType == RS2::FormatUnknown) {
-+ actualType = RS2::FormatDXF;
-+ }
-+ } else {
-+ actualName = new QString(filename);
-+ }
-+ RS_DEBUG->print(" file: %s", actualName->latin1());
-+ RS_DEBUG->print(" format: %d", (int)actualType);
-+ RS_DEBUG->print(" export...");
-+ ret = RS_FILEIO->fileExport(*this, *actualName, actualType);
-+ delete actualName;
-+
-+ if (ret && !isAutoSave) {
-+ setModified(false);
-+ layerList.setModified(false);
-+ blockList.setModified(false);
-+ // Remove old autosave file
-+ QFile f(autosaveFilename);
-+ if (f.exists()) {
-+ RS_DEBUG->print(" removing old autosave file %s",
-+ autosaveFilename.latin1());
-+ f.remove();
-+ }
-+ }
- }
-
- RS_DEBUG->print("RS_Graphic::save ok");
-@@ -210,9 +237,28 @@
- RS_DEBUG->print("RS_Graphic::saveAs");
-
- this->filename = filename;
-+ RS_String *oldAutosaveName = new RS_String(autosaveFilename);
-+ QFileInfo finfo(filename);
-+ // Construct new autosave filename by prepending # to the filename
-+ // part, using the same directory as the destination file.
-+ this->autosaveFilename = finfo.dirPath() + "/#" + finfo.fileName();
- this->formatType = type;
-
-- return save();
-+ bool ret = save();
-+
-+ if (ret) {
-+ // save was successful, remove old autosave file
-+ QFile f(*oldAutosaveName);
-+ if (f.exists()) {
-+ RS_DEBUG->print("removing old autosave file %s",
-+ oldAutosaveName->latin1());
-+ f.remove();
-+ }
-+ }
-+
-+ delete oldAutosaveName;
-+
-+ return ret;
- }
-
-
-@@ -226,6 +272,10 @@
- bool ret = false;
-
- this->filename = filename;
-+ QFileInfo finfo(filename);
-+ // Construct new autosave filename by prepending # to the filename
-+ // part, using the same directory as the destination file.
-+ this->autosaveFilename = finfo.dirPath() + "/#" + finfo.fileName();
-
- // clean all:
- newDoc();
-Index: qcad/qcadlib/src/engine/rs_graphic.h
-===================================================================
---- qcad.orig/qcadlib/src/engine/rs_graphic.h 2010-10-18 19:35:31.000000000 -0400
-+++ qcad/qcadlib/src/engine/rs_graphic.h 2010-11-03 00:23:25.188938171 -0400
-@@ -69,7 +69,7 @@
- }
-
- virtual void newDoc();
-- virtual bool save();
-+ virtual bool save(bool isAutoSave = false);
- virtual bool saveAs(const RS_String& filename, RS2::FormatType type);
- virtual bool open(const RS_String& filename, RS2::FormatType type);
-
diff --git a/debian/patches/bug#234340.patch b/debian/patches/bug#234340.patch
deleted file mode 100644
index 9f8c7b6..0000000
--- a/debian/patches/bug#234340.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Initial setup dialog is broken in wmaker
-Bug-Debian: http://bugs.debian.org/234340
-Author: Andreas Fester <Andreas.Fester at gmx.de>
---- qcad-2.0.5.0-1+090318.orig/qcadguiqt/src/ui/qg_dlginitial.ui
-+++ qcad-2.0.5.0-1+090318/qcadguiqt/src/ui/qg_dlginitial.ui
-@@ -9,7 +9,7 @@
- <x>0</x>
- <y>0</y>
- <width>413</width>
-- <height>287</height>
-+ <height>340</height>
- </rect>
- </property>
- <property name="caption">
diff --git a/debian/patches/bug#370464.patch b/debian/patches/bug#370464.patch
deleted file mode 100644
index 5919608..0000000
--- a/debian/patches/bug#370464.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix html documentation using html entities when needed
- qcad/doc/construction_ellipse.html uses some "less than" signs without using
- html entities to represent them so they break the rendering of the HTML file
-Bug-Debian: http://bugs.debian.org/370464
-Author: Timo Juhani Lindfors <timo.lindfors at iki.fi>
---- qcad-2.0.5.0-1+090318.orig/qcad/doc/construction_ellipse.html
-+++ qcad-2.0.5.0-1+090318/qcad/doc/construction_ellipse.html
-@@ -112,7 +112,7 @@
- <li>Define the major axis by clicking the endpoint of the axis, which is
- a point on the ellipse. You can also enter a co-ordinate into the command
- line or enter an angle and major radius in the format
-- <code>@50<30</code>
-+ <code>@50<30</code>
-
- where 50 is the major radius and 30 is the ellipse angle.</li>
-
-@@ -162,7 +162,7 @@
- <li>Define the major axis by clicking the endpoint of the axis, which is
- a point on the ellipse. You can also enter a co-ordinate into the command
- line or enter an angle and major radius in the format
-- <code>@50<30</code>
-+ <code>@50<30</code>
-
- where 50 is the major radius and 30 is the ellipse angle.</li>
-
diff --git a/debian/patches/build_qcad.sh.patch b/debian/patches/build_qcad.sh.patch
deleted file mode 100644
index 67381ec..0000000
--- a/debian/patches/build_qcad.sh.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Index: qcad/scripts/build_qcad.sh
-===================================================================
---- qcad.orig/scripts/build_qcad.sh 2010-07-19 01:39:17.000000000 +0200
-+++ qcad/scripts/build_qcad.sh 2010-07-19 01:48:42.000000000 +0200
-@@ -1,6 +1,9 @@
- #!/bin/bash
- # $Id: build_qcad.sh 2488 2005-07-20 08:33:25Z andrew $
-
-+# The build process shall start from this directory
-+root=$(dirname $0)/..
-+
- echo "build_qcad.sh"
- echo "Usage: ./build_qcad.sh [options]"
- echo "options:"
-@@ -150,7 +153,8 @@
-
- echo "QMAKE_OPT: $QMAKE_OPT"
-
--cd ..
-+cd "$root"
-+root=$(pwd)
-
- echo "-------- Building fparser --------"
- cd fparser
-@@ -159,7 +163,8 @@
- ./configure
- fi
- eval $MAKE
--cd ..
-+
-+cd "$root"
-
- if [ ! -f fparser/lib/libfparser.a ]
- then
-@@ -174,8 +179,8 @@
- ./configure
- fi
- eval $MAKE
--cd ..
-
-+cd "$root"
- if [ ! -f dxflib/lib/libdxf.a ]
- then
- echo "Building libdxf.a failed"
-@@ -205,8 +210,7 @@
- if [ -d $p ]
- then
- echo "-------- Building $p --------"
-- cd $p
-- cd src
-+ cd "$root"/$p/src
- qmake $p.pro $QMAKE_OPT
- if [ "x$platform" == "xwin32" ]
- then
-@@ -214,10 +218,11 @@
- sed "s/ \// \\\\/g" tmp2 > tmp3
- mv tmp3 Makefile
- fi
-- cd ..
-+
-+ cd "$root"/$p
- eval $MAKE
-- cd ..
-
-+ cd "$root"
- if [ ! -f $p/lib/*.a ]
- then
- echo "Building $p failed"
-@@ -227,8 +232,7 @@
- done
-
- echo "-------- Building QCad --------"
--cd qcad
--cd src
-+cd "$root"/qcad/src
- qmake qcad.pro $QMAKE_OPT
- if [ "x$platform" == "xwin32" ]
- then
-@@ -238,28 +242,27 @@
- sed "s/\/\"\"/\\\\\"\"/g" tmp2 > tmp3
- mv tmp3 Makefile
- fi
--cd ..
--
-
-+cd "$root"/qcad
- eval $MAKE
--cd ..
-
-+cd "$root"
- if [ -z $notrans ]
- then
- echo "-------- Building Translations --------"
-- cd scripts
-+ cd "$root"/scripts
- bash ./release_translations.sh
- fi
-
- if [ "x$platform" == "xosx" ]
- then
-- if [ ! -d ../qcad/$target.app ]
-+ if [ ! -d "$root"/qcad/$target.app ]
- then
- echo "Building qcad binary failed"
- exit;
- fi
- else
-- if [ ! -f ../qcad/$target ]
-+ if [ ! -f "$root"/qcad/$target ]
- then
- echo "Building qcad binary failed"
- exit;
-@@ -267,9 +270,9 @@
- fi
-
- # create mac .app folder:
--cd ./qcad
- if [ "x$platform" == "xosx" ]
- then
-+ cd "$root"/qcad
- if [ -d $target.app ]
- then
- echo Preparing Application Folder for $target
-@@ -305,6 +308,4 @@
- fi
- fi
-
--#cd scripts
--#bash ./release_translations.sh
-
diff --git a/debian/patches/create-about_txt.patch b/debian/patches/create-about_txt.patch
deleted file mode 100644
index 1cf45a7..0000000
--- a/debian/patches/create-about_txt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Add missing file about.txt
-Bug-Debian: http://bugs.debian.org/380221
-Author: Andreas Fester <Andreas.Fester at gmx.de>
-Index: qcad/qcad/doc/about.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ qcad/qcad/doc/about.txt 2010-07-18 17:27:52.000000000 +0200
-@@ -0,0 +1,4 @@
-+ QCad User Reference Manual
-+
-+Copyright 2003 RibbonSoft, Inc.
-+
diff --git a/debian/patches/define-debian-paths.patch b/debian/patches/define-debian-paths.patch
deleted file mode 100644
index 7cd3ebc..0000000
--- a/debian/patches/define-debian-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Adjust file and directory paths to the Debian environment
-Forwarded: not-needed
-Author: Andreas Fester <Andreas.Fester at gmx.de>
---- qcad-free-dev.orig/qcad/src/main.cpp
-+++ qcad-free-dev/qcad/src/main.cpp
-@@ -146,6 +146,13 @@
- unit = RS_SETTINGS->readEntry("/Unit", QC_PREDEFINED_UNIT);
- #endif
- RS_SETTINGS->endGroup();
-+ RS_SETTINGS->beginGroup("/Paths");
-+ RS_SETTINGS->writeEntry("/Translations", "/usr/share/qcad/qm");
-+ RS_SETTINGS->writeEntry("/Patterns", "/usr/share/qcad/patterns");
-+ RS_SETTINGS->writeEntry("/Fonts", "/usr/share/qcad/fonts");
-+ RS_SETTINGS->writeEntry("/Scripts", "/usr/share/qcad/scripts");
-+ RS_SETTINGS->writeEntry("/Library", "/usr/share/qcad/libraries");
-+ RS_SETTINGS->endGroup();
-
- // show initial config dialog:
- if (unit=="Invalid") {
diff --git a/debian/patches/help_security_of_build_scripts.patch b/debian/patches/help_security_of_build_scripts.patch
deleted file mode 100644
index fe6313c..0000000
--- a/debian/patches/help_security_of_build_scripts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: qcad/qcad/build.sh
-===================================================================
---- qcad.orig/qcad/build.sh 2010-07-18 18:12:42.000000000 +0200
-+++ qcad/qcad/build.sh 2010-07-18 18:16:52.000000000 +0200
-@@ -1,7 +1,6 @@
- #! /bin/sh
-
--rm debug_*.log
--rm debug_*.html
-+find . -name 'debug_*.log' -o -name 'debug_*.html' | xargs -r rm
-
- #export QTDIR=/usr/lib/qt3
- #export QTDIR=/opt/qt
-@@ -16,17 +15,17 @@
- start=`date`
-
- echo "--------------------------------------------------------------- dxflib"
--cd $base/dxflib
--make
-+make -C $base/dxflib
- #make install
-
- for pro in qcadlib qcadcmd qcadcam qcadactions qcadguiqt qcadscripting
- do
- echo "--------------------------------------------------------------- $pro"
-- cd $base/$pro/src
-- $QTDIR/bin/qmake ./$pro.pro -o ./Makefile
-- make staticlib
-- cd ..
-+ (
-+ cd $base/$pro/src ;
-+ $QTDIR/bin/qmake ./$pro.pro -o ./Makefile ;
-+ make staticlib
-+ )
- #make install
- done
-
diff --git a/debian/patches/invoke-release-translations-with-bash.patch b/debian/patches/invoke-release-translations-with-bash.patch
deleted file mode 100644
index c1cfc24..0000000
--- a/debian/patches/invoke-release-translations-with-bash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix invocation of a bash script
- release_translations.sh is declared as a bash script, it uses pushd and
- popd so it will fail if invoked from dash
-Author: Ruben Molina <rmolina at udea.edu.co>
---- qcad-free-dev.orig/scripts/build_qcad.sh
-+++ qcad-free-dev/scripts/build_qcad.sh
-@@ -248,7 +248,7 @@
- then
- echo "-------- Building Translations --------"
- cd scripts
-- sh ./release_translations.sh
-+ bash ./release_translations.sh
- fi
-
- if [ "x$platform" == "xosx" ]
diff --git a/debian/patches/qcad-2.0.5.0-latin2.patch b/debian/patches/qcad-2.0.5.0-latin2.patch
deleted file mode 100644
index 7c7d70b..0000000
--- a/debian/patches/qcad-2.0.5.0-latin2.patch
+++ /dev/null
@@ -1,1450 +0,0 @@
-Description: Can't type text with this ç,ã,õ,â,ô,á,é,í,ó,ú,à or ü.
-Origin: http://www.ribbonsoft.com/rsforum/viewtopic.php?t=853
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=507368
-
-Index: qcad/qcad/fonts/normallatin2.cxf
-===================================================================
---- qcad.orig/qcad/fonts/normallatin2.cxf 2010-07-17 19:15:29.993196190 -0400
-+++ qcad/qcad/fonts/normallatin2.cxf 2010-07-19 09:09:02.316956060 -0400
-@@ -1,65 +1,65 @@
- # Format: QCad II Font
- # Creator: QCad
--# Version: 1
-+# Version: 2.0.5.0
- # Name: Normal Latin 2
- # Encoding: ISO8859-2
--# LetterSpacing: 3.0
-+# LetterSpacing: 3
- # WordSpacing: 6.75
--# LineSpacingFactor: 1.0
-+# LineSpacingFactor: 1
- # Author: Hughes Jeangerard <hughes.jeangerard at laposte.net>
-
--[!] 2
-+[0021] !
- L 0,9,0,3
- L 0,0,0,0.5
-
--["] 2
-+[0022] "
- L 0.5,7,1,9
- L 3.5,7,4,9
-
--[#] 4
--L 1.999969,0,1.999969,8.999999
--L 4.999969,8.999999,4.999969,0
--L -0.000031,2.5,6.999969,2.5
--L 6.999969,6.499999,-0.000031,6.499999
-+[0023] #
-+L 2,0,2,9
-+L 5,9,5,0
-+L 0,2.5,7,2.5
-+L 7,6.5,0,6.5
-
--[&] 5
-+[0026] &
- L 6,3.21499,3.425964,0.59764
- A 2,2,2,135.478088,315.478088
- L 0.574036,3.40236,3.569458,6.44823
- A 2.5,7.5,1.5,315.478271,209.372314
--L 1.19281,6.76428,5,0
-+L 1.192810,6.76428,5,0
-
--['] 1
-+[0027] '
- L 0.5,7,1,9
-
--[(] 1
-+[0028] (
- A 13,4,13,157.380142,202.619858
-
--[)] 1
-+[0029] )
- A -12,4,13,337.380127,22.61986
-
--[*] 2
-+[002a] *
- L 0,6,4,2
- L 4,6,0,2
-
--[+] 2
-+[002b] +
- L 0,4,4,4
- L 2,6,2,2
-
--[,] 2
-+[002c] ,
- L 1,0,0,-3
- L 1,0,1,0.5
-
--[-] 1
-+[002d] -
- L 0,4,4,4
-
--[.] 1
-+[002e] .
- L 0,0,0,0.5
-
--[/] 1
-+[002f] /
- L 4,9,0,0
-
--[0] 10
-+[0030] 0
- A 2,7.91049,1.08951,32.75695,147.243042
- A 4.93335,5.62352,4.80559,143.232468,169.491135
- A 4.93335,3.37648,4.80559,190.508865,216.767532
-@@ -71,17 +71,17 @@
- A 9.404663,4.46906,9.40473,179.811493,192.086868
- A 9.404663,4.53094,9.40473,167.913132,180.188507
-
--[1] 2
-+[0031] 1
- L 0,7,2,9
- L 2,9,2,0
-
--[2] 4
-+[0032] 2
- L 4,0,0,0
- L 0,0,3.864502,6.64668
- A 3,7.14931,1,329.82547,20.52911
- A 2,7,2,14.47751,165.522491
-
--[3] 7
-+[0033] 3
- L 0,9,2,9
- A 2,7,2,270,90
- L 2,5,1,5
-@@ -90,12 +90,12 @@
- A 2,2,2,270,0
- L 2,0,0,0
-
--[4] 3
-+[0034] 4
- L 3.5,0,3.5,4
- L 5,2,0,2
- L 0,2,2,9
-
--[5] 7
-+[0035] 5
- L 4,9,0,9
- L 0,9,0,5
- L 0,5,2,5
-@@ -104,7 +104,7 @@
- A 2,2,2,270,0
- L 2,0,0,0
-
--[6] 6
-+[0036] 6
- A 6,3.80385,6,120,180
- L 0,3.80385,0,2
- A 2,2,2,180,0
-@@ -112,12 +112,12 @@
- A 2,3,2,0,90
- L 2,5,0.120422,5
-
--[7] 3
-+[0037] 7
- L 0,9,4,9
- L 4,9,1.5,0
- L 2,5,4,5
-
--[8] 8
-+[0038] 8
- L 0,3,0,2
- A 2,2,2,180,0
- L 4,2,4,3
-@@ -127,7 +127,7 @@
- L 3.75,6.75,3.75,7.25
- A 2,7.25,1.75,0,180
-
--[9] 6
-+[0039] 9
- A -2,5.19615,6,300,0
- L 4,5.19615,4,7
- A 2,7,2,0,180
-@@ -135,28 +135,28 @@
- A 2,6,2,180,270
- L 2,4,3.879578,4
-
--[:] 2
-+[003a] :
- L 0,0,0,0.5
- L 0,4,0,3.5
-
--[;] 3
-+[003b] ;
- L 1,0,0,-3
- L 1,0,1,0.5
- L 1,4,1,3.5
-
--[<] 2
-+[003c] <
- L 4,7,0,3.5
- L 0,3.5,4,0
-
--[=] 2
-+[003d] =
- L 0,5.5,4,5.5
- L 0,2.5,4,2.5
-
--[>] 2
-+[003e] >
- L 0,7,4,3.5
- L 4,3.5,0,0
-
--[?] 9
-+[003f] ?
- L 2,0,2,0.5
- L 2,3,2,3.39445
- L 0,7,0,7.5
-@@ -167,7 +167,7 @@
- A 1.5,7.5,1.5,90,180
- A 2.5,7.5,1.5,1.87147,90
-
--[@] 11
-+[0040] @
- L 8,1,6.067566,0.28186
- A 4.5,4.5,4.5,333.472015,290.386322
- A 7.412354,2.943008,1.2,168.690186,337.880432
-@@ -180,12 +180,12 @@
- L 6.321533,3.607756,7,7
- L 5.049561,7,5.170288,7
-
--[A] 3
-+[0041] A
- L 0,0,3,9
- L 3,9,6,0
- L 0.833313,2.5,5.166687,2.5
-
--[B] 8
-+[0042] B
- L 0,0,0,9
- L 0,9,2.5,9
- A 2.5,7,2,270,90
-@@ -195,14 +195,14 @@
- A 2.599976,2.4,2.4,270,0
- L 2.599976,0,0,0
-
--[C] 5
-+[0043] C
- L 4,9,2,9
- A 2,7,2,90,180
- L 0,7,0,2
- A 2,2,2,180,270
- L 2,0,4,0
-
--[D] 6
-+[0044] D
- L 0,0,3,0
- A 3,2,2,270,0
- L 5,2,5,7
-@@ -210,18 +210,18 @@
- L 3,9,0,9
- L 0,9,0,0
-
--[E] 4
-+[0045] E
- L 4,9,0,9
- L 0,9,0,0
- L 0,0,4,0
- L 0,5,3,5
-
--[F] 3
-+[0046] F
- L 4,9,0,9
- L 0,9,0,0
- L 0,5,4,5
-
--[G] 7
-+[0047] G
- L 5,9,2,9
- A 2,7,2,90,180
- L 0,7,0,2
-@@ -230,40 +230,40 @@
- L 5,0,5,5
- L 5,5,3.5,5
-
--[H] 3
-+[0048] H
- L 0,9,0,0
- L 5,0,5,9
- L 0,5,5,5
-
--[I] 1
-+[0049] I
- L 0,9,0,0
-
--[J] 3
-+[004a] J
- L 3,9,3,2
- A 1,2,2,270,0
- L 1,0,0,0
-
--[K] 3
-+[004b] K
- L 0,9,0,0
- L 0,3.5,5,9
- L 1.671326,5.33844,5,0
-
--[L] 2
-+[004c] L
- L 0,9,0,0
- L 0,0,4,0
-
--[M] 4
-+[004d] M
- L 0,0,0,9
- L 0,9,3,4
- L 3,4,6,9
- L 6,9,6,0
-
--[N] 3
-+[004e] N
- L 0,0,0,9
- L 0,9,5,0
- L 5,0,5,9
-
--[O] 8
-+[004f] O
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -273,7 +273,7 @@
- L 3,0,2,0
- A 2,2,2,180,270
-
--[P] 6
-+[0050] P
- L 0,0,0,9
- L 0,9,3,9
- A 3,7,2,0,90
-@@ -281,7 +281,7 @@
- A 3,6,2,270,0
- L 3,4,0,4
-
--[Q] 9
-+[0051] Q
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -292,7 +292,7 @@
- A 2,2,2,180,270
- L 6,0,3,2
-
--[R] 7
-+[0052] R
- L 0,0,0,9
- L 0,9,3,9
- A 3,7,2,0,90
-@@ -301,60 +301,60 @@
- L 3,4,0,4
- L 3,4,5,0
-
--[S] 5
-+[0053] S
- A 2,2.375,6.625,63.074589,90
- A 2,7,2,90,242.981201
- L 1.091431,5.21829,3.908569,3.78171
- A 3,2,2,270,62.98119
- A 3,6.625,6.625,243.074585,270
-
--[T] 2
-+[0054] T
- L 0,9,6,9
- L 3,9,3,0
-
--[U] 3
-+[0055] U
- L 0,9,0,2.5
- A 2.5,2.5,2.5,180,0
- L 5,2.5,5,9
-
--[V] 2
-+[0056] V
- L 0,9,3,0
- L 3,0,6,9
-
--[W] 4
-+[0057] W
- L 0,9,2,0
- L 2,0,4,6
- L 4,6,6,0
- L 6,0,8,9
-
--[X] 2
-+[0058] X
- L 0,9,6,0
- L 0,0,6,9
-
--[Y] 3
-+[0059] Y
- L 0,9,3,5
- L 3,5,3,0
- L 3,5,6,9
-
--[Z] 3
-+[005a] Z
- L 0,9,5,9
- L 5,9,0,0
- L 0,0,5,0
-
--[[] 3
-+[005b] [
- L 1,-1,0,-1
- L 0,-1,0,9
- L 0,9,1,9
-
--[\] 1
-+[005c] \
- L 0,9,4,0
-
--[]] 3
-+[005d] ]
- L 0,9,1,9
- L 1,9,1,-1
- L 1,-1,0,-1
-
--[a] 6
-+[0061] a
- L 0.5,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
-@@ -362,7 +362,7 @@
- A 1.5,1.5,1.5,90,270
- L 1.5,3,4,3
-
--[b] 6
-+[0062] b
- L 0,9,0,0
- L 0,0,2.5,0
- A 2.5,1.5,1.5,270,0
-@@ -370,14 +370,14 @@
- A 2.5,4.5,1.5,0,90
- L 2.5,6,0,6
-
--[c] 5
-+[0063] c
- L 3,6,1.5,6
- A 1.5,4.5,1.5,90,180
- L 0,4.5,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,3,0
-
--[d] 6
-+[0064] d
- L 4,9,4,0
- L 4,0,1.5,0
- A 1.5,1.5,1.5,180,270
-@@ -385,7 +385,7 @@
- A 1.5,4.5,1.5,90,180
- L 1.5,6,4,6
-
--[e] 6
-+[0065] e
- L 0,3,4,3
- L 4,3,4,4
- A 2,4,2,0,180
-@@ -393,13 +393,13 @@
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
-
--[f] 4
-+[0066] f
- L 1,0,1,7.5
- A 2.5,7.5,1.5,90,180
- L 2.5,9,3,9
- L 0,6,3,6
-
--[g] 8
-+[0067] g
- L 0,-3,2.5,-3
- A 2.5,-1.5,1.5,270,0
- L 4,-1.5,4,6
-@@ -409,51 +409,51 @@
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
-
--[h] 4
-+[0068] h
- L 0,9,0,0
- L 0,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
-
--[i] 2
-+[0069] i
- L 0,0,0,6
- L 0,8.5,0,9
-
--[j] 4
-+[006a] j
- L 0,-3,0.5,-3
- A 0.5,-1.5,1.5,270,0
- L 2,-1.5,2,6
- L 2,8.5,2,9
-
--[k] 3
-+[006b] k
- L 0,9,0,0
- L 0,3.5,4,6
- L 1.320923,4.32555,4,0
-
--[l] 2
-+[006c] l
- L 0,9,0,1
- A 1,1,1,180,270
-
--[m] 5
-+[006d] m
- L 0,0,0,6
- L 0,6,4.5,6
- A 4.5,4.5,1.5,0,90
- L 6,4.5,6,0
- L 3,6,3,0
-
--[n] 4
-+[006e] n
- L 0,0,0,6
- L 0,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
-
--[o] 4
-+[006f] o
- L 0,4,0,2
- A 2,2,2,180,0
- L 4,2,4,4
- A 2,4,2,0,180
-
--[p] 6
-+[0070] p
- L 0,0,2.5,0
- A 2.5,1.5,1.5,270,0
- L 4,1.5,4,4.5
-@@ -461,7 +461,7 @@
- L 2.5,6,0,6
- L 0,6,0,-3
-
--[q] 6
-+[0071] q
- L 4,0,1.5,0
- A 1.5,1.5,1.5,180,270
- L 0,1.5,0,4.5
-@@ -469,54 +469,54 @@
- L 1.5,6,4,6
- L 4,6,4,-3
-
--[r] 3
-+[0072] r
- L 0,0,0,6
- L 0,6,2,6
- A 2,5,1,0,90
-
--[s] 5
-+[0073] s
- A 2.164185,1.82088,4.0573,63.09737,108.27552
- A 1.268188,4.53406,1.2,108.274567,247.790543
- L 0.814575,3.42309,3.185425,2.45509
- A 2.731812,1.34412,1.19999,288.274933,67.791191
- A 1.835815,4.05732,4.05732,243.097656,288.275513
-
--[t] 2
-+[0074] t
- L 0,6,3,6
- L 1,9,1,0
-
--[u] 4
-+[0075] u
- L 0,6,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
- L 4,0,4,6
-
--[v] 2
-+[0076] v
- L 0,6,2,0
- L 2,0,4,6
-
--[w] 4
-+[0077] w
- L 0,6,1.5,0
- L 1.5,0,3,4
- L 3,4,4.5,0
- L 4.5,0,6,6
-
--[x] 2
-+[0078] x
- L 0,6,4,0
- L 0,0,4,6
-
--[y] 4
-+[0079] y
- L 0,6,2,0
- L 4,6,1.227905,-2.31623
- A 0.279297,-2,1,270,341.565063
- L 0.279297,-3,0,-3
-
--[z] 3
-+[007a] z
- L 0,6,4,6
- L 4,6,0,0
- L 0,0,4,0
-
--[{] 6
-+[007b] {
- A 2,8,1,90,180
- L 1,8,1,5
- A 0,5,1,270,0
-@@ -524,7 +524,7 @@
- L 1,3,1,0
- A 2,0,1,180,270
-
--[}] 6
-+[007d] }
- A 0,8,1,0,90
- L 1,8,1,5
- A 2,5,1,180,270
-@@ -532,43 +532,16 @@
- L 1,3,1,0
- A 0,0,1,270,0
-
--[#0104] 4
--L 0,0,3,9
--L 3,9,6,0
--L 0.833313,2.5,5.166687,2.5
--A 5.842222,-0.831208,0.84605,79.252124,297.569897
--
--[¢] 1
-+[00a2] ¢
- A 3,12.083333,2.083333,196.260205,343.739795
-
--[#0141] 3
--L 0,3.5,2.5,5.5
--L 1,9,1,0
--L 1,0,5,0
--
--[¤] 6
--A 2,3,1,90,270
--A 2,3,1,270,90
--L 1.2,3.6,0,4.5
--L 1.2,2.4,0,1.5
--L 2.8,2.4,4,1.5
--L 2.8,3.6,4,4.5
--
--[¥] 4
-+[00a5] ¥
- L 0,9,0,0
- L 0,0,4,0
- L 0.5,12,2,10
- L 2,10,3.5,12
-
--[#015A] 6
--A 2,2.375,6.625,63.074589,90
--A 2,7,2,90,242.981201
--L 1.091431,5.21829,3.908569,3.78171
--A 3,2,2,270,62.98119
--A 3,6.625,6.625,243.074585,270
--L 2.5,10,5,12
--
--[§] 6
-+[00a7] §
- A 2,2.375,6.625,63.074589,90
- A 2,7,2,90,242.981201
- A 3,2,2,270,62.98119
-@@ -576,190 +549,97 @@
- A 2.274781,4.058343,1.657038,350.389979,135.57225
- A 2.725219,4.941657,1.657038,170.389979,315.57225
-
--[¨] 2
-+[0161] ¨
- L 5,10.25,5,10.75
- L 1,10.25,1,10.75
-
--[#0160] 7
-+[0160] ¦
- A 2,2.375,6.625,63.074589,90
- A 2,7,2,90,242.981201
- L 1.091431,5.21829,3.908569,3.78171
--A 3,2,2,270,62.98119
-+A 3,2,2,270,62.98110
- A 3,6.625,6.625,243.074585,270
- L 1,12,2.5,10
- L 2.5,10,4,12
-
--[#015E] 6
--A 2,2.375,6.625,63.074589,90
--A 2,7,2,90,242.981201
--L 1.091431,5.21829,3.908569,3.78171
--A 3,2,2,270,62.98119
--A 3,6.625,6.625,243.074585,270
--A 3.157778,-0.831208,0.84605,242.430103,100.747876
--
--[#0164] 4
--L 0,9,6,9
--L 3,9,3,0
--L 1.5,12,3,10
--L 3,10,4.5,12
--
--[#0179] 4
--L 0,9,5,9
--L 5,9,0,0
--L 0,0,5,0
--L 2.5,10,5,12
--
--[] 1
--L 0,3,3.5,3
--
--[#0170] 5
--L 0,9,5,9
--L 5,9,0,0
--L 0,0,5,0
--L 1,12,2.5,10
--L 2.5,10,4,12
--
--[#017B] 4
--L 0,9,5,9
--L 5,9,0,0
--L 0,0,5,0
--L 2.5,10,2.5,10.5
--
--[°] 2
-+[00b0] °
- A 1,11,1,90,270
- A 1,11,1,270,90
-
--[#0105] 7
--L 0.5,6,2.5,6
--A 2.5,4.5,1.5,0,90
--L 4,4.5,4,0
--L 4,0,1.5,0
--A 1.5,1.5,1.5,90,270
--L 1.5,3,4,3
--A 3.842222,-0.831208,0.84605,79.252124,297.569897
--
--[#0142] 3
--L 0,3,2.5,5
--L 1,9,1,1
--A 2,1,1,180,270
--
--[´] 1
-+[017d] ´
- L 0,10,2.5,12
-
--[#013E] 4
--L 0,12,1.5,10
--L 1.5,10,3,12
--L 1.5,9,1.5,1
--A 2.5,1,1,180,270
--
--[#015B] 6
--A 2.164185,1.82088,4.0573,63.09737,108.27552
--A 1.268188,4.53406,1.2,108.274567,247.790543
--L 0.814575,3.42309,3.185425,2.45509
--A 2.731812,1.34412,1.19999,288.274933,67.791191
--A 1.835815,4.05732,4.05732,243.097656,288.275513
--L 2.5,7,5,9
--
--[·] 2
-+[00b7] ·
- L 0.5,11,2,9
- L 2,9,3.5,11
-
--[#0161] 7
--A 2.164185,1.82088,4.0573,63.09737,108.27552
--A 1.268188,4.53406,1.2,108.274567,247.790543
--L 0.814575,3.42309,3.185425,2.45509
--A 2.731812,1.34412,1.19999,288.274933,67.791191
--A 1.835815,4.05732,4.05732,243.097656,288.275513
--L 0.5,9,2,7
--L 2,7,3.5,9
--
--[#015F] 6
--A 2.164185,1.82088,4.0573,63.09737,108.27552
--A 1.268188,4.53406,1.2,108.274567,247.790543
--L 0.814575,3.42309,3.185425,2.45509
--A 2.731812,1.34412,1.19999,288.274933,67.791191
--A 1.835815,4.05732,4.05732,243.097656,288.275513
--A 2.157778,-0.831208,0.84605,242.430103,100.747876
--
--[#0165] 4
--L 0,6,3,6
--L 1,9,1,0
--L 0,12,1.5,10
--L 1.5,10,3,12
--
--[#017A] 4
--L 0,6,4,6
--L 4,6,0,0
--L 0,0,4,0
--L 2.5,7,5,9
--
--[½] 2
--L 3.5,10,6,12
--L 1.5,10,4,12
-+[0153] ½
-+L 0,4,0,2
-+A 2,2,2,180,0
-+L 4,2,4,4
-+A 2,4,2,0,180
-+A 5.5,1.5,1.5,180,270
-+A 6,4,2,0,180
-+L 8,4,8,3
-+L 8,3,4,3
-+L 5.5,0,8,0
-+L 4,1.5,4,2
-
--[#017E] 5
-+[017e] ¸
- L 0,6,4,6
- L 4,6,0,0
- L 0,0,4,0
- L 0.5,9,2,7
- L 2,7,3.5,9
-
--[#017C] 4
--L 0,6,4,6
--L 4,6,0,0
--L 0,0,4,0
--L 2,9,2,8.5
--
--[#0154] 8
--L 0,0,0,9
--L 0,9,3,9
--A 3,7,2,0,90
--L 5,7,5,6
--A 3,6,2,270,0
--L 3,4,0,4
--L 3,4,5,0
--L 2.5,10,5,12
-+[00c0] À
-+L 0,0,3,9
-+L 3,9,6,0
-+L 0.833313,2.5,5.166687,2.5
-+L 2,12,4.5,10
-
--[#00C1] 4
--L 2.5,10,5,12
-+[00c1] Á
- L 0,0,3,9
- L 3,9,6,0
- L 0.833313,2.5,5.166687,2.5
-+L 1.5,10,4,12
-
--[#00C2] 5
-+[00c2] Â
- L 0,0,3,9
- L 3,9,6,0
- L 0.833313,2.5,5.166687,2.5
- L 1.5,10,3,12
- L 3,12,4.5,10
-
--[#0102] 4
-+[00c3] Ã
- L 0,0,3,9
- L 3,9,6,0
- L 0.833313,2.5,5.166687,2.5
--A 3,12.083333,2.083333,196.260205,343.739795
-+A 2,9.95,1.45,46.397181,133.602819
-+A 4,11.75,1.25,216.869898,323.130102
-
--[#00C4] 5
-+[00c4] Ä
- L 0,0,3,9
- L 3,9,6,0
- L 0.833252,2.5,5.166748,2.5
- L 5,10.25,5,10.75
- L 1,10.25,1,10.75
-
--[#0139] 3
--L 0,9,0,0
--L 0,0,4,0
--L 1,10,3.5,12
-+[00c5] Å
-+L 0,0,3,9
-+L 3,9,6,0
-+L 0.833252,2.5,5.166748,2.5
-+A 3,11,1,0,360
-
--[#0106] 6
--L 4,9,2,9
--A 2,7,2,90,180
--L 0,7,0,2
--A 2,2,2,180,270
--L 2,0,4,0
--L 2.5,10,5,12
-+[00c6] Æ
-+L 0,0,3,9
-+L 4,9,4,0
-+L 0.833252,2.5,4,2.5
-+L 3,9,8,9
-+L 7,5,4,5
-+L 8,0,4,0
-
--[#00C7] 6
-+[00c7] Ç
- L 4,9,2,9
- A 2,7,2,90,180
- L 0,7,0,2
-@@ -767,88 +647,73 @@
- L 2,0,4,0
- A 2.657778,-0.831208,0.84605,242.430103,100.747876
-
--[#010C] 7
--L 4,9,2,9
--A 2,7,2,90,180
--L 0,7,0,2
--A 2,2,2,180,270
--L 2,0,4,0
--L 0.5,12,2,10
--L 2,10,3.5,12
--
--[#00C9] 5
-+[00c9] É
- L 4,9,0,9
- L 0,9,0,0
- L 0,0,4,0
- L 0,5,3,5
--L 2.5,10,5,12
-+L 1,10,3.5,12
-
--[#0118] 5
-+[00c8] È
- L 4,9,0,9
- L 0,9,0,0
- L 0,0,4,0
- L 0,5,3,5
--A 3.842222,-0.831208,0.84605,79.252124,297.569897
-+L 1,12,3.5,10
-
--[#00CB] 6
-+[00ca] Ê
- L 4,9,0,9
- L 0,9,0,0
- L 0,0,4,0
- L 0,5,3,5
--L 0.5,10.25,0.5,10.75
--L 3.5,10.25,3.5,10.75
-+L 0.5,10,2,12
-+L 2,12,3.5,10
-
--[#011A] 6
-+[00cb] Ë
- L 4,9,0,9
- L 0,9,0,0
- L 0,0,4,0
- L 0,5,3,5
--L 0.5,12,2,10
--L 2,10,3.5,12
-+L 0.5,10.25,0.5,10.75
-+L 3.5,10.25,3.5,10.75
-
--[#013A] 2
--L 0,9,0,0
--L 0,10,2.5,12
-+[00cc] Ì
-+L 1.5,9,1.5,0
-+L 1,12,2.5,10
-+
-+[00cd] Í
-+L 1.5,9,1.5,0
-+L 0.75,10,2.25,12
-
--[#00CE] 3
-+[00ce] Î
- L 0,10,1.5,12
- L 1.5,12,3,10
- L 1.5,9,1.5,0
-
--[#010E] 8
--L 0,0,3,0
--A 3,2,2,270,0
--L 5,2,5,7
--A 3,7,2,0,90
--L 3,9,0,9
--L 0,9,0,0
--L 0.5,12,2,10
--L 2,10,3.5,12
--
--[#0110] 7
--L 1,0,4,0
--A 4,2,2,270,0
--L 6,2,6,7
--A 4,7,2,0,90
--L 4,9,1,9
--L 1,9,1,0
--L 0,4.5,2.5,4.5
-+[00cf] Ï
-+L 1.5,9,1.5,0
-+L 0.5,10.25,0.5,10.75
-+L 2.5,10.25,2.5,10.75
-
--[#0143] 4
-+[00d1] Ñ
- L 0,0,0,9
- L 0,9,5,0
- L 5,0,5,9
--L 2.5,10,5,12
-+A 1.5,9.95,1.45,46.397181,133.602819
-+A 3.5,12.05,1.45,226.397181,313.602819
-
--[#0147] 5
--L 0,0,0,9
--L 0,9,5,0
--L 5,0,5,9
--L 1,12,2.5,10
--L 2.5,10,4,12
-+[00d2] Ò
-+L 0,2,0,7
-+A 2,7,2,90,180
-+L 2,9,3,9
-+A 3,7,2,0,90
-+L 5,7,5,2
-+A 3,2,2,270,0
-+L 3,0,2,0
-+A 2,2,2,180,270
-+L 1.5,12,4,10
-
--[#00D3] 9
--L 2.5,10,5,12
-+[00d3] Ó
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -857,8 +722,9 @@
- A 3,2,2,270,0
- L 3,0,2,0
- A 2,2,2,180,270
-+L 1,10,3.5,12
-
--[#00D4] 10
-+[00d4] Ô
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -870,7 +736,7 @@
- L 1,10,2.5,12
- L 2.5,12,4,10
-
--[#0150] 10
-+[00d5] Õ
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -879,10 +745,10 @@
- A 3,2,2,270,0
- L 3,0,2,0
- A 2,2,2,180,270
--L 3.5,10,6,12
--L 1.5,10,4,12
-+A 1.5,9.95,1.45,46.397181,133.602819
-+A 3.55,12.175,1.575793,228.215484,311.784516
-
--[#00D6] 10
-+[00d6] Ö
- L 0,2,0,7
- A 2,7,2,90,180
- L 2,9,3,9
-@@ -894,86 +760,61 @@
- L 1,10.25,1,10.75
- L 4,10.25,4,10.75
-
--[×] 2
-+[00d7] ×
- L 0.066298,4.160725,2.732965,1.494059
- L 2.732965,4.160725,0.066298,1.494059
-
--[#0158] 9
--L 0,0,0,9
--L 0,9,3,9
--A 3,7,2,0,90
--L 5,7,5,6
--A 3,6,2,270,0
--L 3,4,0,4
--L 3,4,5,0
--L 0.5,12,2,10
--L 2,10,3.5,12
--
--[#016E] 5
-+[00d9] Ù
- L 0,9,0,2.5
- A 2.5,2.5,2.5,180,0
- L 5,2.5,5,9
--A 2.5,11,1,90,270
--A 2.5,11,1,270,90
-+L 1.5,12,4,10
-
--[#00DA] 4
-+[00da] Ú
- L 0,9,0,2.5
- A 2.5,2.5,2.5,180,0
- L 5,2.5,5,9
--L 2.5,10,5,12
-+L 1,10,3.5,12
-
--[#0170] 5
-+[00db] Û
- L 0,9,0,2.5
- A 2.5,2.5,2.5,180,0
- L 5,2.5,5,9
--L 3.5,10,6,12
--L 1.5,10,4,12
-+L 1,10,2.5,12
-+L 2.5,12,4,10
-
--[#00DC] 5
-+[00dc] Ü
- L 0,9,0,2.5
- A 2.5,2.5,2.5,180,0
- L 5,2.5,5,9
- L 1,10.25,1,10.75
- L 4,10.25,4,10.75
-
--[#00DD] 4
-+[00dd] Ý
- L 0,9,3,5
- L 3,5,3,0
- L 3,5,6,9
--L 2.5,10,5,12
-+L 2,10,4.5,12
-
--[#0162] 3
--L 0,9,6,9
--L 3,9,3,0
--A 3.157778,-0.831208,0.84605,242.430103,100.747876
--
--[#00D7] 9
--A 2.5,7,2,270,90
--A 2.599976,2.6,2.4,0,90
--L 5,2.6,5,2.4
--A 2.599976,2.4,2.4,270,0
--L 1,5,2.599976,5
--A 2,7,2,90,180
--L 2,9,2.5,9
--L 0,0,0,7
--L 2.599976,0,1,0
--
--[#0155] 4
--L 0,0,0,6
--L 0,6,2,6
--A 2,5,1,0,90
--L 1.5,7,4,9
-+[00e0] à
-+L 0.5,6,2.5,6
-+A 2.5,4.5,1.5,0,90
-+L 4,4.5,4,0
-+L 4,0,1.5,0
-+A 1.5,1.5,1.5,90,270
-+L 1.5,3,4,3
-+L 1,9,3.5,7
-
--[#00E1] 7
-+[00e1] á
- L 0.5,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
- L 4,0,1.5,0
- A 1.5,1.5,1.5,90,270
- L 1.5,3,4,3
--L 2.5,7,5,9
-+L 1,7,3.5,9
-
--[#00E2] 8
-+[00e2] â
- L 0.5,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
-@@ -983,16 +824,17 @@
- L 0.5,7,2,9
- L 2,9,3.5,7
-
--[#0103] 7
-+[00e3] ã
- L 0.5,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
- L 4,0,1.5,0
- A 1.5,1.5,1.5,90,270
- L 1.5,3,4,3
--A 2,9.583333,2.083333,196.260205,343.739795
-+AR 1.5,7.033333,0.966667,136.397181,43.602819
-+A 2.9,8.366667,0.966667,223.602819,316.397181
-
--[#00E4] 8
-+[00e4] ä
- L 0.5,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
-@@ -1002,20 +844,29 @@
- L 1,9,1,8.5
- L 3,9,3,8.5
-
--[#013A] 3
--L 0,10,2.5,12
--L 1,9,1,1
--A 2,1,1,180,270
-+[00e5] å
-+L 0.5,6,2.5,6
-+A 2.5,4.5,1.5,0,90
-+L 4,4.5,4,0
-+L 4,0,1.5,0
-+A 1.5,1.5,1.5,90,270
-+L 1.5,3,4,3
-+A 2,8,1,0,360
-
--[#0107] 6
--L 3,6,1.5,6
--A 1.5,4.5,1.5,90,180
--L 0,4.5,0,1.5
--A 1.5,1.5,1.5,180,270
--L 1.5,0,3,0
--L 1.5,7,4,9
-+[00e6] æ
-+L 0.5,6,2.5,6
-+A 2.5,4.5,1.5,0,90
-+L 4,4.5,4,0
-+L 4,0,1.5,0
-+A 1.5,1.5,1.5,90,270
-+L 1.5,3,4,3
-+A 6,4,2,0,180
-+A 5.5,1.5,1.5,180,270
-+L 4,3,8,3
-+L 5.5,0,8,0
-+L 8,3,8,4
-
--[#00E7] 6
-+[00e7] ç
- L 3,6,1.5,6
- A 1.5,4.5,1.5,90,180
- L 0,4.5,0,1.5
-@@ -1023,104 +874,85 @@
- L 1.5,0,3,0
- A 2.157778,-0.831208,0.84605,242.430103,100.747876
-
--[#010D] 7
--L 3,6,1.5,6
--A 1.5,4.5,1.5,90,180
--L 0,4.5,0,1.5
--A 1.5,1.5,1.5,180,270
--L 1.5,0,3,0
--L 0,9,1.5,7
--L 1.5,7,3,9
--
--[#00E9] 7
--L 2.5,7,5,9
-+[00e8] è
- L 0,3,4,3
- L 4,3,4,4
- A 2,4,2,0,180
- L 0,4,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
-+L 1,9,3.5,7
-
--[#0119] 7
-+[00e9] é
- L 0,3,4,3
- L 4,3,4,4
- A 2,4,2,0,180
- L 0,4,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
--A 3.842222,-0.831208,0.84605,79.252124,297.569897
-+L 1,7,3.5,9
-
--[#00EB] 8
-+[00ea] ê
- L 0,3,4,3
- L 4,3,4,4
- A 2,4,2,0,180
- L 0,4,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
--L 1,9,1,8.5
--L 3,9,3,8.5
-+L 0.5,7,2,9
-+L 2,9,3.5,7
-
--[#011B] 8
-+[00eb] ë
- L 0,3,4,3
- L 4,3,4,4
- A 2,4,2,0,180
- L 0,4,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
--L 0.5,9,2,7
--L 2,7,3.5,9
-+L 1,9,1,8.5
-+L 3,9,3,8.5
-
--[#00ED] 2
--L 0,7,2.5,9
-+[00ec] ì
- L 0.5,0,0.5,6
-+L -0.5,9,2,7
-
--[#00EE] 3
-+[00ed] í
-+L 0.5,0,0.5,6
-+L -0.5,7,2,9
-+
-+[00ee] î
- L 0,7,1.5,9
- L 1.5,9,3,7
- L 1.5,0,1.5,6
-
--[#010F] 8
--L 4,9,4,0
--L 4,0,1.5,0
--A 1.5,1.5,1.5,180,270
--L 0,1.5,0,4.5
--A 1.5,4.5,1.5,90,180
--L 1.5,6,4,6
--L 0.5,12,2,10
--L 2,10,3.5,12
--
--[#0111] 7
--L 4,9,4,0
--L 4,0,1.5,0
--A 1.5,1.5,1.5,180,270
--L 0,1.5,0,4.5
--A 1.5,4.5,1.5,90,180
--L 1.5,6,4,6
--L 3,7.5,5,7.5
-+[00ef] ï
-+L 1.5,0,1.5,6
-+L 0.5,9,0.5,8.5
-+L 2.5,9,2.5,8.5
-
--[#0144] 5
-+[00f1] ñ
- L 0,0,0,6
- L 0,6,2.5,6
- A 2.5,4.5,1.5,0,90
- L 4,4.5,4,0
--L 2.5,7,5,9
-+A 2.7,8.366670,0.966667,223.603,316.397
-+AR 1.3,7.033330,0.966667,136.397,43.602800
-
--[#0148] 6
--L 0,0,0,6
--L 0,6,2.5,6
--A 2.5,4.5,1.5,0,90
--L 4,4.5,4,0
--L 0.5,9,2,7
--L 2,7,3.5,9
-+[00f2] ò
-+L 0,4,0,2
-+A 2,2,2,180,0
-+L 4,2,4,4
-+A 2,4,2,0,180
-+L 1,9,3.5,7
-
--[#00F3] 5
--L 2.5,7,5,9
-+[00f3] ó
- L 0,4,0,2
- A 2,2,2,180,0
- L 4,2,4,4
- A 2,4,2,0,180
-+L 1,7,3.5,9
-
--[#00F4] 6
-+[00f4] ô
- L 0,4,0,2
- A 2,2,2,180,0
- L 4,2,4,4
-@@ -1128,15 +960,15 @@
- L 0.5,7,2,9
- L 2,9,3.5,7
-
--[#0151] 6
-+[00f5] õ
- L 0,4,0,2
- A 2,2,2,180,0
- L 4,2,4,4
- A 2,4,2,0,180
--L 1,7,3.5,9
--L 3,7,5.5,9
-+A 1.3,7.333330,0.966667,43.602800,136.397
-+A 2.7,8.666670,0.966667,223.603,316.397
-
--[#00F6] 6
-+[00f6] ö
- L 0,4,0,2
- A 2,2,2,180,0
- L 4,2,4,4
-@@ -1144,37 +976,29 @@
- L 1,9,1,8.5
- L 3,9,3,8.5
-
--[#0159] 5
--L 0,0,0,6
--L 0,6,2,6
--A 2,5,1,0,90
--L 0,9,1.5,7
--L 1.5,7,3,9
--
--[#016F] 6
-+[00f9] ù
- L 0,6,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
- L 4,0,4,6
--A 2,8,1,90,270
--A 2,8,1,270,90
-+L 1,9,3.5,7
-
--[#00FA] 5
--L 2.5,7,5,9
-+[00fa] ú
- L 0,6,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
- L 4,0,4,6
-+L 1,7,3.5,9
-
--[#0171] 6
-+[00fb] û
- L 0,6,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
- L 4,0,4,6
--L 1,7,3.5,9
--L 3,7,5.5,9
-+L 0.5,7,2,9
-+L 2,9,3.5,7
-
--[#00FC] 6
-+[00fc] ü
- L 0,6,0,1.5
- A 1.5,1.5,1.5,180,270
- L 1.5,0,4,0
-@@ -1182,16 +1006,19 @@
- L 1,9,1,8.5
- L 3,9,3,8.5
-
--[#00FD] 5
-+[00fd] ý
- L 0,6,2,0
--L 4,6,1.227905,-2.31623
-+L 4,6,1.227905,-2.316230
- A 0.279297,-2,1,270,341.565063
- L 0.279297,-3,0,-3
--L 2.5,7,5,9
-+L 1,7,3.5,9
-
--[#0163] 3
--L 0,6,3,6
--L 1,9,1,0
--A 1.157778,-0.831208,0.84605,242.430103,100.747876
-+[00ff] ÿ
-+L 0,6,2,0
-+L 4,6,1.227905,-2.316230
-+A 0.279297,-2,1,270,341.565063
-+L 0.279297,-3,0,-3
-+L 1,9,1,8.5
-+L 3,9,3,8.5
-
- #EOF
diff --git a/debian/patches/qcadlib_makefile.patch b/debian/patches/qcadlib_makefile.patch
deleted file mode 100644
index 52213ad..0000000
--- a/debian/patches/qcadlib_makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: qcad/qcadlib/Makefile
-===================================================================
---- qcad.orig/qcadlib/Makefile 2010-07-18 17:16:30.000000000 +0200
-+++ qcad/qcadlib/Makefile 2010-07-18 17:23:52.000000000 +0200
-@@ -22,7 +22,7 @@
-
- prepare:
- test -d ./include || mkdir -p ./include
-- -( cd ./include; rm -f *.h; \
-+ -( cd ./include && find . -name "*.h" | xargs -r rm && \
- for hf in `find ../src -name '*.h'`; do \
- if [ "x$$OS" = "xWindows_NT" ]; then \
- cp "$$hf" .; \
-@@ -57,16 +57,16 @@
- -(doxygen ./doxygen.cfg)
-
- statistics:
-- @echo "Lines in source files:"
-+ @echo -n "Lines in source files:"
- -find -name *.cpp | xargs cat | wc
-- @echo "Lines in header files:"
-+ @echo -n "Lines in header files:"
- -find -name *.h | xargs cat | wc
-
- indent:
-- -find . -name "*.cpp" | xargs astyle --style=kr
-- -find . -name "*.h" | xargs astyle --style=kr
-- -find . -name "*.h.orig" | xargs rm
-- -find . -name "*.cpp.orig" | xargs rm
-+ -find . -name "*.cpp" | xargs -r astyle --style=kr
-+ -find . -name "*.h" | xargs -r astyle --style=kr
-+ -find . -name "*.h.orig" | xargs -r rm
-+ -find . -name "*.cpp.orig" | xargs -r rm
-
- dist: clean
- -rm -d ../doc/classref/html/en/*
-Index: qcad/make_dist.sh
-===================================================================
---- qcad.orig/make_dist.sh 2010-07-18 17:24:14.000000000 +0200
-+++ qcad/make_dist.sh 2010-07-18 17:27:33.000000000 +0200
-@@ -4,11 +4,12 @@
-
- for i in $dirs
- do
-- cd $i
-- make clean
-- cd ..
-+ make -C $i clean
- done
-
--for i in $(find -name '*.qm') ; do rm -rf $i ; done
--for i in $(find -name '*.a') ; do rm -rf $i ; done
--rm */include/*
-+find -name '*.qm' | xargs -r rm -rf
-+find -name '*.a' | xargs -r rm -rf
-+for i in */include
-+do
-+ rm -f $i/*
-+done
diff --git a/debian/patches/release_translations_qm_dir.patch b/debian/patches/release_translations_qm_dir.patch
deleted file mode 100644
index b5892d1..0000000
--- a/debian/patches/release_translations_qm_dir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: qcad/scripts/release_translations.sh
-===================================================================
---- qcad.orig/scripts/release_translations.sh 2010-07-18 18:25:58.000000000 +0200
-+++ qcad/scripts/release_translations.sh 2010-07-18 18:38:17.000000000 +0200
-@@ -2,22 +2,28 @@
- cd ..
- cwd=`pwd`
-
-+if [ ! -d "$cwd"/qcad/qm ]; then
-+ echo "Creating target directory for .qm files."
-+ mkdir -p "$cwd"/qcad/qm
-+fi
-+
- for dir in qcad qcadactions qcadguiqt qcadcmd qcadlib
- do
-- pushd $dir/src
-+ if [ ! -d "$dir"/src ]; then continue; fi
-+ pushd "$dir"/src
- echo "running lrelease in $dir/src..."
-- find -type f -name '*.ts' -exec $QTDIR/bin/lrelease '{}' \;
-- find -type f -name '*.pro' -exec $QTDIR/bin/lrelease '{}' \;
-+ find -type f -name '*.ts' -exec "$QTDIR"/bin/lrelease '{}' \;
-+ find -type f -name '*.pro' -exec "$QTDIR"/bin/lrelease '{}' \;
- popd
-
-- pushd $dir/src/ts
-- echo "copying from $dir/src/ts..."
-- for tf in *.qm
-- do
-- if [ ! -e $cwd/qcad/qm/$tf ]
-- then
-- cp $cwd/$dir/src/ts/$tf $cwd/qcad/qm/$tf
-- fi
-- done
-+ pushd "$dir"/src/ts
-+ echo "copying from $dir/src/ts..."
-+ for tf in *.qm
-+ do
-+ if [ ! -e "$cwd"/qcad/qm/"$tf" ]
-+ then
-+ cp "$cwd"/"$dir"/src/ts/"$tf" "$cwd"/qcad/qm/"$tf"
-+ fi
-+ done
- popd
- done
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26972a9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,12 +0,0 @@
-qcadlib_makefile.patch
-invoke-release-translations-with-bash.patch
-# define-qmakespecs-on-makefiles.patch
-bug#234340.patch
-bug#370464.patch
-define-debian-paths.patch
-add-hint-about-qcad-doc.patch
-create-about_txt.patch
-help_security_of_build_scripts.patch
-release_translations_qm_dir.patch
-qcad-2.0.5.0-latin2.patch
-autosave.patch
diff --git a/debian/qcad-data.install b/debian/qcad-data.install
deleted file mode 100644
index c72ae94..0000000
--- a/debian/qcad-data.install
+++ /dev/null
@@ -1 +0,0 @@
-./qcad/qm /usr/share/qcad/
diff --git a/debian/qcad-doc.doc-base b/debian/qcad-doc.doc-base
deleted file mode 100644
index 50b7181..0000000
--- a/debian/qcad-doc.doc-base
+++ /dev/null
@@ -1,13 +0,0 @@
-Document: qcad-reference-manual
-Title: QCad User Reference Manual
-Author: Andrew Mustun
-Abstract: The User Reference Manual for QCad.
- This manual is designed to get you started using QCad and to help you using
- it more efficiently. Further it will give you an idea of the more advanced
- possibilities behind QCad. It will also introduce you in the world of
- computer aided design (CAD).
-Section: Science/Engineering
-
-Format: HTML
-Index: /usr/share/doc/qcad/html/index.html
-Files: /usr/share/doc/qcad/html/*.html
diff --git a/debian/qcad-doc.install b/debian/qcad-doc.install
deleted file mode 100644
index 588a62c..0000000
--- a/debian/qcad-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-qcad/doc/* ./usr/share/doc/qcad/html/
diff --git a/debian/qcad.1 b/debian/qcad.1
deleted file mode 100644
index dbac27f..0000000
--- a/debian/qcad.1
+++ /dev/null
@@ -1,11 +0,0 @@
-.TH QCad 1 "February 2001" "Debian GNU/Linux"
-.SH NAME
-qcad \- A professional CAD System.
-.SH DESCRIPTION
-QCad is a professional CAD System. With QCad you can easily construct and
-change drawings with ISO-texts and many other features and save them as
-DXF-files. These DXF-files are the interface to many CAD-systems such as
-AutoCAD(R) and many others.
-
-QCad has no special invocation parameters. You can find the useful
-docs in /usr/share/doc/qcad/html/
diff --git a/debian/qcad.applications b/debian/qcad.applications
deleted file mode 100644
index 7bce842..0000000
--- a/debian/qcad.applications
+++ /dev/null
@@ -1,8 +0,0 @@
-qcad
- requires_terminal=false
- command=qcad
- expects_uris=false
- can_open_multiple_files=true
- name=QCad
- mime_types=image/vnd.dxf
-
diff --git a/debian/qcad.desktop b/debian/qcad.desktop
deleted file mode 100644
index c271b21..0000000
--- a/debian/qcad.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=QCad
-Comment=A professional CAD System
-Comment[es]=Un sistema CAD profesional
-TryExec=qcad
-Exec=qcad %F
-Icon=qcad
-Categories=Graphics;Engineering
-MimeType=image/vnd.dxf
diff --git a/debian/qcad.docs b/debian/qcad.docs
deleted file mode 100644
index 1fd698b..0000000
--- a/debian/qcad.docs
+++ /dev/null
@@ -1 +0,0 @@
-qcad/README
diff --git a/debian/qcad.install b/debian/qcad.install
deleted file mode 100644
index 6154b6b..0000000
--- a/debian/qcad.install
+++ /dev/null
@@ -1,4 +0,0 @@
-qcad/qcad /usr/bin/
-qcad/src/xpm/qcad.xpm /usr/share/pixmaps/
-debian/qcad.desktop /usr/share/applications/
-debian/qcad.menu /usr/share/menu
diff --git a/debian/qcad.keys b/debian/qcad.keys
deleted file mode 100644
index f160290..0000000
--- a/debian/qcad.keys
+++ /dev/null
@@ -1,3 +0,0 @@
-image/vnd.dxf:
- ext: dxf
-
diff --git a/debian/qcad.links b/debian/qcad.links
deleted file mode 100644
index 64de311..0000000
--- a/debian/qcad.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/qcad/html/ /usr/share/qcad/doc
diff --git a/debian/qcad.manpages b/debian/qcad.manpages
deleted file mode 100644
index 1da7631..0000000
--- a/debian/qcad.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/qcad.1
diff --git a/debian/qcad.menu b/debian/qcad.menu
deleted file mode 100644
index f2dfb46..0000000
--- a/debian/qcad.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(qcad):\
- needs="X11"\
- section="Applications/Science/Engineering"\
- icon="/usr/share/pixmaps/qcad.xpm"\
- title="QCad"\
- command="/usr/bin/qcad"
diff --git a/debian/qcad.mime b/debian/qcad.mime
deleted file mode 100644
index ed6884c..0000000
--- a/debian/qcad.mime
+++ /dev/null
@@ -1 +0,0 @@
-image/vnd.dxf; qcad '%f'; test=test -n "$DISPLAY"; description="Drawing Exchange Format"; nametemplate=%s.dxf
diff --git a/debian/rules b/debian/rules
index 4d21bbb..b423719 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,31 +5,3 @@
%:
dh $@
-
-override_dh_auto_configure:
- cp /usr/share/misc/config.sub dxflib
- cp /usr/share/misc/config.sub fparser
- cp /usr/share/misc/config.guess dxflib
- cp /usr/share/misc/config.guess fparser
- cd dxflib && autoreconf -f -i && ./configure
- cd fparser && autoreconf -f -i && ./configure
-
-override_dh_auto_clean:
- dh_auto_clean
-
- sh make_dist.sh
-
- # patch-system-but-direct-changes-in-diff
- rm -f qcadguiqt/src/Makefile qcadcmd/src/Makefile qcad/src/Makefile qcadlib/src/Makefile qcadactions/src/Makefile
- # configure-generated-file-in-source
- rm -f dxflib/config.log dxflib/config.status fparser/config.log fparser/config.status \
- fparser/Makefile dxflib/Makefile fparser/configure dxflib/configure \
- fparser/configure.guess dxflib/configure.guess fparser/configure.sub dxflib/configure.sub
- # package-contains-empty-directory
- [ ! -d qcad/doc/classref/html/en/ ] || rmdir qcad/doc/classref/html/en/
-
-override_dh_auto_build:
- cd scripts/ && QTDIR=/usr/share/qt3 QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++ PATH=${PATH}:/usr/share/qt3/bin ./build_qcad.sh
-
-override_dh_compress:
- dh_compress -X.adp
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 4410b84..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# Files are cleaned in debian/rules and rebuilt with autoreconf
-qcad source: configure-generated-file-in-source dxflib/config.log
-qcad source: configure-generated-file-in-source dxflib/config.status
-qcad source: configure-generated-file-in-source fparser/config.log
-qcad source: configure-generated-file-in-source fparser/config.status
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index d55780d..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts="uversionmangle=s/^/2.0.5.0-1+/" \
-http://sites.google.com/site/qcadfree/ qcad-free-(.*)\.tar\.bz2
--
Professional CAD system
More information about the debian-science-commits
mailing list