Merge branch 'develop'

# Conflicts:
#	docs/_sources/api-matlab/program_listing_file__Users_enrico_Ricerca_develop_C++_pins-mechatronix_LibSources_submodules_Splines_toolbox_lib_CompileSplinesLib.m.rst.txt

.gitignore

@@ -79,3 +79,4 @@ docs_build/sphinx_matlab/api-matlab
 docs_build/xml-c
 docs_build/xml-cpp
 docs_build/xml-matlab
+docs_build/sphinx/_doxygen

README.rst

@@ -1,12 +1,23 @@
-Splines |Build Status| |View Splines on File Exchange|
-======================================================
+
+.. |Build Status| image:: https://travis-ci.org/ebertolazzi/Splines.svg?branch=master
+   :target: https://travis-ci.org/ebertolazzi/Splines
+
+.. |View Splines on File Exchange| image:: https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg
+   :target: https://www.mathworks.com/matlabcentral/fileexchange/54481-splines
+
+Splines
+=======
+|Build Status| |View Splines on File Exchange|
 
 Introduction
 ------------
 
 ``Splines`` is a set of C++ classes (with MATLAB mex interface) which
 implements varios spline interpolation.
 
+- `online manuals <http://ebertolazzi.github.io/Splines>`__
+- `github repos <https://github.com/ebertolazzi/Splines>`__
+
 Matlab Toolbox
 --------------
 
@@ -89,7 +100,7 @@ Compile and tests
 
 Edit makefile file to match compiler of your OS and do:
 
-.. code:: sh
+.. code::  bash
 
   make
 
@@ -109,12 +120,6 @@ To run the test
   rake run     # using rake on linux and osx
   rake run_win # using rake on windows
 
-Documentation and home
-----------------------
-
-- http://ebertolazzi.github.io/Splines
-- https://github.com/ebertolazzi/Splines
-
 Developer
 ---------
 
@@ -137,8 +142,3 @@ References
 - **Hiroshi Akima**,
   *A Method of Bivariate Interpolation and Smooth Surface Fitting for Irregularly Distributed Data Points*.
   ACM Transactions on Mathematical Software, Vol.4, 148-164, 1978.
-
-.. |Build Status| image:: https://travis-ci.org/ebertolazzi/Splines.svg?branch=master
-   :target: https://travis-ci.org/ebertolazzi/Splines
-.. |View Splines on File Exchange| image:: https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg
-   :target: https://www.mathworks.com/matlabcentral/fileexchange/54481-splines

Splines.prj

@@ -1,5 +1,5 @@
 <deployment-project plugin="plugin.toolbox" plugin-version="1.0">
-  <configuration build-checksum="1526834762" file="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Splines/Splines.prj" location="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Splines" name="Splines" target="target.toolbox" target-name="Package Toolbox">
+  <configuration build-checksum="376350134" file="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Splines/Splines.prj" location="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Splines" name="Splines" target="target.toolbox" target-name="Package Toolbox">
     <param.appname>Splines</param.appname>
     <param.authnamewatermark>Enrico Bertolazzi</param.authnamewatermark>
     <param.email>[email protected]</param.email>
@@ -15,9 +15,11 @@ The classes are the following:
   - BesselSpline, for Bessel "non oscillatory" spline interpolation
   - HermiteSpline
   - PchipSpline
-  - QuinticSpline, Simple quintic spline based on PCHIP</param.description>
-    <param.screenshot>${PROJECT_ROOT}/toolbox/tests/icon.jpg</param.screenshot>
-    <param.version>1.0.6</param.version>
+  - QuinticSpline, Simple quintic spline based on PCHIP
+
+Online doc at: http://ebertolazzi.github.io/Splines</param.description>
+    <param.screenshot>${PROJECT_ROOT}/toolbox/icon.png</param.screenshot>
+    <param.version>1.1.0</param.version>
     <param.output>${PROJECT_ROOT}/Splines.mltbx</param.output>
     <param.products.name>
       <item>MATLAB</item>
@@ -114,8 +116,12 @@ setup.m</param.exclude.filters>
     </fileset.rootdir>
     <fileset.rootfiles>
       <file>${PROJECT_ROOT}/toolbox/CompileSplinesLib.m</file>
+      <file>${PROJECT_ROOT}/toolbox/GenericContainer-e7b1dc76.o.tmp</file>
       <file>${PROJECT_ROOT}/toolbox/bin</file>
       <file>${PROJECT_ROOT}/toolbox/demos.xml</file>
+      <file>${PROJECT_ROOT}/toolbox/icon.pdf</file>
+      <file>${PROJECT_ROOT}/toolbox/icon.png</file>
+      <file>${PROJECT_ROOT}/toolbox/icon.svg</file>
       <file>${PROJECT_ROOT}/toolbox/lib</file>
       <file>${PROJECT_ROOT}/toolbox/license.txt</file>
       <file>${PROJECT_ROOT}/toolbox/src</file>

Xcode/Splines.xcodeproj/xcuserdata/enrico.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,19 +9,24 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>test2.xcscheme_^#shared#^_</key>
+		<key>test.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>test9.xcscheme_^#shared#^_</key>
+		<key>test2.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>D9268AC325CABBFD0074F122</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>D93B173A25CB709F0033E2CA</key>
 		<dict>
 			<key>primary</key>

docs/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 705a259653000f25fcf3daf23870120c
+config: d29caeabba5ae2612ea74144b7b495c4
 tags: 645f666f9bcd5a90fca523b33c5a78b7