Merge lp:~ajuanpi/inkscape/jitternodes into lp:~inkscape.dev/inkscape/trunk

[jazzynico]

[jazzynico (jazzynico)]

Branch merged with the patch attached to bug #1071833 (to resolve conflicts and update the translations).

=== modified file 'share/extensions/Makefile.am'
--- share/extensions/Makefile.am	2016-01-13 18:39:25 +0000
+++ share/extensions/Makefile.am	2016-05-24 13:25:29 +0000
@@ -13,11 +13,179 @@
 
 moduledir = $(datadir)/inkscape/extensions
 
+<<<<<<< TREE
 extension_SCRIPTS = \
 	$(wildcard $(srcdir)/*.py) \
 	$(wildcard $(srcdir)/*.pl) \
 	$(wildcard $(srcdir)/*.sh) \
 	$(wildcard $(srcdir)/*.rb)
+=======
+# If you remove an extension from here, either add it to EXTRA_DIST
+# below, or remove all mention of it from po/inkscape.pot as well.
+extensions = \
+	addnodes.py \
+	bezmisc.py \
+	chardataeffect.py\
+	color_blackandwhite.py\
+	color_brighter.py\
+	color_custom.py\
+	color_darker.py\
+	color_desaturate.py\
+	coloreffect.py\
+	color_grayscale.py\
+	color_HSL_adjust.py\
+	color_lesshue.py\
+	color_lesslight.py\
+	color_lesssaturation.py\
+	color_morehue.py\
+	color_morelight.py\
+	color_moresaturation.py\
+	color_negative.py\
+	color_randomize.py\
+	color_removeblue.py\
+	color_removegreen.py\
+	color_removered.py\
+	color_rgbbarrel.py\
+	color_replace.py\
+	convert2dashes.py\
+	cspsubdiv.py \
+	cubicsuperpath.py \
+	dia2svg.sh \
+	dimension.py \
+	dm2svg.py \
+	dots.py \
+	draw_from_triangle.py \
+	dxf_input.py \
+	dxf_outlines.py \
+	dxf_templates.py \
+	edge3d.py \
+	embedimage.py \
+	embed_raster_in_svg.pl \
+	eqtexsvg.py \
+	export_gimp_palette.py \
+	extractimage.py \
+	extrude.py \
+	ffgeom.py\
+	fig2dev-ext.py \
+	flatten.py \
+	foldablebox.py \
+	fractalize.py \
+	funcplot.py \
+	gears.py\
+	gcodetools.py\
+	generate_voronoi.py \
+	gimp_xcf.py \
+	grid_cartesian.py \
+	grid_isometric.py \
+	grid_polar.py \
+	guides_creator.py \
+	guillotine.py \
+	handles.py \
+	hpgl_output.py \
+	ill2svg.pl \
+	ink2canvas.py \
+	inkex.py \
+	Inkscape.pm \
+	inkscape_follow_link.py \
+	inkwebeffect.py \
+	interp.py \
+	interp_att_g.py \
+	jessyInk_autoTexts.py \
+	jessyInk_effects.py \
+	jessyInk_export.py \
+	jessyInk_install.py \
+	jessyInk_keyBindings.py \
+	jessyInk_masterSlide.py \
+	jessyInk_mouseHandler.py \
+	jessyInk_summary.py \
+	jessyInk_transitions.py \
+	jessyInk_uninstall.py \
+	jessyInk_video.py \
+	jessyInk_view.py \
+	jitternodes.py \
+	launch_webbrowser.py \
+	layers2svgfont.py \
+	svgfont2layers.py \
+	layout_nup.py \
+	layout_nup_pageframe.py \
+	lindenmayer.py \
+	lorem_ipsum.py \
+	markers_strokepaint.py \
+	measure.py \
+	motion.py \
+	new_glyph_layer.py \
+	next_glyph_layer.py \
+	previous_glyph_layer.py \
+	outline2svg.pl	\
+	param_curves.py \
+	pathalongpath.py\
+	pathscatter.py\
+	pathmodifier.py\
+	perfectboundcover.py \
+	perspective.py \
+	pixelsnap.py \
+	plt_output.py \
+	polyhedron_3d.py \
+	printing_marks.py \
+	ps2dxf.sh \
+	ps2pdf-ext.py \
+	pturtle.py \
+	replace_font.py \
+	restack.py \
+	render_barcode.py \
+	render_barcode_datamatrix.py \
+	render_barcode_qrcode.py \
+	render_alphabetsoup.py \
+	render_alphabetsoup_config.py \
+	rtree.py \
+	rubberstretch.py\
+	run_command.py \
+	scour.py \
+	scour.inkscape.py \
+	setup_typography_canvas.py \
+	simplepath.py \
+	simplepath.rb \
+	simplestyle.py \
+	simpletransform.py \
+	sk1_output.py \
+	sk2svg.sh \
+	SpSVG.pm \
+	spirograph.py\
+	split.py \
+	straightseg.py \
+	summersnight.py \
+	svgcalendar.py \
+	svg_regex.py \
+	svg_and_media_zip_output.py \
+	synfig_fileformat.py \
+	synfig_output.py \
+	synfig_prepare.py \
+	text_extract.py \
+	svg_transform.py \
+	text_uppercase.py \
+	text_lowercase.py \
+	text_sentencecase.py \
+	text_titlecase.py \
+	text_flipcase.py \
+	text_randomcase.py \
+	text_braille.py \
+	triangle.py \
+	txt2svg.pl \
+	uniconv-ext.py \
+	uniconv_output.py \
+	voronoi.py \
+	voronoi2svg.py \
+	webslicer_create_group.py \
+	webslicer_create_rect.py \
+	webslicer_effect.py \
+	webslicer_export.py \
+	web-set-att.py \
+	web-transmit-att.py \
+	whirl.py \
+	wireframe_sphere.py \
+	wmf_output.py \
+	yocto_css.py
+>>>>>>> MERGE-SOURCE
 
 otherstuff_DATA = \
 	fontfix.conf \
@@ -31,10 +199,188 @@
 	seamless_pattern.svg \
 	svg2fxg.xsl \
 	svg2xaml.xsl \
+<<<<<<< TREE
 	xaml2svg.xsl \
 	inkscape.extension.rng
 
 module_DATA = $(wildcard $(srcdir)/*.inx)
+=======
+	xaml2svg.xsl
+
+modules = \
+	addnodes.inx \
+	ai_input.inx \
+	aisvg.inx \
+	ccx_input.inx \
+	cdr_input.inx\
+	cdt_input.inx \
+	cgm_input.inx \
+	cmx_input.inx \
+	color_blackandwhite.inx\
+	color_brighter.inx\
+	color_custom.inx \
+	color_darker.inx\
+	color_desaturate.inx\
+	color_grayscale.inx\
+	color_HSL_adjust.inx\
+	color_lesshue.inx\
+	color_lesslight.inx\
+	color_lesssaturation.inx\
+	color_morehue.inx\
+	color_morelight.inx\
+	color_moresaturation.inx\
+	color_negative.inx\
+	color_randomize.inx\
+	color_removeblue.inx\
+	color_removegreen.inx\
+	color_removered.inx\
+	color_rgbbarrel.inx\
+	color_replace.inx\
+	convert2dashes.inx\
+	dhw_input.inx \
+	dia.inx \
+	dimension.inx \
+	dots.inx \
+	draw_from_triangle.inx \
+	dxf_input.inx \
+	dxf_outlines.inx \
+	dxf_output.inx \
+	edge3d.inx \
+	embedimage.inx \
+	embedselectedimages.inx \
+	eps_input.inx \
+	eqtexsvg.inx \
+	export_gimp_palette.inx \
+	extractimage.inx \
+	extrude.inx \
+	fig_input.inx \
+	flatten.inx \
+	foldablebox.inx \
+	fractalize.inx \
+	funcplot.inx \
+	gears.inx\
+	gcodetools_about.inx\
+	gcodetools_area.inx\
+	gcodetools_check_for_updates.inx\
+	gcodetools_dxf_points.inx\
+	gcodetools_engraving.inx\
+	gcodetools_graffiti.inx\
+	gcodetools_lathe.inx\
+	gcodetools_orientation_points.inx\
+	gcodetools_path_to_gcode.inx\
+	gcodetools_prepare_path_for_plasma.inx\
+	gcodetools_tools_library.inx\
+	generate_voronoi.inx \
+	gimp_xcf.inx \
+	grid_cartesian.inx \
+	grid_isometric.inx \
+	grid_polar.inx \
+	guides_creator.inx \
+	guillotine.inx \
+	handles.inx \
+	hpgl_output.inx \
+	ink2canvas.inx \
+	inkscape_follow_link.inx \
+	inkscape_help_askaquestion.inx \
+	inkscape_help_commandline.inx \
+	inkscape_help_faq.inx\
+	inkscape_help_manual.inx \
+	inkscape_help_relnotes.inx \
+	inkscape_help_reportabug.inx \
+	inkscape_help_svgspec.inx \
+	inkscape_help_keys.inx \
+	interp.inx \
+	interp_att_g.inx \
+	jessyInk_autoTexts.inx \
+	jessyInk_effects.inx \
+	jessyInk_export.inx \
+	jessyInk_install.inx \
+	jessyInk_keyBindings.inx \
+	jessyInk_masterSlide.inx \
+	jessyInk_mouseHandler.inx \
+	jessyInk_summary.inx \
+	jessyInk_transitions.inx \
+	jessyInk_uninstall.inx \
+	jessyInk_video.inx \
+	jessyInk_view.inx \
+	jitternodes.inx \
+	layers2svgfont.inx \
+	svgfont2layers.inx \
+	layout_nup.inx \
+	lindenmayer.inx \
+	lorem_ipsum.inx \
+	markers_strokepaint.inx \
+	measure.inx \
+	motion.inx \
+	new_glyph_layer.inx \
+	next_glyph_layer.inx \
+	previous_glyph_layer.inx \
+	outline2svg.inx \
+	param_curves.inx \
+	pathalongpath.inx\
+	pathscatter.inx\
+	perfectboundcover.inx \
+	perspective.inx	\
+	pixelsnap.inx \
+	plt_input.inx \
+	plt_output.inx \
+	polyhedron_3d.inx	\
+	printing_marks.inx \
+	ps_input.inx \
+	render_barcode.inx \
+	render_barcode_datamatrix.inx \
+	render_barcode_qrcode.inx \
+	render_alphabetsoup.inx \
+	replace_font.inx \
+	restack.inx \
+	rubberstretch.inx \
+	rtree.inx \
+	scour.inx \
+	setup_typography_canvas.inx \
+	sk_input.inx \
+	sk1_input.inx \
+	sk1_output.inx \
+	spirograph.inx \
+	split.inx \
+	straightseg.inx \
+	summersnight.inx \
+	svg2fxg.inx \
+	svg2xaml.inx \
+	svg_and_media_zip_output.inx \
+	svgcalendar.inx \
+	synfig_output.inx \
+	text_extract.inx \
+	text_uppercase.inx\
+	text_lowercase.inx \
+	text_sentencecase.inx \
+	text_titlecase.inx \
+	text_flipcase.inx \
+	text_randomcase.inx \
+	text_braille.inx \
+	triangle.inx \
+	txt2svg.inx \
+	voronoi2svg.inx \
+	webslicer_create_group.inx \
+	webslicer_create_rect.inx \
+	webslicer_export.inx \
+	web-set-att.inx \
+	web-transmit-att.inx \
+	whirl.inx \
+	wireframe_sphere.inx \
+	wmf_input.inx \
+	wmf_output.inx \
+	xaml2svg.inx
+
+
+extension_SCRIPTS = \
+	$(extensions)
+
+otherstuff_DATA = \
+	$(otherstuff)
+
+module_DATA = \
+	$(modules)
+>>>>>>> MERGE-SOURCE
 
 EXTRA_DIST = \
 	$(extension_SCRIPTS) $(otherstuff_DATA) $(module_DATA)

=== modified file 'share/extensions/jitternodes.py'