Merge branch '0.6' into devel

ppaez · ppaez · commit 8db7417c1bba · 2018-02-08T07:36:06.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+*.pyc
+.coverage
+*~
+*egg-info
+.tox
+build/
+dist/
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.6   6 February 2018
+      Added a plugin for Vim
+      Support Python 3
+
 0.5   6 March 2011
       Added GTK, wxWidget sample editors
       Added Lexer and Parser classes
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,3 +7,8 @@ include pyroom-0.4.1-arithmetic.patch
 include calc.py
 include manual.rst
 include manual.html
+include vim-plugin/wrapper.py
+include vim-plugin/tutorial.txt
+include vim-plugin/arithmetic.vim
+include vim-plugin/arithmetic.txt
+include vim-plugin/install.sh
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # Publish to web page src directory
 #
 
-VERSION = 0.5
+VERSION = 0.6
 PW_PATH=~/pw/src/python/arithmetic
 RST2HTML = rst2html
 
diff --git a/README b/README
@@ -29,11 +29,14 @@ http://pp.com.mx/python/arithmetic
 Installing
 ----------
 
-To use the module or Libreta from any directory in your
+To use the module from any directory in your
 PC, cd to the source directory and type as root:
 
    python setup.py install
 
+To install the Vim plugin:
+
+   vim-plugin/install.sh
 
 Contributing
 ------------
diff --git a/arithmetic.py b/arithmetic.py
@@ -371,7 +371,7 @@ def parseLine( self, i, lines, variables={}, functions={} ):
                                         variables=variables, functions=functions ) )
                             self.writeResult( i, lines, mEqualSignAct.end(), RightActEnd, resultado )
                         except:
-                            print 'eval error:', tipoLeft, valorLeft, tipoRight, valorRight
+                            print('eval error:', tipoLeft, valorLeft, tipoRight, valorRight)
                     elif tipoLeft == 'n' and tipoRight in 'ifav':
                         if valorLeft not in functions:     # variable on the left
                             if tipoRight != 'v':    # assign to variable
@@ -380,7 +380,7 @@ def parseLine( self, i, lines, variables={}, functions={} ):
                                                             variables=variables, functions=functions ) )
 
                                 except:
-                                    print 'exec error:', tipoLeft, valorLeft, tipoRight, valorRight
+                                    print('exec error:', tipoLeft, valorLeft, tipoRight, valorRight)
                                     raise
                             else:                   # evaluate a variable
                                 if valorLeft in variables:
@@ -395,7 +395,7 @@ def parseLine( self, i, lines, variables={}, functions={} ):
                                                 variables=variables, functions=functions ) )
                                     self.writeResult( i, lines, mEqualSignAct.end(), RightActEnd, resultado )
                                 except:
-                                    print 'eval error:', tipoLeft, valorLeft, tipoRight, valorRight
+                                    print('eval error:', tipoLeft, valorLeft, tipoRight, valorRight)
                             else:                   # recurrence relation
                                 if valorLeft not in variables:            # initial value
                                   if valorRight != '':
@@ -548,21 +548,21 @@ def AddCommas( s ):
     import sys
     if len( sys.argv ) >= 2:
         if sys.argv[1] in [ '-h', '--help' ]:
-            print __doc__
+            print(__doc__)
         elif sys.argv[1] == '-f':
             filename = sys.argv[2]
             text = open( filename ).read()
-            print feed( text )
+            print(feed( text ))
         else:
             text =  ' '.join( sys.argv[ 1: ] )
             if '=' in text:
-                print feed( text )
+                print(feed( text ))
             else:
-                print evaluate( text )
+                print(evaluate( text ))
     else:
         text = sys.stdin.read()
         lines = text.splitlines()
         if '=' in text or len(lines) > 1:
-            print feed( text )
+            print(feed( text ))
         else:
-            print evaluate( lines[0] )
+            print(evaluate( lines[0] ))
diff --git a/index.rst b/index.rst
@@ -4,13 +4,35 @@ arithmetic
 *arithmetic* is a Python module that allows mixing arithmetic
 operations and text.
 Tk, GTK and wxWidgets based sample editors that use the module
