Merge branch 'master' of github.com:jceb/vim-orgmode

Author: sotte

doc/orgguide.txt

@@ -440,10 +440,10 @@ Sparse trees~
 
 ------------------------------------------------------------------------------
 Plain lists~
+                                                            *orgguide-plain-list*
   Within an entry of the outline tree, hand-formatted lists can provide
   additional structure.
 
-  Not yet implemented in vim-orgmode~
   They also provide a way to create lists of checkboxes (see section
   |orgguide-checkboxes|).
 
@@ -685,12 +685,59 @@ Priorities~
 
 ------------------------------------------------------------------------------
 Breaking tasks down into subtasks~
-  Not yet implemented in vim-orgmode~
+
+It is often advisable to break down large tasks into smaller, manageable
+subtasks. You can do this by creating an outline tree below a TODO item,
+with detailed subtasks on the tree. To keep the overview over the
+fraction of subtasks that are already completed, insert either ‘[/]’ or
+‘[%]’ anywhere in the headline. These cookies will be updated each time
+the TODO status of a child changes, or when pressing C-c C-c on the
+cookie. For example:
+
+>
+    * Organize Party [33%]
+    ** TODO Call people [1/2]
+    *** TODO Peter
+    *** DONE Sarah
+    ** TODO Buy food
+    ** DONE Talk to neighbor
+<
+                        
+<localleader>c#	        Update the checkboxes status of current heading. It also
+                        update the heading status too.
 
 ------------------------------------------------------------------------------
 Checkboxes~
                                                            *orgguide-checkboxes*
-  Not yet implemented in vim-orgmode~
+  
+Every item in a plain list (see section |orgguide-plain-list|)
+can be made into a checkbox by starting it with the string ‘[ ]’.
+Checkboxes are not included into the global TODO list, so they are often
+great to split a task into a number of simple steps. Here is an example
+of a checkbox list.
+  
+>
+    * TODO Organize party [1/3]
+      - [-] call people [1/2]
+        - [ ] Peter
+        - [X] Sarah
+      - [X] order food
+      - [ ] think about what music to play
+<
+
+Checkboxes work hierarchically, so if a checkbox item has children that
+are checkboxes, toggling one of the children checkboxes will make the
+parent checkbox reflect if none, some, or all of the children are
+checked.
+
+The following commands work with checkboxes:
+
+<localleader>cc         Toggle checkbox status or (with prefix arg) checkbox
+                        presence at point.
+
+<localleader>cn         Insert a new checkbox below current line.
+
+<localleader>cN         Insert a new checkbox above current line.
 
 ==============================================================================
 TAGS                                                             *orgguide-tags*

ftplugin/org.vim

@@ -32,13 +32,18 @@ let g:loaded_org = 1
 
 " Default org plugins that will be loaded (in the given order)
 if ! exists('g:org_plugins') && ! exists('b:org_plugins')
-	let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Hyperlinks', '|', 'Todo', 'TagsProperties', 'Date', 'Agenda', 'Misc', '|', 'Export']
+	let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Hyperlinks', '|', 'Todo', 'TagsProperties', 'Date', 'Agenda', 'Misc', '|', 'Export', 'EditCheckbox']
 endif
 
 if ! exists('g:org_syntax_highlight_leading_stars') && ! exists('b:org_syntax_highlight_leading_stars')
 	let g:org_syntax_highlight_leading_stars = 1
 endif
 
