From d832c91bf21f6649c1ca7b35bfa7ac67b7832cc3 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 14 Mar 2016 23:37:29 -0400 Subject: Commit to using our stored units for now. (bzr r14707) --- src/widgets/text-toolbar.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index c49f0bc05..60e932338 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,9 +1106,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - lh_unit = tracker->getActiveUnit(); - // Can get unit like this: unit_table.getUnit(query.line_height.unit); - height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); + //Unit const *active = tracker->getActiveUnit(); + // This allows us to show the unit stored to the user, but right now + // it's always px (because Tav said other units are broken/2016) + lh_unit = unit_table.getUnit(query.line_height.unit); + height = query.line_height.computed; } // Set before value is set -- cgit v1.2.3 From c1a9b9773542b5a5de771a06a20834f38bb2da90 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 15 Mar 2016 22:38:20 +0100 Subject: fix-bug-1557192. paint-order crash with multiple items Fixed bugs: - https://launchpad.net/bugs/1557192 (bzr r14708) --- src/desktop-style.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index c28302d22..d10c75cd8 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1004,10 +1004,10 @@ objects_query_paintorder (const std::vector &objects, SPStyle *style_re n_order ++; - if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { - same_order = false; - } if (style->paint_order.set) { + if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { + same_order = false; + } prev_order = style->paint_order.value; } } -- cgit v1.2.3 From 061e103f1157c2c2e9cf1260be6abeaeb5e6a1a5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 15 Mar 2016 23:42:46 +0100 Subject: Updates to the branding folder. (bzr r14709) --- share/branding/draw-freely.ru.svg | 82 ------------ share/branding/draw-freely.svg | 208 ++++++++++++++++++------------ share/branding/euphoriascript-regular.ttf | Bin 0 -> 38424 bytes share/branding/inkscape-flat.svg | 58 +++++++++ 4 files changed, 187 insertions(+), 161 deletions(-) delete mode 100644 share/branding/draw-freely.ru.svg create mode 100644 share/branding/euphoriascript-regular.ttf create mode 100644 share/branding/inkscape-flat.svg diff --git a/share/branding/draw-freely.ru.svg b/share/branding/draw-freely.ru.svg deleted file mode 100644 index 61e98a9f7..000000000 --- a/share/branding/draw-freely.ru.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/share/branding/draw-freely.svg b/share/branding/draw-freely.svg index bcf2fb16e..c46109386 100644 --- a/share/branding/draw-freely.svg +++ b/share/branding/draw-freely.svg @@ -1,82 +1,132 @@ - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + + + + + +Draw Freely + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/branding/euphoriascript-regular.ttf b/share/branding/euphoriascript-regular.ttf new file mode 100644 index 000000000..0c434cb0e Binary files /dev/null and b/share/branding/euphoriascript-regular.ttf differ diff --git a/share/branding/inkscape-flat.svg b/share/branding/inkscape-flat.svg new file mode 100644 index 000000000..a9534676d --- /dev/null +++ b/share/branding/inkscape-flat.svg @@ -0,0 +1,58 @@ + + +Inkscape Logo + + + + + + + +image/svg+xml + + + +Andy Fitzsimon + + + + +Andrew Michael Fitzsimon + + + + +Fitzsimon IT Consulting Pty Ltd + + +http://andy.fitzsimon.com.au +2006 + +Inkscape Logo + + + + + + + + + + + + + -- cgit v1.2.3 From ad91896b0ece9504ca8506f5a650200cdef1e2ef Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 16 Mar 2016 01:06:40 +0100 Subject: Fix broken compile from branding folder (bzr r14710) --- share/branding/CMakeLists.txt | 2 +- share/branding/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt index ff12059ca..11f772204 100644 --- a/share/branding/CMakeLists.txt +++ b/share/branding/CMakeLists.txt @@ -1,2 +1,2 @@ -file(GLOB _FILES "README" "*.svg") +file(GLOB _FILES "README" "*.svg" "*.ttf") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am index f992c8165..d47f206d6 100644 --- a/share/branding/Makefile.am +++ b/share/branding/Makefile.am @@ -5,10 +5,11 @@ iconsdir = $(datadir)/inkscape/icons branding_DATA = \ README \ inkscape.svg \ + inkscape-flat.svg \ sodipodi.svg \ + euphoriascript-regular.ttf \ tux.svg \ - draw-freely.svg \ - draw-freely.ru.svg + draw-freely.svg icons_DATA = \ inkscape.svg -- cgit v1.2.3 From f26d3e191ae2d1d1cf5b52a379a24e96afc1a518 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 16 Mar 2016 07:56:42 +0100 Subject: Updates to the branding folder. Set also OFT typos (bzr r14711) --- share/branding/CMakeLists.txt | 2 +- share/branding/EuphoriaScript-Regular.otf | Bin 0 -> 23632 bytes share/branding/LinLibertine_DR.otf | Bin 0 -> 383672 bytes share/branding/Makefile.am | 7 +- share/branding/draw-freely.svg | 132 ------------------------------ share/branding/euphoriascript-regular.ttf | Bin 38424 -> 0 bytes share/branding/inkscape-text.svg | 130 +++++++++++++++++++++++++++++ 7 files changed, 135 insertions(+), 136 deletions(-) create mode 100644 share/branding/EuphoriaScript-Regular.otf create mode 100644 share/branding/LinLibertine_DR.otf delete mode 100644 share/branding/draw-freely.svg delete mode 100644 share/branding/euphoriascript-regular.ttf create mode 100644 share/branding/inkscape-text.svg diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt index 11f772204..0bfd54267 100644 --- a/share/branding/CMakeLists.txt +++ b/share/branding/CMakeLists.txt @@ -1,2 +1,2 @@ -file(GLOB _FILES "README" "*.svg" "*.ttf") +file(GLOB _FILES "README" "*.svg" "*.oft") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) diff --git a/share/branding/EuphoriaScript-Regular.otf b/share/branding/EuphoriaScript-Regular.otf new file mode 100644 index 000000000..6f475a68e Binary files /dev/null and b/share/branding/EuphoriaScript-Regular.otf differ diff --git a/share/branding/LinLibertine_DR.otf b/share/branding/LinLibertine_DR.otf new file mode 100644 index 000000000..4ff287426 Binary files /dev/null and b/share/branding/LinLibertine_DR.otf differ diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am index d47f206d6..1561dbf2c 100644 --- a/share/branding/Makefile.am +++ b/share/branding/Makefile.am @@ -6,10 +6,11 @@ branding_DATA = \ README \ inkscape.svg \ inkscape-flat.svg \ + inkscape-text.svg \ sodipodi.svg \ - euphoriascript-regular.ttf \ - tux.svg \ - draw-freely.svg + LinLibertine_DR.otf \ + EuphoriaScript-Regular.otf \ + tux.svg icons_DATA = \ inkscape.svg diff --git a/share/branding/draw-freely.svg b/share/branding/draw-freely.svg deleted file mode 100644 index c46109386..000000000 --- a/share/branding/draw-freely.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml - - - - - -Draw Freely - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/share/branding/euphoriascript-regular.ttf b/share/branding/euphoriascript-regular.ttf deleted file mode 100644 index 0c434cb0e..000000000 Binary files a/share/branding/euphoriascript-regular.ttf and /dev/null differ diff --git a/share/branding/inkscape-text.svg b/share/branding/inkscape-text.svg new file mode 100644 index 000000000..e025b1680 --- /dev/null +++ b/share/branding/inkscape-text.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + + + + + +Draw Freely + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +INKSCAPE + -- cgit v1.2.3 From 52182947eb952812b093f79e1ec121fa719f084b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 16 Mar 2016 10:58:21 +0100 Subject: [Bug #1545726] Incorrect FSF address in many extension files. Fixed bugs: - https://launchpad.net/bugs/1545726 (bzr r14712) --- share/extensions/Barcode/Base.py | 2 +- share/extensions/Barcode/BaseEan.py | 2 +- share/extensions/Barcode/Code128.py | 2 +- share/extensions/Barcode/Code25i.py | 2 +- share/extensions/Barcode/Code39.py | 2 +- share/extensions/Barcode/Code39Ext.py | 2 +- share/extensions/Barcode/Code93.py | 2 +- share/extensions/Barcode/Ean13.py | 2 +- share/extensions/Barcode/Ean5.py | 2 +- share/extensions/Barcode/Ean8.py | 2 +- share/extensions/Barcode/Rm4scc.py | 2 +- share/extensions/Barcode/Upca.py | 2 +- share/extensions/Barcode/Upce.py | 2 +- share/extensions/Barcode/__init__.py | 2 +- share/extensions/addnodes.py | 2 +- share/extensions/bezmisc.py | 2 +- share/extensions/chardataeffect.py | 2 +- share/extensions/coloreffect.py | 2 +- share/extensions/convert2dashes.py | 2 +- share/extensions/cubicsuperpath.py | 2 +- share/extensions/dimension.py | 2 +- share/extensions/dm2svg.py | 2 +- share/extensions/dots.py | 2 +- share/extensions/draw_from_triangle.py | 2 +- share/extensions/dxf_input.py | 2 +- share/extensions/dxf_outlines.py | 2 +- share/extensions/edge3d.py | 2 +- share/extensions/embedimage.py | 2 +- share/extensions/extractimage.py | 2 +- share/extensions/extrude.py | 2 +- share/extensions/ffgeom.py | 2 +- share/extensions/flatten.py | 2 +- share/extensions/foldablebox.py | 2 +- share/extensions/fractalize.py | 2 +- share/extensions/funcplot.py | 2 +- share/extensions/gcodetools.py | 2 +- share/extensions/generate_voronoi.py | 2 +- share/extensions/gimp_xcf.py | 2 +- share/extensions/grid_cartesian.py | 2 +- share/extensions/grid_isometric.py | 2 +- share/extensions/grid_polar.py | 2 +- share/extensions/guides_creator.py | 2 +- share/extensions/handles.py | 2 +- share/extensions/hershey.py | 2 +- share/extensions/hpgl_decoder.py | 2 +- share/extensions/hpgl_encoder.py | 2 +- share/extensions/hpgl_input.py | 2 +- share/extensions/hpgl_output.py | 2 +- share/extensions/image_attributes.py | 2 +- share/extensions/ink2canvas.py | 2 +- share/extensions/ink2canvas/canvas.py | 2 +- share/extensions/ink2canvas/svg.py | 2 +- share/extensions/inkex.py | 2 +- share/extensions/inkwebeffect.py | 2 +- share/extensions/interp.py | 2 +- share/extensions/interp_att_g.py | 2 +- share/extensions/layers2svgfont.py | 2 +- share/extensions/layout_nup.py | 2 +- share/extensions/lindenmayer.py | 2 +- share/extensions/lorem_ipsum.py | 2 +- share/extensions/markers_strokepaint.py | 2 +- share/extensions/measure.py | 2 +- share/extensions/merge_styles.py | 2 +- share/extensions/motion.py | 2 +- share/extensions/new_glyph_layer.py | 2 +- share/extensions/next_glyph_layer.py | 2 +- share/extensions/param_curves.py | 2 +- share/extensions/pathalongpath.py | 2 +- share/extensions/pathmodifier.py | 2 +- share/extensions/pathscatter.py | 2 +- share/extensions/perfectboundcover.py | 2 +- share/extensions/perspective.py | 2 +- share/extensions/plotter.py | 2 +- share/extensions/polyhedron_3d.py | 2 +- share/extensions/previous_glyph_layer.py | 2 +- share/extensions/print_win32_vector.py | 2 +- share/extensions/printing_marks.py | 2 +- share/extensions/pturtle.py | 2 +- share/extensions/radiusrand.py | 2 +- share/extensions/render_alphabetsoup.py | 2 +- share/extensions/render_barcode.py | 2 +- share/extensions/render_barcode_datamatrix.py | 2 +- share/extensions/render_gear_rack.py | 2 +- share/extensions/render_gears.py | 2 +- share/extensions/rtree.py | 2 +- share/extensions/rubberstretch.py | 2 +- share/extensions/setup_typography_canvas.py | 2 +- share/extensions/simplepath.py | 2 +- share/extensions/simplestyle.py | 2 +- share/extensions/simpletransform.py | 2 +- share/extensions/spirograph.py | 2 +- share/extensions/split.py | 2 +- share/extensions/straightseg.py | 2 +- share/extensions/summersnight.py | 2 +- share/extensions/svg_and_media_zip_output.py | 2 +- share/extensions/svgcalendar.py | 2 +- share/extensions/svgfont2layers.py | 2 +- share/extensions/tar_layers.py | 2 +- share/extensions/triangle.py | 2 +- share/extensions/voronoi2svg.py | 2 +- share/extensions/web-set-att.py | 2 +- share/extensions/web-transmit-att.py | 2 +- share/extensions/webslicer_create_group.py | 2 +- share/extensions/webslicer_create_rect.py | 2 +- share/extensions/webslicer_effect.py | 2 +- share/extensions/webslicer_export.py | 2 +- share/extensions/whirl.py | 2 +- share/extensions/wireframe_sphere.py | 2 +- 108 files changed, 108 insertions(+), 108 deletions(-) diff --git a/share/extensions/Barcode/Base.py b/share/extensions/Barcode/Base.py index b7429f84f..1aa1f8415 100644 --- a/share/extensions/Barcode/Base.py +++ b/share/extensions/Barcode/Base.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Base module for rendering barcodes for Inkscape. diff --git a/share/extensions/Barcode/BaseEan.py b/share/extensions/Barcode/BaseEan.py index 05c9b1c39..4ceaeed4a 100644 --- a/share/extensions/Barcode/BaseEan.py +++ b/share/extensions/Barcode/BaseEan.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Some basic common code shared between EAN and UCP generators. diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py index 618ce7817..7ff92088f 100644 --- a/share/extensions/Barcode/Code128.py +++ b/share/extensions/Barcode/Code128.py @@ -17,7 +17,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code128/EAN128 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code25i.py b/share/extensions/Barcode/Code25i.py index 51346be60..9812d8598 100644 --- a/share/extensions/Barcode/Code25i.py +++ b/share/extensions/Barcode/Code25i.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Generate barcodes for Code25-interleaved 2 of 5, for Inkscape. diff --git a/share/extensions/Barcode/Code39.py b/share/extensions/Barcode/Code39.py index ade397463..3cd8467a8 100644 --- a/share/extensions/Barcode/Code39.py +++ b/share/extensions/Barcode/Code39.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code39Ext.py b/share/extensions/Barcode/Code39Ext.py index b6df47de2..3edf82d2e 100644 --- a/share/extensions/Barcode/Code39Ext.py +++ b/share/extensions/Barcode/Code39Ext.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 Extended barcodes. Designed for Inkscape. diff --git a/share/extensions/Barcode/Code93.py b/share/extensions/Barcode/Code93.py index 866ec6036..2b90fdda1 100644 --- a/share/extensions/Barcode/Code93.py +++ b/share/extensions/Barcode/Code93.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code93 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean13.py b/share/extensions/Barcode/Ean13.py index 3bad5d6e5..7e138f25a 100644 --- a/share/extensions/Barcode/Ean13.py +++ b/share/extensions/Barcode/Ean13.py @@ -15,7 +15,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN13 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean5.py b/share/extensions/Barcode/Ean5.py index 1bd26a4bd..d2e38a063 100644 --- a/share/extensions/Barcode/Ean5.py +++ b/share/extensions/Barcode/Ean5.py @@ -14,7 +14,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN5 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean8.py b/share/extensions/Barcode/Ean8.py index 83e82814a..010dff03e 100644 --- a/share/extensions/Barcode/Ean8.py +++ b/share/extensions/Barcode/Ean8.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN8 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Rm4scc.py b/share/extensions/Barcode/Rm4scc.py index 0fb154280..d40cd2435 100644 --- a/share/extensions/Barcode/Rm4scc.py +++ b/share/extensions/Barcode/Rm4scc.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for RM4CC barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upca.py b/share/extensions/Barcode/Upca.py index d69ed11e6..bc6ffdf29 100644 --- a/share/extensions/Barcode/Upca.py +++ b/share/extensions/Barcode/Upca.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCA barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upce.py b/share/extensions/Barcode/Upce.py index eee2a739c..d25c9c6cc 100644 --- a/share/extensions/Barcode/Upce.py +++ b/share/extensions/Barcode/Upce.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCE barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py index e4e328ae3..9ad412448 100644 --- a/share/extensions/Barcode/__init__.py +++ b/share/extensions/Barcode/__init__.py @@ -13,7 +13,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Renderer for barcodes, SVG extention for Inkscape. diff --git a/share/extensions/addnodes.py b/share/extensions/addnodes.py index d78ab55e7..4e57f0185 100755 --- a/share/extensions/addnodes.py +++ b/share/extensions/addnodes.py @@ -19,7 +19,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/bezmisc.py b/share/extensions/bezmisc.py index 0c7ad4957..c36e8e1b4 100755 --- a/share/extensions/bezmisc.py +++ b/share/extensions/bezmisc.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, cmath diff --git a/share/extensions/chardataeffect.py b/share/extensions/chardataeffect.py index a1758c890..f81de6b80 100755 --- a/share/extensions/chardataeffect.py +++ b/share/extensions/chardataeffect.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, optparse, inkex diff --git a/share/extensions/coloreffect.py b/share/extensions/coloreffect.py index 8f67c6090..a6b5cfe41 100755 --- a/share/extensions/coloreffect.py +++ b/share/extensions/coloreffect.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, copy, simplestyle, inkex import random diff --git a/share/extensions/convert2dashes.py b/share/extensions/convert2dashes.py index 1228b247c..3910d8e82 100755 --- a/share/extensions/convert2dashes.py +++ b/share/extensions/convert2dashes.py @@ -18,7 +18,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/cubicsuperpath.py b/share/extensions/cubicsuperpath.py index 925efdb04..b505e8c4f 100755 --- a/share/extensions/cubicsuperpath.py +++ b/share/extensions/cubicsuperpath.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import simplepath diff --git a/share/extensions/dimension.py b/share/extensions/dimension.py index 30b674201..462a05bae 100755 --- a/share/extensions/dimension.py +++ b/share/extensions/dimension.py @@ -29,7 +29,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/dm2svg.py b/share/extensions/dm2svg.py index 908fedbad..74afe6adf 100755 --- a/share/extensions/dm2svg.py +++ b/share/extensions/dm2svg.py @@ -18,7 +18,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import struct diff --git a/share/extensions/dots.py b/share/extensions/dots.py index dc533ffb6..296a56dfc 100755 --- a/share/extensions/dots.py +++ b/share/extensions/dots.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, simplepath, math diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py index 42cda7035..5efabfbba 100755 --- a/share/extensions/draw_from_triangle.py +++ b/share/extensions/draw_from_triangle.py @@ -28,7 +28,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index acfed0921..30adb73f9 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -19,7 +19,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py index b7ae0ef14..0e8cb7f62 100755 --- a/share/extensions/dxf_outlines.py +++ b/share/extensions/dxf_outlines.py @@ -28,7 +28,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/edge3d.py b/share/extensions/edge3d.py index d2d8ead5c..86df52908 100755 --- a/share/extensions/edge3d.py +++ b/share/extensions/edge3d.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, sys, copy from math import degrees, atan2 diff --git a/share/extensions/embedimage.py b/share/extensions/embedimage.py index bdc15bde2..136c20f98 100755 --- a/share/extensions/embedimage.py +++ b/share/extensions/embedimage.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extractimage.py b/share/extensions/extractimage.py index 62dc83c87..aae7bd062 100755 --- a/share/extensions/extractimage.py +++ b/share/extensions/extractimage.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extrude.py b/share/extensions/extrude.py index c91ea645e..8db6b1512 100755 --- a/share/extensions/extrude.py +++ b/share/extensions/extrude.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/ffgeom.py b/share/extensions/ffgeom.py index ef8799b97..a6d268239 100755 --- a/share/extensions/ffgeom.py +++ b/share/extensions/ffgeom.py @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with FretFind 2-D; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import math try: diff --git a/share/extensions/flatten.py b/share/extensions/flatten.py index f5add5fc5..7b4d2a7d6 100755 --- a/share/extensions/flatten.py +++ b/share/extensions/flatten.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplepath, cspsubdiv diff --git a/share/extensions/foldablebox.py b/share/extensions/foldablebox.py index 9d58974c5..772083094 100755 --- a/share/extensions/foldablebox.py +++ b/share/extensions/foldablebox.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.2" diff --git a/share/extensions/fractalize.py b/share/extensions/fractalize.py index 901a8f761..c6bbe397a 100755 --- a/share/extensions/fractalize.py +++ b/share/extensions/fractalize.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, simplepath diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index f37bf335e..c0fb3e525 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -17,7 +17,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is a modified version of wavy.py by Aaron Spike. diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py index 12f438cca..4cb5b2696 100755 --- a/share/extensions/gcodetools.py +++ b/share/extensions/gcodetools.py @@ -59,7 +59,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ ### diff --git a/share/extensions/generate_voronoi.py b/share/extensions/generate_voronoi.py index 7acd1be5f..8907db493 100755 --- a/share/extensions/generate_voronoi.py +++ b/share/extensions/generate_voronoi.py @@ -17,7 +17,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py index bdb0d1e4c..39dec8c13 100755 --- a/share/extensions/gimp_xcf.py +++ b/share/extensions/gimp_xcf.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py index ae4c6b6b4..26270002d 100755 --- a/share/extensions/grid_cartesian.py +++ b/share/extensions/grid_cartesian.py @@ -19,7 +19,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/grid_isometric.py b/share/extensions/grid_isometric.py index 6202fd9e2..d80be6c4d 100755 --- a/share/extensions/grid_isometric.py +++ b/share/extensions/grid_isometric.py @@ -20,7 +20,7 @@ #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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import inkex diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py index 350b21195..f3d5dbf41 100755 --- a/share/extensions/grid_polar.py +++ b/share/extensions/grid_polar.py @@ -17,7 +17,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py index a8c7bb18a..e0aa6cadf 100755 --- a/share/extensions/guides_creator.py +++ b/share/extensions/guides_creator.py @@ -25,7 +25,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # Inspired by hello_world turorial by Blackhex and Rubikcube diff --git a/share/extensions/handles.py b/share/extensions/handles.py index 0cbdef44c..6987a3bb2 100755 --- a/share/extensions/handles.py +++ b/share/extensions/handles.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, simplestyle diff --git a/share/extensions/hershey.py b/share/extensions/hershey.py index d0b27b129..471959b10 100755 --- a/share/extensions/hershey.py +++ b/share/extensions/hershey.py @@ -17,7 +17,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import hersheydata #data file w/ Hershey font data import inkex diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py index a54a81e81..8f3c18e42 100644 --- a/share/extensions/hpgl_decoder.py +++ b/share/extensions/hpgl_decoder.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index 0e4158725..b9975215f 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_input.py b/share/extensions/hpgl_input.py index a85c32b34..8cc7edaaf 100755 --- a/share/extensions/hpgl_input.py +++ b/share/extensions/hpgl_input.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py index 78edba53b..477db40e7 100755 --- a/share/extensions/hpgl_output.py +++ b/share/extensions/hpgl_output.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/image_attributes.py b/share/extensions/image_attributes.py index ddd5a8b87..80ad62c26 100755 --- a/share/extensions/image_attributes.py +++ b/share/extensions/image_attributes.py @@ -21,7 +21,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library diff --git a/share/extensions/ink2canvas.py b/share/extensions/ink2canvas.py index b5c0fbb7b..f44c3e48f 100755 --- a/share/extensions/ink2canvas.py +++ b/share/extensions/ink2canvas.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/canvas.py b/share/extensions/ink2canvas/canvas.py index 139835f0e..a88d368d3 100644 --- a/share/extensions/ink2canvas/canvas.py +++ b/share/extensions/ink2canvas/canvas.py @@ -13,7 +13,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/svg.py b/share/extensions/ink2canvas/svg.py index b60b2ca9f..f4dca8279 100644 --- a/share/extensions/ink2canvas/svg.py +++ b/share/extensions/ink2canvas/svg.py @@ -13,7 +13,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 0fdaeea75..16aff2fc8 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -24,7 +24,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import copy import gettext diff --git a/share/extensions/inkwebeffect.py b/share/extensions/inkwebeffect.py index 994f74dea..4e29892de 100755 --- a/share/extensions/inkwebeffect.py +++ b/share/extensions/inkwebeffect.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, sys, os, re diff --git a/share/extensions/interp.py b/share/extensions/interp.py index 093a98fda..9dbb996e4 100755 --- a/share/extensions/interp.py +++ b/share/extensions/interp.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplestyle, copy, math, bezmisc, simpletransform, pathmodifier diff --git a/share/extensions/interp_att_g.py b/share/extensions/interp_att_g.py index 168e7ffb0..2ae46b46d 100755 --- a/share/extensions/interp_att_g.py +++ b/share/extensions/interp_att_g.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/layers2svgfont.py b/share/extensions/layers2svgfont.py index 379e8e34c..e449ae380 100755 --- a/share/extensions/layers2svgfont.py +++ b/share/extensions/layers2svgfont.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/layout_nup.py b/share/extensions/layout_nup.py index 266a3950d..022aa0d3f 100755 --- a/share/extensions/layout_nup.py +++ b/share/extensions/layout_nup.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex import sys diff --git a/share/extensions/lindenmayer.py b/share/extensions/lindenmayer.py index eb0d84328..8e1c4ac22 100755 --- a/share/extensions/lindenmayer.py +++ b/share/extensions/lindenmayer.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/lorem_ipsum.py b/share/extensions/lorem_ipsum.py index 20a2fdd18..efb2361ea 100755 --- a/share/extensions/lorem_ipsum.py +++ b/share/extensions/lorem_ipsum.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' ''' Example filltext sentences generated over at http://lipsum.com/ diff --git a/share/extensions/markers_strokepaint.py b/share/extensions/markers_strokepaint.py index d92716939..76284b234 100755 --- a/share/extensions/markers_strokepaint.py +++ b/share/extensions/markers_strokepaint.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import random diff --git a/share/extensions/measure.py b/share/extensions/measure.py index 9fc632c2a..fe981e39e 100755 --- a/share/extensions/measure.py +++ b/share/extensions/measure.py @@ -23,7 +23,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODO: * should use the standard attributes for text diff --git a/share/extensions/merge_styles.py b/share/extensions/merge_styles.py index f028bf4ce..cdd7b5ed5 100755 --- a/share/extensions/merge_styles.py +++ b/share/extensions/merge_styles.py @@ -14,7 +14,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Merges styles into class based styles and removes. diff --git a/share/extensions/motion.py b/share/extensions/motion.py index 9bf31e008..3af80d5c1 100755 --- a/share/extensions/motion.py +++ b/share/extensions/motion.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplestyle, simplepath, bezmisc diff --git a/share/extensions/new_glyph_layer.py b/share/extensions/new_glyph_layer.py index cb7dba854..7261baa2d 100755 --- a/share/extensions/new_glyph_layer.py +++ b/share/extensions/new_glyph_layer.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/next_glyph_layer.py b/share/extensions/next_glyph_layer.py index f8a43aff5..5f152c71e 100755 --- a/share/extensions/next_glyph_layer.py +++ b/share/extensions/next_glyph_layer.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/param_curves.py b/share/extensions/param_curves.py index d8f880d0c..e38d5208a 100755 --- a/share/extensions/param_curves.py +++ b/share/extensions/param_curves.py @@ -18,7 +18,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is derived by Michel Chatelain from funcplot.py. His changes are in the Public Domain. diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py index 234430acd..93bb99d6b 100755 --- a/share/extensions/pathalongpath.py +++ b/share/extensions/pathalongpath.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/pathmodifier.py b/share/extensions/pathmodifier.py index ff2bbfb3a..d80b6eeae 100755 --- a/share/extensions/pathmodifier.py +++ b/share/extensions/pathmodifier.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines a basic class (PathModifier) of effects whose purpose is diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py index 5c2857979..92af6ad76 100755 --- a/share/extensions/pathscatter.py +++ b/share/extensions/pathscatter.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/perfectboundcover.py b/share/extensions/perfectboundcover.py index 9f81dbb36..e69bcf4c2 100755 --- a/share/extensions/perfectboundcover.py +++ b/share/extensions/perfectboundcover.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, inkex diff --git a/share/extensions/perspective.py b/share/extensions/perspective.py index a6ee5810b..febe34a22 100755 --- a/share/extensions/perspective.py +++ b/share/extensions/perspective.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Perspective approach & math by Dmitry Platonov, shadowjack@mail.ru, 2006 """ diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index 7e34f2953..60858cc6c 100755 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py index 8e4a8e8e6..7ce8b1c6d 100755 --- a/share/extensions/polyhedron_3d.py +++ b/share/extensions/polyhedron_3d.py @@ -46,7 +46,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/previous_glyph_layer.py b/share/extensions/previous_glyph_layer.py index 801570d65..5e9de1fb8 100755 --- a/share/extensions/previous_glyph_layer.py +++ b/share/extensions/previous_glyph_layer.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/print_win32_vector.py b/share/extensions/print_win32_vector.py index 37c2021ac..bf8e89845 100755 --- a/share/extensions/print_win32_vector.py +++ b/share/extensions/print_win32_vector.py @@ -25,7 +25,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library from ctypes import * diff --git a/share/extensions/printing_marks.py b/share/extensions/printing_marks.py index 0306048d6..6c718da01 100755 --- a/share/extensions/printing_marks.py +++ b/share/extensions/printing_marks.py @@ -21,7 +21,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' from subprocess import Popen, PIPE, STDOUT diff --git a/share/extensions/pturtle.py b/share/extensions/pturtle.py index b2740a4bc..a4925bf4c 100755 --- a/share/extensions/pturtle.py +++ b/share/extensions/pturtle.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math class pTurtle: diff --git a/share/extensions/radiusrand.py b/share/extensions/radiusrand.py index e272a50c4..e4585ccd4 100755 --- a/share/extensions/radiusrand.py +++ b/share/extensions/radiusrand.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, cubicsuperpath diff --git a/share/extensions/render_alphabetsoup.py b/share/extensions/render_alphabetsoup.py index a2cbcb978..06c82cb2d 100755 --- a/share/extensions/render_alphabetsoup.py +++ b/share/extensions/render_alphabetsoup.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import copy diff --git a/share/extensions/render_barcode.py b/share/extensions/render_barcode.py index 4f1464a92..381f3fc76 100755 --- a/share/extensions/render_barcode.py +++ b/share/extensions/render_barcode.py @@ -14,7 +14,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Inkscape's general barcode extension. Run from within inkscape or use the diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py index 72ffddbe6..82c827bb8 100755 --- a/share/extensions/render_barcode_datamatrix.py +++ b/share/extensions/render_barcode_datamatrix.py @@ -43,7 +43,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes diff --git a/share/extensions/render_gear_rack.py b/share/extensions/render_gear_rack.py index 63433aadb..95076ba64 100755 --- a/share/extensions/render_gear_rack.py +++ b/share/extensions/render_gear_rack.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/render_gears.py b/share/extensions/render_gears.py index 2584117f2..fbec5d052 100755 --- a/share/extensions/render_gears.py +++ b/share/extensions/render_gears.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/rtree.py b/share/extensions/rtree.py index c0dc1cca6..b336c4e3a 100755 --- a/share/extensions/rtree.py +++ b/share/extensions/rtree.py @@ -15,7 +15,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/rubberstretch.py b/share/extensions/rubberstretch.py index 95d1cffb5..2e6b85ad5 100755 --- a/share/extensions/rubberstretch.py +++ b/share/extensions/rubberstretch.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr ''' diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py index a1000f2d1..209c9757f 100755 --- a/share/extensions/setup_typography_canvas.py +++ b/share/extensions/setup_typography_canvas.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/simplepath.py b/share/extensions/simplepath.py index 514dd4666..5d99e46e7 100644 --- a/share/extensions/simplepath.py +++ b/share/extensions/simplepath.py @@ -16,7 +16,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import re, math diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py index ca33e68a4..32328a40d 100644 --- a/share/extensions/simplestyle.py +++ b/share/extensions/simplestyle.py @@ -17,7 +17,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ svgcolors={ diff --git a/share/extensions/simpletransform.py b/share/extensions/simpletransform.py index 8b6f46935..f6f68d2be 100644 --- a/share/extensions/simpletransform.py +++ b/share/extensions/simpletransform.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines several functions to make handling of transform diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py index e702344a5..02cb02bcd 100755 --- a/share/extensions/spirograph.py +++ b/share/extensions/spirograph.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math from simpletransform import computePointInNode diff --git a/share/extensions/split.py b/share/extensions/split.py index 18d4327fe..4e83b3d33 100755 --- a/share/extensions/split.py +++ b/share/extensions/split.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/straightseg.py b/share/extensions/straightseg.py index f18658012..9222ed5b5 100755 --- a/share/extensions/straightseg.py +++ b/share/extensions/straightseg.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplepath, sys diff --git a/share/extensions/summersnight.py b/share/extensions/summersnight.py index fbf88fe92..7af4bb571 100755 --- a/share/extensions/summersnight.py +++ b/share/extensions/summersnight.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py index 20a5dac18..c5963b721 100755 --- a/share/extensions/svg_and_media_zip_output.py +++ b/share/extensions/svg_and_media_zip_output.py @@ -26,7 +26,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODOs - fix bug: not saving existing .zip after a Collect for Output is run diff --git a/share/extensions/svgcalendar.py b/share/extensions/svgcalendar.py index a4269f5d7..9f221a807 100755 --- a/share/extensions/svgcalendar.py +++ b/share/extensions/svgcalendar.py @@ -25,7 +25,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.3" diff --git a/share/extensions/svgfont2layers.py b/share/extensions/svgfont2layers.py index 48100e3f5..1a392c72c 100755 --- a/share/extensions/svgfont2layers.py +++ b/share/extensions/svgfont2layers.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/tar_layers.py b/share/extensions/tar_layers.py index 3707af1f8..3ba5aa55e 100755 --- a/share/extensions/tar_layers.py +++ b/share/extensions/tar_layers.py @@ -14,7 +14,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ An extension to export multiple svg files from a single svg file containing layers. diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py index ecd977d40..32bd2a1db 100755 --- a/share/extensions/triangle.py +++ b/share/extensions/triangle.py @@ -29,7 +29,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/voronoi2svg.py b/share/extensions/voronoi2svg.py index 26a89393c..c7033b23b 100755 --- a/share/extensions/voronoi2svg.py +++ b/share/extensions/voronoi2svg.py @@ -24,7 +24,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/web-set-att.py b/share/extensions/web-set-att.py index b224ed9aa..0dafcb974 100755 --- a/share/extensions/web-set-att.py +++ b/share/extensions/web-set-att.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/web-transmit-att.py b/share/extensions/web-transmit-att.py index 414eb12ea..bae6956b2 100755 --- a/share/extensions/web-transmit-att.py +++ b/share/extensions/web-transmit-att.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/webslicer_create_group.py b/share/extensions/webslicer_create_group.py index dd48c3e96..47e5f706f 100755 --- a/share/extensions/webslicer_create_group.py +++ b/share/extensions/webslicer_create_group.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_create_rect.py b/share/extensions/webslicer_create_rect.py index b4e6858af..b68cd9ad8 100755 --- a/share/extensions/webslicer_create_rect.py +++ b/share/extensions/webslicer_create_rect.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_effect.py b/share/extensions/webslicer_effect.py index d91d0ce85..acb78fcbd 100755 --- a/share/extensions/webslicer_effect.py +++ b/share/extensions/webslicer_effect.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/webslicer_export.py b/share/extensions/webslicer_export.py index a8a3c67ba..47db5369c 100755 --- a/share/extensions/webslicer_export.py +++ b/share/extensions/webslicer_export.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/whirl.py b/share/extensions/whirl.py index 7ee9cc0a2..93e04c60d 100755 --- a/share/extensions/whirl.py +++ b/share/extensions/whirl.py @@ -14,7 +14,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, cubicsuperpath from simpletransform import computePointInNode diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index bda06af21..64a1266b6 100755 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -45,7 +45,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes -- cgit v1.2.3 From 67901523e5dc2f6ba839550bd5790fe143c3143e Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Wed, 16 Mar 2016 18:20:29 +0100 Subject: [Bug #1558153] Typos and tabs instead of spaces in extension module. Fixed bugs: - https://launchpad.net/bugs/1558153 (bzr r14713) --- doc/extension_system.txt | 6 +++--- src/extension/implementation/implementation.h | 24 ++++++++++++------------ src/extension/implementation/script.cpp | 18 +++++++++--------- src/extension/init.cpp | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/extension_system.txt b/doc/extension_system.txt index e1918701c..4902fe004 100644 --- a/doc/extension_system.txt +++ b/doc/extension_system.txt @@ -321,7 +321,7 @@ Inkscape, such as in the case of compiled-in printing modules. Most users will never need to write this type of extension, they are pretty much for Inkscape core developers only. -=== Writeing Your Extension === +=== Writing Your Extension === This section provides some guidance and examples for implementing different kinds of Extensions. @@ -334,7 +334,7 @@ different kinds of Extensions. === Creating an INX File === -Every extension must have a corrosponding *.inx file. This is an XML +Every extension must have a corresponding *.inx file. This is an XML file that provides Inkscape with information about the module and allows it to load the info without needing to access the module itself. The *.inx file contains enough info for Inkscape to set up menu items and @@ -342,7 +342,7 @@ know what kinds of functionality to expect from the extension. === Packaging Your Extension === -=== Contributing Your Extensino to the Inkscape Community === +=== Contributing Your Extension to the Inkscape Community === Once your extension is complete, you may wish to share it with the community. There are of course no hard and fast rules for how to share diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index f6f933aaf..1232ae0c8 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -18,7 +18,7 @@ #include <2geom/forward.h> namespace Gtk { - class Widget; + class Widget; } class SPDocument; @@ -33,7 +33,7 @@ class View; } // namespace UI namespace XML { - class Node; + class Node; } // namespace XML namespace Extension { @@ -51,18 +51,18 @@ namespace Implementation { */ class ImplementationDocumentCache { - /** + /** * The document that this instance is working on. */ - Inkscape::UI::View::View * _view; + Inkscape::UI::View::View * _view; public: - ImplementationDocumentCache (Inkscape::UI::View::View * view) : - _view(view) - { - return; - }; - virtual ~ImplementationDocumentCache ( ) { return; }; - Inkscape::UI::View::View const * view ( ) { return _view; }; + ImplementationDocumentCache (Inkscape::UI::View::View * view) : + _view(view) + { + return; + }; + virtual ~ImplementationDocumentCache ( ) { return; }; + Inkscape::UI::View::View const * view ( ) { return _view; }; }; /** @@ -116,7 +116,7 @@ public: // ----- Effect functions ----- /** Find out information about the file. */ virtual Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, - Inkscape::UI::View::View *view, + Inkscape::UI::View::View *view, sigc::signal *changeSignal, ImplementationDocumentCache *docCache); virtual void effect(Inkscape::Extension::Effect * /*module*/, diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 4cb0c9b73..f990598eb 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -152,7 +152,7 @@ Script::Script() : } /** - * brief Destructor + * \brief Destructor */ Script::~Script() { @@ -280,9 +280,9 @@ bool Script::check_existence(const std::string &command) /** \return none - \brief This function 'loads' an extention, basically it determines - the full command for the extention and stores that. - \param module The extention to be loaded. + \brief This function 'loads' an extension, basically it determines + the full command for the extension and stores that. + \param module The extension to be loaded. The most difficult part about this function is finding the actual command through all of the Reprs. Basically it is hidden down a @@ -292,7 +292,7 @@ bool Script::check_existence(const std::string &command) At that point all of the loops are exited, and there is an if statement to make sure they didn't exit because of not finding - the command. If that's the case, the extention doesn't get loaded + the command. If that's the case, the extension doesn't get loaded and should error out at a higher level. */ @@ -545,17 +545,17 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, /** \return none - \brief This function uses an extention to save a document. It first + \brief This function uses an extension to save a document. It first creates an SVG file of the document, and then runs it through the script. - \param module Extention to be used + \param module Extension to be used \param doc Document to be saved \param filename The name to save the final file as \return false in case of any failure writing the file, otherwise true Well, at some point people need to save - it is really what makes the entire application useful. And, it is possible that someone - would want to use an extetion for this, so we need a function to + would want to use an extension for this, so we need a function to do that eh? First things first, the document is saved to a temporary file that @@ -563,7 +563,7 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, ink_ext_ as a prefix. Don't worry, this file gets deleted at the end of the function. - After we have the SVG file, then extention_execute is called with + After we have the SVG file, then Script::execute is called with the temporary file name and the final output filename. This should put the output of the script into the final output file. We then delete the temporary file. diff --git a/src/extension/init.cpp b/src/extension/init.cpp index c16a5a899..af7af2cb1 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -1,6 +1,6 @@ /* * This is what gets executed to initialize all of the modules. For - * the internal modules this invovles executing their initialization + * the internal modules this involves executing their initialization * functions, for external ones it involves reading their .spmodule * files and bringing them into Sodipodi. * -- cgit v1.2.3 From 84dc0d205cca2c02d257a3f388eb316c16cbb208 Mon Sep 17 00:00:00 2001 From: jonathan-underwood <> Date: Fri, 18 Mar 2016 07:44:35 +0100 Subject: [Bug #1545769] Adding MimeTypes in the desktop.in file. Fixed bugs: - https://launchpad.net/bugs/1545769 (bzr r14714) --- inkscape.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inkscape.desktop.in b/inkscape.desktop.in index 771ceccc7..4ce25a287 100644 --- a/inkscape.desktop.in +++ b/inkscape.desktop.in @@ -7,7 +7,7 @@ _Comment=Create and edit Scalable Vector Graphics images _Keywords=image;editor;vector;drawing; Type=Application Categories=Graphics;VectorGraphics;GTK; -MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; +MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; Exec=inkscape %F TryExec=inkscape Terminal=false -- cgit v1.2.3 From b288e8e5d98684ae81c109a4c4ffa1d25fc4d727 Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Fri, 18 Mar 2016 08:04:08 +0100 Subject: [Bug #1558177] Simplify if conditions in Script.cpp. Fixed bugs: - https://launchpad.net/bugs/1558177 (bzr r14715) --- src/extension/implementation/script.cpp | 6 +----- src/extension/output.cpp | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index f990598eb..2ec17f947 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -232,11 +232,7 @@ bool Script::check_existence(const std::string &command) //Don't search when it is an absolute path. */ if (Glib::path_is_absolute(command)) { - if (Glib::file_test(command, Glib::FILE_TEST_EXISTS)) { - return true; - } else { - return false; - } + return Glib::file_test(command, Glib::FILE_TEST_EXISTS); } // First search in the current directory diff --git a/src/extension/output.cpp b/src/extension/output.cpp index 8de5583c7..83f0fed2f 100644 --- a/src/extension/output.cpp +++ b/src/extension/output.cpp @@ -192,8 +192,7 @@ Output::prefs (void) delete dialog; - if (response == Gtk::RESPONSE_OK) return true; - return false; + return (response == Gtk::RESPONSE_OK); } /** -- cgit v1.2.3 From fbc8d89437445c1024ab4ef2e838f177f408f9f1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 18 Mar 2016 10:16:49 +0100 Subject: Fix writing of 'x' and 'y' attributes in multiline text via sodipode:role="line". (bzr r14716) --- src/sp-text.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 4a5b1b1d6..7d4348d19 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -819,8 +819,8 @@ void TextTagAttributes::setFirstXY(Geom::Point &point) attributes.x.resize(1, zero_length); if (attributes.y.empty()) attributes.y.resize(1, zero_length); - attributes.x[0].computed = point[Geom::X]; - attributes.y[0].computed = point[Geom::Y]; + attributes.x[0] = point[Geom::X]; + attributes.y[0] = point[Geom::Y]; } void TextTagAttributes::mergeInto(Inkscape::Text::Layout::OptionalTextTagAttrs *output, Inkscape::Text::Layout::OptionalTextTagAttrs const &parent_attrs, unsigned parent_attrs_offset, bool copy_xy, bool copy_dxdyrotate) const -- cgit v1.2.3 From ae7a4f0320d820a6183dde933fba576bc2c9f58f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 18 Mar 2016 18:34:07 +0100 Subject: Bug #1419517 Fix Crash when applying new path effect after deleting pattern of Pattern-along-path LPE Fixed bugs: - https://launchpad.net/bugs/1419517 (bzr r14717) --- src/live_effects/parameter/path.cpp | 7 ++++++- src/sp-object.cpp | 15 +++++++-------- src/ui/tool/path-manipulator.cpp | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index e0369e662..7ea1d465c 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -294,7 +294,12 @@ void PathParam::set_new_value (Geom::PathVector const &newpath, bool write_to_svg) { remove_link(); - _pathvector = newpath; + if (newpath.empty()) { + param_set_and_write_default(); + return; + } else { + _pathvector = newpath; + } must_recalculate_pwd2 = true; if (write_to_svg) { diff --git a/src/sp-object.cpp b/src/sp-object.cpp index db66eb3e6..7dbc51b84 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -958,16 +958,15 @@ void SPObject::readAttr(gchar const *key) //g_assert(object != NULL); //g_assert(SP_IS_OBJECT(object)); g_assert(key != NULL); - //XML Tree being used here. - g_assert(this->getRepr() != NULL); + if (this->getRepr() != NULL ) { + unsigned int keyid = sp_attribute_lookup(key); + if (keyid != SP_ATTR_INVALID) { + /* Retrieve the 'key' attribute from the object's XML representation */ + gchar const *value = this->getRepr()->attribute(key); - unsigned int keyid = sp_attribute_lookup(key); - if (keyid != SP_ATTR_INVALID) { - /* Retrieve the 'key' attribute from the object's XML representation */ - gchar const *value = getRepr()->attribute(key); - - setKeyValue(keyid, value); + setKeyValue(keyid, value); + } } } diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index f4790c317..3b25439f3 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -1492,7 +1492,6 @@ void PathManipulator::_getGeometry() void PathManipulator::_setGeometry() { using namespace Inkscape::LivePathEffect; - if (empty()) return; if (!_lpe_key.empty()) { // copied from nodepath.cpp @@ -1505,6 +1504,7 @@ void PathManipulator::_setGeometry() LIVEPATHEFFECT(_path)->requestModified(SP_OBJECT_MODIFIED_FLAG); } } else { + if (empty()) return; //XML Tree being used here directly while it shouldn't be. if (_path->getRepr()->attribute("inkscape:original-d")) _path->set_original_curve(_spcurve, false, false); -- cgit v1.2.3 From 4596974f9ee43a2f5700e3daa468474179aaa829 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 18 Mar 2016 18:58:10 +0100 Subject: Remove code of a semifixed bug (bzr r14718) --- src/sp-object.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 7dbc51b84..db66eb3e6 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -958,15 +958,16 @@ void SPObject::readAttr(gchar const *key) //g_assert(object != NULL); //g_assert(SP_IS_OBJECT(object)); g_assert(key != NULL); + //XML Tree being used here. - if (this->getRepr() != NULL ) { - unsigned int keyid = sp_attribute_lookup(key); - if (keyid != SP_ATTR_INVALID) { - /* Retrieve the 'key' attribute from the object's XML representation */ - gchar const *value = this->getRepr()->attribute(key); + g_assert(this->getRepr() != NULL); - setKeyValue(keyid, value); - } + unsigned int keyid = sp_attribute_lookup(key); + if (keyid != SP_ATTR_INVALID) { + /* Retrieve the 'key' attribute from the object's XML representation */ + gchar const *value = getRepr()->attribute(key); + + setKeyValue(keyid, value); } } -- cgit v1.2.3