-are provided as a starting point.  A plugin for Zim and a patch for PyRoom
-editors.
+are provided as a starting point.  A plugin for Vim, a plugin for Zim
+and a patch for PyRoom editors.
 Tutorial documents are included, they will quickly show
 all the features of arithmetic.
 It is licensed under the Gnu GPL license version 2 or later.
 
 
+- Download
+
+You may install the current version using pip like this::
+
+  pip install arithmetic
+
+You can also get a tarball for manual installation from the `arithmetic
+page`__ in the Python Package Index.
+
+.. __: https://pypi.python.org/pypi/arithmetic
+
+You may install the development version by cloning the `arithmetic repository`__
+in GitHub with git like this::
+
+  git clone https://github.com/ppaez/arithmetic.git
+  cd arithmetic
+  python setup.py install
+
+.. __: https://github.com/ppaez/arithmetic
+
+Old versions are kept here just for reference:
+
 
 - Download
 
diff --git a/manual.rst b/manual.rst
@@ -123,6 +123,11 @@ is not required)::
 
  # python setup.py install --home=~
 
+To install the Vim plugin::
+
+ # vim-plugin/install.sh
+
+
 Use in existing graphical applications
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 import sys,os,string,time
 
-version = '0.5'
+version = '0.6'
 
 kwargs = dict()
 if has_setuptools:
@@ -37,11 +37,14 @@
 operations and text.  It resembles the calculator program bc.
 
 Tk, GTK and wxWidgets based sample editors that use the module
