Skip to content

Commit

Permalink
Bump version.
Browse files Browse the repository at this point in the history
  • Loading branch information
Atsuo Ishimoto committed Nov 9, 2013
1 parent 3681d06 commit c54a885
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 12 deletions.
18 changes: 13 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,17 @@ Links
Version history
=================

0.9 - 2013.11.9
---------------

- Markdown mode.

- reStructuredText mode.


Past versions
--------------

0.8 - 2013.11.7
----------------

Expand All @@ -562,9 +573,6 @@ Version history
- Prompt to reload file when file modified by other process.


Past versions
--------------

0.7 - 2013.11.5
----------------

Expand Down Expand Up @@ -662,7 +670,7 @@ Past versions

- Search/Replace history.

- Line number display setting at menu|File|File Info.
- Line number display setting at menu | File | File Info.


0.0.3 - 2013.10.9
Expand All @@ -676,7 +684,7 @@ Past versions

- New command: Select current word(^c).

- New command: Save all files(menu|file|Save All).
- New command: Save all files(menu | file | Save All).

- Improve file open dialog.

Expand Down
2 changes: 2 additions & 0 deletions kaa/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ class Config:
'kaa.filetype.javascript',
'kaa.filetype.css',
'kaa.filetype.diff',
'kaa.filetype.rst',
'kaa.filetype.markdown',
]

DEFAULT_NEWLINE = 'auto'
Expand Down
3 changes: 3 additions & 0 deletions kaa/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ def endpos(self):
"""Returns end position of this document(=size of document)."""
return len(self.buf)

def findchr(self, pos, chars):
return self.buf.findchr(chars, pos, len(self.buf))

def gettol(self, pos):
"""Returns top of line at pos"""

Expand Down
23 changes: 18 additions & 5 deletions kaa/highlight.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,18 @@ def re_start(self):


class Span(Token):
def __init__(self, name, stylename, start, end, escape=None):
def __init__(self, name, stylename, start, end, escape=None,
capture_end=True):

super().__init__(name, stylename)

self.start = start
self.escape = escape
if escape:
end = '({}.)|({})'.format(gre.escape(escape), end)
self.end = gre.compile(end, gre.X+gre.M+gre.S)

self._capture_end = capture_end

def prepare(self, tokenizer):
super().prepare(tokenizer)

Expand All @@ -86,6 +89,9 @@ def prepare(self, tokenizer):
def re_start(self):
return self.start

def _is_end(self, doc, m):
return True

def on_start(self, tokenizer, doc, pos, match):
yield (match.start(), match.end(), self.span_start)

Expand All @@ -94,10 +100,17 @@ def on_start(self, tokenizer, doc, pos, match):
continue

if match.end() != m.start():
if not self._is_end(doc, m):
continue
yield (match.end(), m.start(), self.span_mid)

yield (m.start(), m.end(), self.span_end)
return m.end(), None, False

if self._capture_end:
yield (m.start(), m.end(), self.span_end)
end = m.end()
else:
end = m.start()

return end, None, False

else:
yield (match.end(), doc.endpos(), self.span_mid)
Expand Down
2 changes: 1 addition & 1 deletion kaa/version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys, os
KAA_VERSION = (0, 8, 0)
KAA_VERSION = (0, 9, 0)

def version_info():
return '''\
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def read(fname):
setup(
cmdclass = cmdclass,
name = "kaaedit",
version = "0.8.0",
version = "0.9.0",
description='kaa - console text editor.',
url='https://github.com/kaaedit/kaa',
author='Atsuo Ishimoto',
Expand Down

0 comments on commit c54a885

Please sign in to comment.