Added options in a more flexible way.

Fixed readme

Author: david-zwicker

.gitignore

@@ -1 +1,2 @@
+.project
 .DS_Store

README.md

@@ -2,22 +2,6 @@
 
 Mathematica package to convert [MATHEMATICA](https://www.wolfram.com/mathematica/) expressions to Python [Numpy](http://www.numpy.org/)
 
-## Input arguments
-
-`x`: your mathematica expression, it can be `numbers`, `literals`,
-`complexes` or `lists`;
-`numpy\[LetterSpace]prefix`: string defining your Numpy `import` prefix,
-e.g.:
-* if your used `import numpy as np`, your prefix should be the string
-`np`
-* if your used `from numpy import *`, your prefix should be the empty
-string `''`
-
-## Output
-
-* The Numpy python-ready expression (to be copied as a string)
-* Optionally, the formatted expression can be copied to your clipboard automatically
-
 ## Installation
 
 To install the package
@@ -28,6 +12,28 @@ To install the package
 
 You should be ready to go.
 
+
+## Usage
+
+The package mainly provides the `ToPython` function, which takes a Mathematica expression
+and tries to convert it to a python expression. It can handle a lot of expressions
+already, but it is obviously limited.
+
+Beside the actual expression the `ToPython` function also supports two options:
+
+* `NumpyPrefix`, which determines the name under which numpy is imported. The default is
+  to prefix all numpy call with `np.`, but you can also set `NumpyPrefix` to `"numpy"` to 
+  enforce `numpy.` as a prefix. If you supply an empty string, no prefix is added, which 
+  might be useful if you use the wildcard import `fromm numpy import *`
+* `Copy`, which when enabled copies the formatted expression to the clipboard
+
+Taken together, a simple example call is
+```
+ToPython[Sin[x], NumpyPrefix->"numpy", Copy->True]
+```
+which should copy `numpy.sin(x)` to your clipboard.
+
+
 ## Disclaimer
 
 This has not been tested for every possible combinations of all the things, use at your own risks.

ToPython.wl

@@ -19,13 +19,13 @@ modifications by David Zwicker
 
 BeginPackage["ToPython`"]
 
-ToPython::usage = "ToPython[expression, numpyprefix, copy]
+ToPython::usage = "ToPython[expression, NumpyPrefix->\"np\", Copy->False]
 	converts Mathematica expression to a Numpy compatible expression. Because Numpy can
-	be imported in several ways, numpyprefix is a string that will be added to appended
-	to function names, e.g., Cos->np.cos. If copy==True, the result is copied to the clipboard"
+	be imported in several ways, you can specify the name of the numpy module using the
+    NumpyPrefix option. The additional option Copy allows you to copy the result to the clipboard"
 
-ToPythonEquation::usage = "ToPythonEquation[equation, numpyprefix, copy] converts a
-    Mathematica equation to a Numpy compatible express"
+ToPythonEquation::usage = "ToPythonEquation[equation, NumpyPrefix->\"np\", Copy->False]
+	converts a Mathematica equation to a Numpy compatible expression."
 
 
 
@@ -36,8 +36,10 @@ Begin["Private`"]
 singleFunctions={Log, Sin, Cos, Tan, Sinh, Cosh, Tanh};
 
 
-ToPython[expression_, numpyprefix_:"np", copy_:False] := Module[
-	{result, greekrule, format, PythonForm, np, br, brackets, a, b, l, m, args},
+Options[ToPython] = {NumpyPrefix->"np", Copy->False};
+ToPython[expression_, OptionsPattern[]] := Module[
+	{numpyprefix=OptionValue[NumpyPrefix], copy=OptionValue[Copy],
+	result, greekrule, format, PythonForm, np, br, brackets, a, b, l, m, args},
 
 (* determine the correct numpy prefix *)
 If[numpyprefix=="", np=numpyprefix, np=numpyprefix<>"."];
@@ -128,7 +130,8 @@ result
 ]
 
 
-ToPythonEquation[Equal[a_, b_], numpyprefix_:"np", copy_:True] := ToPython[a - b, numpyprefix, copy]
+Options[ToPythonEquation] = {NumpyPrefix->"np", Copy->False};
+ToPythonEquation[Equal[a_, b_], opts : OptionsPattern[]] := ToPython[a - b, opts]
 
 
 End[]