-are provided as a starting point.  A plugin for Zim and a patch for PyRoom
-editors.
+are provided as a starting point.  A plugin for Vim, a plugin ford Zim,
+and a patch for the PyRoom editors are included.
 
 Tutorial documents are included, they will quickly show
 all the features of arithmetic.''',
 	classifiers=[ "Development Status :: 3 - Alpha",
-		"Topic :: Text Processing" ],
+		      "Topic :: Text Processing",
+                      "Programming Language :: Python :: 2",
+                      "Programming Language :: Python :: 3"
+        ],
 )
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py27,py34,py35,py36
+[testenv]
+deps=mock
+     coverage
+commands=coverage run -m unittest tests
+         coverage report -m arithmetic.py
diff --git a/tutorial-1 b/tutorial-1
@@ -24,5 +24,5 @@ Commands
 
 control-s saves the document.
 control-l reload the document, loosing changes.
-control-q ends Libreta.
+control-q ends the editor.
 <F5> recalculates.
diff --git a/vim-plugin/arithmetic.txt b/vim-plugin/arithmetic.txt
@@ -0,0 +1,15 @@
+*arithmetic.txt*  Plugin for arithmetic
+
+arithmetic is a Python module that allows mixing arithmetic
+operations and text.
+                                                                      
+Mappings:                                                             
+<F5>   or   <Plug>ArithmeticCalculate
+        Calculate
+                                                                      
+Commands:                                                             
+:Calculate
+        Calculate
+                                                                      
+                                                *arithmetic-settings*   
+This plugin doesn't have any settings.                                
diff --git a/vim-plugin/arithmetic.vim b/vim-plugin/arithmetic.vim
@@ -0,0 +1,31 @@
+" Vim global plugin for arithmetic
+" Last Change:  2018 Fed 05
+" Maintainer:   Patricio Paez
+" License:      GNU General Public License version 2 or later
+
+
+" wrapper
+function! s:Calculate()
+python3 << endOfPython
+
+from wrapper import calculate
+
+print(calculate())
+
+endOfPython
+endfunction
+
+" Map F5 by default
+if !hasmapto('<Plug>ArithmeticCalculate')
+   map <unique> <F5> <Plug>ArithmeticCalculate
+endif
+noremap <unique> <script> <Plug>ArithmeticCalculate <SID>Calculate
+noremap <SID>Calculate :call <SID>Calculate()<CR>
+noremenu <script> &Plugin.&Arithmetic.&Calculate<Tab>:Calculate <SID>Calculate
+noremenu <script> &Plugin.&Arithmetic.&Tutorial :edit $HOME/.vim/doc/arithmetic/tutorial.txt<CR>
+noremenu <script> &Plugin.&Arithmetic.&Help :help arithmetic<CR>
+
+" User command
+if !exists(":Calculate")
+   command Calculate :call s:Calculate()
+endif
diff --git a/vim-plugin/install.sh b/vim-plugin/install.sh
@@ -0,0 +1,46 @@
+#! /bin/bash
+
+SOURCE=$(dirname $0)
+DEST_PLUGIN=$HOME/.vim/plugin/arithmetic
+DEST_DOC=$HOME/.vim/doc/arithmetic
+DEST_PYTHON3=$HOME/.vim/python3
+
+mkdir -p $DEST_PLUGIN
+mkdir -p $DEST_DOC
+mkdir -p $DEST_PYTHON3
+
+echo Installing the arithmetic plugin -------
+
+echo Check that Vim includes Python 3 support
+if vim --version | grep +python3 > /dev/null; then
+    echo Ok
+else
+    echo Missing. In Debian, run the command \"apt install vim-nox\"
+    echo or \"apt install vim-gtk3\" to include Python 3 support
+    exit 1
+fi
+
+echo Check that the Python arithmetic module is installed
+pushd /tmp > /dev/null
+if python3 -u -c 'import arithmetic' > /dev/null 2>&1; then
+    echo Ok
+else
+    echo Missing. Run the command \"su -c 'python3 setup.py install'\" to install it
+    exit 2
+fi
+popd > /dev/null
+
+echo Copy files
+cp -avf $SOURCE/arithmetic.vim $DEST_PLUGIN
+cp -avf $SOURCE/arithmetic.txt $SOURCE/tutorial.txt $DEST_DOC
+cp -avf $SOURCE/wrapper.py $DEST_PYTHON3
+echo Ok
+
+echo Prepare :help arithmetic
+if vim --not-a-term --noplugin --cmd ':helptags $HOME/.vim/doc' --cmd ':quit' > /dev/null; then
+    echo Ok
+else
+    echo Failed
+fi
+
+echo Finished ------------------------------
diff --git a/vim-plugin/tutorial.txt b/vim-plugin/tutorial.txt
@@ -0,0 +1,33 @@
+Assign values to variables:
+
+a = 12   b = 5
+
+Use the variables in expressions:
+
+a + b =        a x b =       a / b =      a - b =      a^b =   a**b =
+
+Define a formula:   area = height x width
+
+Assign values and request the result:
+
+     height = 200       width = 300
+
+     area = 
+
+Calculate the results for different points:
+
+width = 100   area = 
+width = 400   area = 
+width = 500   area = 
+
+Press <F5> now to obtain the results of all calculations
+in the document.
+
+You may change the key to '.' for example, with this
+command in Vim:
+
+:map . <Plug>ArithmeticCalculate
+
+Or add the line to your ~/.vimrc file:
+
+map . <Plug>ArithmeticCalculate
diff --git a/vim-plugin/wrapper.py b/vim-plugin/wrapper.py
@@ -0,0 +1,18 @@
+import vim
+from arithmetic import Parser
+
+
+def calculate():
+    'Parse and evaluate the current buffer and return a status'
+
+    buffer = vim.current.buffer
+
+    text = '\n'.join(buffer)
+
+    parser = Parser()
+    result = parser.parse(text)
+    
+    for i, line in enumerate(result.splitlines()):
+        vim.current.buffer[i] = line
+
+    return "{} lines in current buffer".format(len(buffer))

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +*.pyc
 +.coverage
 +*~
 +*egg-info
 +.tox
 +build/
 +dist/
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Publish to web page src directory`
`3`	`3`	`#`
`4`	`4`
`5`		`-VERSION = 0.5`
	`5`	`+VERSION = 0.6`
`6`	`6`	`PW_PATH=~/pw/src/python/arithmetic`
`7`	`7`	`RST2HTML = rst2html`
`8`	`8`