Adding new shortcut functiojn

Author: beothorn

README.md

@@ -4,17 +4,18 @@ Combine the power of clojure with all the LibreOffice calc features!!!
 
 ClojureCalc is a wrapper for clojure 1.6 on libre office and possibly open office.  
 
-To install use [ClojureCalc.oxt](https://github.com/beothorn/ClojureCalc/releases/download/1.0.0/ClojureCalc.oxt)  
+To install use [ClojureCalc.oxt](https://github.com/beothorn/ClojureCalc/releases/download/1.1.0/ClojureCalc.oxt)  
 
 Usage  
 ====================
 
+=c( string with a clojure function, without wrapping parenthesis )
 =clj( string with a clojure expression )  
 =cljcol( cell range to convert to a clojure collection )  
 
 Note: Three single quotes are replaced by a double quote
 
-![screenshot](http://i.imgur.com/93UZ7qq.png "Really cool example")
+![screenshot](http://i.imgur.com/ePwRK5O.png "Really cool example")
 
 Examples  
 ====================

registry/data/org/openoffice/Office/CalcAddins.xcu

@@ -29,6 +29,31 @@
                         </node>
                     </node>
                 </node>
+                <node oor:name="c" oor:op="replace">
+                    <prop oor:name="DisplayName">
+                        <value xml:lang="en">c</value>
+                    </prop>
+                    <prop oor:name="Description">
+                        Evaluates a clojure expression, automatically wraps the expression with parenthesis
+                        <value/>
+                    </prop>
+                    <prop oor:name="Category">
+                        <value>Add-In</value>
+                    </prop>
+                    <prop oor:name="CompatibilityName">
+                        <value/>
+                    </prop>
+                    <node oor:name="Parameters">
+                        <node oor:name="exp" oor:op="replace">
+                            <prop oor:name="DisplayName">
+                                <value xml:lang="en">A clojure expression to be evaluated, ''' (three single quotes) are replaced by a double quote </value>
+                            </prop>
+                            <prop oor:name="Description">
+                                <value/>
+                            </prop>
+                        </node>
+                    </node>
+                </node>
                 <node oor:name="cljcol" oor:op="replace">
                     <prop oor:name="DisplayName">
                         <value xml:lang="en">cljcol</value>

src/com/github/beothorn/clojurecalc/ClojureCalcImpl.java

@@ -78,6 +78,12 @@ public String clj(String exp)
        return ClojureInterpreter.runClojure(exp);
    }
 
+   public String c(String exp)
+   {
+       if(exp.trim().equals("")) return "";
+       return ClojureInterpreter.runClojure("("+exp+")");
+   }
+   
    public String cljcol(String[][] cells){
        return ClojureInterpreter.toClojureCollection(cells);
    }

src/com/github/beothorn/clojurecalc/ClojureInterpreter.java

@@ -33,7 +33,7 @@ private static String getLine(final String[] line) {
     }
 
     public static String runClojure(String clojureExpression){
-        if(clojureExpression.equals("")) return "";
+        if(clojureExpression.trim().equals("")) return "";
         String exp = clojureExpression.replaceAll("'''", "\"");
         String result;
         ClassLoader previous = Thread.currentThread().getContextClassLoader();

src/com/github/beothorn/clojurecalc/XClojureCalc.idl

@@ -21,7 +21,7 @@ module com { module github { module beothorn { module clojurecalc {
         [optional] interface ::com::sun::star::lang::XLocalizable;
 
         string clj([in] string exp);
-
+        string c([in] string exp);
         string cljcol([in] sequence< sequence< string > > cells);
     };
 }; }; }; };

src/description.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Created with Apache OpenOffice API plug-in for NetBeans Version 2.0.6.000205-->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.0.0"/>
+    <version value="1.1.0"/>
     <identifier value="com.github.beothorn.clojurecalc.ClojureCalc"/>
 </description>