+" expand tab for counting level of checkbox"{{{
+setlocal expandtab
+setlocal tabstop=4
+setlocal sw=4
+"}}}
 
 " Menu and document handling {{{
 function! <SID>OrgRegisterMenu()

ftplugin/orgmode/_vim.py

@@ -25,6 +25,7 @@
 REPEAT_EXISTS = bool(int(vim.eval('exists("*repeat#set()")')))
 TAGSPROPERTIES_EXISTS = False
 
+cache_heading = None
 
 def realign_tags(f):
 	u"""
@@ -175,8 +176,15 @@ def indent_orgmode():
 	d = ORGMODE.get_document()
 	heading = d.current_heading(line - 1)
 	if heading and line != heading.start_vim:
-		vim.command((u'let b:indent_level = %d' % (heading.level + 1))
-				.encode(u'utf-8'))
+		heading.init_checkboxes()
+		checkbox = heading.current_checkbox()
+		if checkbox:
+			print checkbox
+			vim.command((u'let b:indent_level = %d' % (checkbox.level + 6))
+					.encode(u'utf-8'))
+		else:	
+			vim.command((u'let b:indent_level = %d' % (heading.level + 1))
+					.encode(u'utf-8'))
 
 
 def fold_text(allow_dirty=False):
@@ -230,8 +238,18 @@ def fold_orgmode(allow_dirty=False):
 		heading = d.find_current_heading(line - 1)
 	else:
 		heading = d.current_heading(line - 1)
+
+	# if cache_heading != heading:
+		# heading.init_checkboxes()
+		# checkbox = heading.current_checkbox()
+
+	# cache_heading = heading
 	if heading:
-		if line == heading.start_vim:
+		# if checkbox:
+			# vim.command((u'let b:fold_expr = ">%d"' % heading.level + checkbox.level).encode(u'utf-8'))
+		if 0:
+			pass
+		elif line == heading.start_vim:
 			vim.command((u'let b:fold_expr = ">%d"' % heading.level).encode(u'utf-8'))
 		#elif line == heading.end_vim:
 		#	vim.command((u'let b:fold_expr = "<%d"' % heading.level).encode(u'utf-8'))
@@ -251,7 +269,6 @@ def date_to_str(date):
 				u'%Y-%m-%d %a'.encode(u'utf-8')).decode(u'utf-8')
 	return date
 
-
 class OrgMode(object):
 	u""" Vim Buffer """
 
@@ -338,6 +355,7 @@ def register_plugin(self, plugin):
 			return self._plugins[plugin]
 		except Exception, e:
 			echoe(u'Unable to activate plugin: %s' % plugin)
+			echoe(u"%s" % e)
 			if self.debug:
 				import traceback
 				echoe(traceback.format_exc())
@@ -385,4 +403,5 @@ def start(self):
 
 ORGMODE = OrgMode()
 
+
 # vim: set noexpandtab:

ftplugin/orgmode/liborgmode/agenda.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 u"""
-    Agenda
-    ~~~~~~~~~~~~~~~~~~
+	Agenda
+	~~~~~~~~~~~~~~~~~~
 
-    The agenda is one of the main concepts of orgmode. It allows to
+	The agenda is one of the main concepts of orgmode. It allows to
 	collect TODO items from multiple org documents in an agenda view.
 
 	Features:
@@ -43,7 +43,8 @@ def get_next_week_and_active_todo(self, documents):
 		filtered = []
 		for i, document in enumerate(documents):
 			# filter and return headings
-			tmp = filter_items(document.all_headings(),
+			tmp = filter_items(
+				document.all_headings(),
 				[is_within_week_and_active_todo])
 			filtered.extend(tmp)
 		return sorted(filtered)
@@ -56,7 +57,8 @@ def get_timestamped_items(self, documents):
 		filtered = []
 		for i, document in enumerate(documents):
 			# filter and return headings
-			tmp = filter_items(document.all_headings(),
+			tmp = filter_items(
+				document.all_headings(),
 				[contains_active_date])
 			filtered.extend(tmp)
 		return sorted(filtered)

ftplugin/orgmode/liborgmode/base.py

@@ -117,4 +117,48 @@ def extend(self, other):
 		self._changed()
 
 
+def get_domobj_range(content=[], position=0, direction=Direction.FORWARD, identify_fun=None):
+	u"""
+	Get the start and end line number of the dom obj lines from content.
+
+	:content:		String to be recognized dom obj
+	:positon:		Line number in content
+	:direction:		Search direction
+	:identify_fun:  A identify function to recognize dom obj(Heading, Checkbox) title string.
+
+	:return:		Start and end line number for the recognized dom obj.
+	"""
+	len_cb = len(content)
+
+	if position < 0 or position > len_cb:
+		return (None, None)
+
+	tmp_line = position
+	start = None
+	end = None
+
+	# Search heading upwards
+	if direction == Direction.FORWARD:
+		while tmp_line < len_cb:
+			if identify_fun(content[tmp_line]) is not None:
+				if start is None:
+					start = tmp_line
+				elif end is None:
+					end = tmp_line - 1
+				if start is not None and end is not None:
+					break
+			tmp_line += 1
+	else:
+		while tmp_line >= 0 and tmp_line < len_cb:
+			if identify_fun(content[tmp_line]) is not None:
+				if start is None:
+					start = tmp_line
+				elif end is None:
+					end = tmp_line - 1
+				if start is not None and end is not None:
+					break
+			tmp_line -= 1 if start is None else -1
+
+	return (start, end)
+
 # vim: set noexpandtab: