Merge lp:~johannes-reinhardt/zim/fixes into lp:~jaap.karssenberg/zim/pyzim

[Johannes Reinhardt]

Fixes lp:492656 and handles trivial renames and moves correctly

[lp:~johannes-reinhardt/zim/fixes]

218. By Johannes Reinhardt on 2010-03-15

much nicer linkmap layout when using fpd

[Jaap Karssenberg (jaap.karssenberg)]

Somehow I missed this branch being proposed for a new merge - otherwise would have included them in 0.45 / 0.46. Will include these fixes in trunk with the next round.

[Jaap Karssenberg (jaap.karssenberg)]

review: Approve

[lp:~johannes-reinhardt/zim/fixes]

219. By Johannes Reinhardt on 2010-03-25

* Update to release 0.46
* Updated to release 0.45

=== modified file 'zim/gui/pageview.py'
--- zim/gui/pageview.py	2010-03-14 19:22:51 +0000
+++ zim/gui/pageview.py	2010-03-15 23:54:24 +0000
@@ -143,6 +143,9 @@
 	('recursive_checklist', 'bool', 'Editing',
 		_('Checking a checkbox also change any sub-items'), False),
 		# T: option in preferences dialog
+	('auto_reformat', 'bool', 'Editing',
+		_('Reformat wiki markup on the fly'), False),
+		# T: option in preferences dialog
 )
 
 _is_zim_tag = lambda tag: hasattr(tag, 'zim_type')
@@ -173,6 +176,12 @@
 	| /[^/\s]
 )\S*$''', re.X | re.U) # ~xxx/ or ~name/xxx or ../xxx  or ./xxx  or /xxx
 
+markup_re = {'style-strong' : Re(r'(\*{2})(.*)\1'),
+	'style-emphasis' : Re(r'(\/{2})(.*)\1'),
+	'style-mark' : Re(r'(_{2})(.*)\1'),
+	'style-pre' : Re(r'(\'{2})(.*)\1'),
+	'style-strike' : Re(r'(~{2})(.*)\1')}
+
 # These sets adjust to the current locale - so not same as "[a-z]" ..
 # Must be kidding - no classes for this in the regex engine !?
 _classes = {
@@ -2362,6 +2371,23 @@
 			apply_link(file_re[0])
 		elif self.preferences['autolink_camelcase'] and camelcase_re.match(word):
 			apply_link(camelcase_re[0])
+		elif self.preferences['auto_reformat']:
+			handled = False
+			linestart = buffer.get_iter_at_line(end.get_line())
+			partial_line = linestart.get_slice(end)
+			for style,re in markup_re.items():
+				if not re.search(partial_line) == None:
+					matchstart = linestart.copy()
+					matchstart.forward_chars(re.start())
+					matchend = linestart.copy()
+					matchend.forward_chars(re.end())
+					if filter(_is_not_indent_tag,buffer.iter_get_zim_tags(matchstart)) \
+					or filter(_is_not_indent_tag,buffer.iter_get_zim_tags(matchend)):
+						continue
+					buffer.delete(matchstart,matchend)
+					buffer.insert_with_tags_by_name(matchstart,re[2],style)
+					handled_here = True
+					break
 		else:
 			handled = False
 

=== modified file 'zim/notebook.py'
--- zim/notebook.py	2010-03-14 19:22:51 +0000
+++ zim/notebook.py	2010-03-15 23:54:24 +0000
@@ -841,6 +841,9 @@
 			raise LookupError, 'Page does not exist: %s' % path.name
 		assert not page.modified, 'BUG: moving a page with uncomitted changes'
 
+		if path == newpath:
+			return
+
 		self.emit('move-page', path, newpath, update_links)
 		logger.debug('Move %s to %s (%s)', path, newpath, update_links)
 

=== modified file 'zim/parsing.py'
--- zim/parsing.py	2010-03-10 20:21:40 +0000
+++ zim/parsing.py	2010-03-15 23:54:24 +0000
@@ -219,6 +219,20 @@
 				result.append(item)
 		return result
 
+	def start(self,group=0):
+		'''Return the indices of the start of the substring matched by group;
+		group defaults to zero (meaning the whole matched substring). Return -1 if
+		group exists but did not contribute to the match. See re.matchobject for
+		details'''
+		return self.m.start(group)
+
+	def end(self,group=0):
+		'''Return the indices of the end of the substring matched by group;
+		group defaults to zero (meaning the whole matched substring). Return -1 if
+		group exists but did not contribute to the match. See re.matchobject for
+		details'''
+		return self.m.end(group)
+
 # Some often used regexes
 is_url_re = Re('^(\w[\w\+\-\.]+)://')
 	# scheme "://"

=== modified file 'zim/plugins/linkmap/__init__.py'
--- zim/plugins/linkmap/__init__.py	2010-03-08 20:15:35 +0000
+++ zim/plugins/linkmap/__init__.py	2010-03-15 23:54:24 +0000
@@ -34,7 +34,7 @@
 
 	@classmethod
 	def check_dependencies(klass):
-		return [('GraphViz',Application(('dot',)).tryexec())]
+		return [('GraphViz',Application(('fdp',)).tryexec())]
 
 	def disconnect(self):
 		pass

=== modified file 'zim/plugins/linkmap/gui.py'
--- zim/plugins/linkmap/gui.py	2009-08-13 13:21:00 +0000
+++ zim/plugins/linkmap/gui.py	2010-03-15 23:54:24 +0000
@@ -51,7 +51,7 @@
 		self.vbox.add(hbox)
 
 		self.xdotview = xdot.DotWidget()
-		self.xdotview.set_filter('neato')
+		self.xdotview.set_filter('fdp')
 		self.xdotview.set_dotcode(linkmap.get_dotcode())
 		self.xdotview.connect('clicked', self.on_node_clicked)
 		hbox.add(self.xdotview)