Merge branch 'dev' into translations

Author: samaaron

.gitignore

@@ -9,6 +9,7 @@
 # Compiled Dynamic libraries
 *.so
 *.dylib
+*.dll
 
 # Compiled Static libraries
 *.lai
@@ -18,6 +19,9 @@
 # Compiled Erlang files
 *.beam
 
+# Library files
+*.lib
+
 # MSVC stuff
 *.Debug
 *.Release

CHANGELOG.md

@@ -1,4 +1,5 @@
 # History
+* [v4.0.2 'Relink''](#v4.0.2), 15th July 2022
 * [v4.0.1 'Verknüpfen'](#v4.0.1), 12th July 2022
 * [v4.0.0 'Link'](#v4.0.0), 6th July, 2022
 * [v3.3.1 'Beamer'](#v3.3.1), 1st Feb, 2021
@@ -25,6 +26,25 @@
 * [v2.0.1](#v2.0.1), 9th Sept, 2014
 * [v2.0 'Phoenix'](#v2.0), 2nd Sept, 2014
 
+<a name="v4.0.2"></a>
+
+## Version 4.0.2 'Relink'
+15th July 2022
+<!-- [(view commits)](https://github.com/sonic-pi-net/sonic-pi/commits/v4.0.2): -->
+
+Hot on the heals of v4.0.1 here's another bugfix release addressing an issue with the translations.
+
+During the last year there has been significant upheaval of the process used to build Sonic Pi. Somehow, during this upheaval, the translations never got added into the final release builds, despite being part of the dev builds. This has been true since v4.0 BETA 1 back in August 2021 - yet it somehow went unnoticed until now. Apologies! This release fixes this and re-introduces the translations which are so important for lowering the barrier to entry across the world. 
+
+As a bonus, a couple of nice improvements also managed to sneak in for good measure. Have fun!
+
+### GUI
+* All the translations are now available again - including the vast amount of new translation effort since v3.3.1 was released.
+* Loading a file no longer erases the undo history. This means that you can now "undo" a file load in the current buffer and return it to the state prior to the load.
+* The BPM-scrubbing behaviour (clicking your mouse and dragging to change the BPM) has been tweaked to make it easier to use.
+* Improvements for the Portuguese translation.
+
+
 <a name="v4.0.1"></a>
 
 ## Version 4.0.1 'Verknüpfen'
@@ -37,6 +57,7 @@ We also sadly say goodbye to Core Team member Hanno Zulla who did amazing work w
 
 This release also includes Italian and Polish translation updates.
 
+
 <a name="v4.0.0"></a>
 
 ## Version 4.0.0 'Link'

CONTRIBUTORS.md

@@ -248,22 +248,22 @@ thanks to the following developers who have donated their time and
 effort to help grow and improve the Sonic Pi code base:
 
 
-* [Sam Aaron](https://github.com/sonic-pi-net/sonic-pi/commits?author=samaaron) (5256)
+* [Sam Aaron](https://github.com/sonic-pi-net/sonic-pi/commits?author=samaaron) (5264)
 * [Ethan Crawford](https://github.com/sonic-pi-net/sonic-pi/commits?author=ethancrawford) (304)
 * [Hanno Zulla](https://github.com/sonic-pi-net/sonic-pi/commits?author=hzulla) (198)
 * [Joseph Wilk](https://github.com/sonic-pi-net/sonic-pi/commits?author=josephwilk) (160)
 * [Jeremy Weatherford](https://github.com/sonic-pi-net/sonic-pi/commits?author=jweather) (123)
 * [Xavier Riley](https://github.com/sonic-pi-net/sonic-pi/commits?author=xavriley) (110)
-* [Robin Newman](https://github.com/sonic-pi-net/sonic-pi/commits?author=rbnpi) (84)
-* [SunderB](https://github.com/sonic-pi-net/sonic-pi/commits?author=SunderB) (82)
+* [SunderB](https://github.com/sonic-pi-net/sonic-pi/commits?author=SunderB) (96)
+* [Robin Newman](https://github.com/sonic-pi-net/sonic-pi/commits?author=rbnpi) (85)
 * [Łukasz Siwiński](https://github.com/sonic-pi-net/sonic-pi/commits?author=hopbit) (82)
 * [Adrian Cheater](https://github.com/sonic-pi-net/sonic-pi/commits?author=factoid) (70)
-* [Emlyn Corrin](https://github.com/sonic-pi-net/sonic-pi/commits?author=emlyn) (69)
+* [Emlyn Corrin](https://github.com/sonic-pi-net/sonic-pi/commits?author=emlyn) (70)
 * [Chris Maughan](https://github.com/sonic-pi-net/sonic-pi/commits?author=cmaughan) (66)
+* [Lily Foster](https://github.com/sonic-pi-net/sonic-pi/commits?author=lilyinstarlight) (48)
 * [Luis Lloret](https://github.com/sonic-pi-net/sonic-pi/commits?author=llloret) (41)
 * [Martin Keegan](https://github.com/sonic-pi-net/sonic-pi/commits?author=mk270) (41)
 * [Nicolas Dermine](https://github.com/sonic-pi-net/sonic-pi/commits?author=nicoder) (41)
-* [Lily Foster](https://github.com/sonic-pi-net/sonic-pi/commits?author=lilyinstarlight) (39)
 * [Kenichi Kanai](https://github.com/sonic-pi-net/sonic-pi/commits?author=kn1kn1) (28)
 * [Nikolaus Gradwohl](https://github.com/sonic-pi-net/sonic-pi/commits?author=ngradwohl) (26)
 * [Ricardo Pozo](https://github.com/sonic-pi-net/sonic-pi/commits?author=thraex41) (23)
@@ -401,8 +401,8 @@ effort to help grow and improve the Sonic Pi code base:
 * [Lucas Cruz dos Reis](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
 * [Madis Liias](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
 * [Mahmutcan İlhandağ](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
-* [Manula Thejan](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
 * [Manula Thejan](https://github.com/sonic-pi-net/sonic-pi/commits?author=manula2004) (1)
+* [Manula Thejan](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
 * [Marko Peltola](https://github.com/sonic-pi-net/sonic-pi/commits?author=markopeltola) (1)
 * [Martin Gondermann](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
 * [Mateo Carreras](https://github.com/sonic-pi-net/sonic-pi/commits?author=) (1)
@@ -593,6 +593,7 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Jiaxi Gu (3)
 * Juan Pablo Riaño (3)
 * Jun Lin (3)
+* Lucas Cruz dos Reis (3)
 * Luis Lloret (3)
 * Lupa Lupin (3)
 * László van den Hoek (3)
@@ -665,7 +666,6 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Lorenzo Bloedow  (2)
 * Louies (2)
 * Louis Wolf (2)
-* Lucas Cruz dos Reis (2)
 * Luis Jimenez (2)
 * Lukas Spee (2)
 * Lázaro Henrique (2)
@@ -760,6 +760,7 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Elijah Grapes  (1)
 * Elizabeth Sherrock (1)
 * Enrike Hurtado (1)
+* Evandro Afonso Rodrigues (1)
 * Fabian Aussems (1)
 * Federico Saccà (1)
 * Feodor Aleksandrov (1)

app/external/sp_link/CMakeLists.txt

@@ -78,6 +78,8 @@ endif(MSVC)
 
 if(APPLE)
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libsp_link.dylib DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME libsp_link.so)
+elseif(MSVC)
+  install(TARGETS libsp_link RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 else()
   install(TARGETS libsp_link LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()

app/external/sp_midi/CMakeLists.txt

@@ -94,6 +94,8 @@ endif(MSVC)
 
 if(APPLE)
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libsp_midi.dylib DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME libsp_midi.so)
+elseif(MSVC)
+  install(TARGETS libsp_midi RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 else()
   install(TARGETS libsp_midi LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()

app/server/ruby/lib/sonicpi/lang/core.rb

@@ -2751,7 +2751,9 @@ def define(name, &block)
           raise ArgumentError, "A function called #{name} is already part of Sonic Pi's core API. Please choose another name."
         end
 
-        raise ArgumentError, "Function names can't start with a capital letter." if name.to_s =~ /^[A-Z]/
+        if block.arity == 0 && name.to_s =~ /^[A-Z]/
+          __delayed_warning "Functions with no required parameters shouldn't start with a capital letter."
+        end
 
         if already_defined
           __info "Redefining fn #{name.inspect}"
@@ -2768,7 +2770,9 @@ def define(name, &block)
           accepts_block:  true,
           requires_block: true,
           intro_fn:       true,
-          doc:            "Allows you to group a bunch of code and give it your own name for future re-use. Functions are very useful for structuring your code. They are also the gateway into live coding as you may redefine a function whilst a thread is calling it, and the next time the thread calls your function, it will use the latest definition.",
+          doc:            "Allows you to group a bunch of code and give it your own name for future re-use. Functions are very useful for structuring your code. They are also the gateway into live coding as you may redefine a function whilst a thread is calling it, and the next time the thread calls your function, it will use the latest definition.
+
+Note, it is not recommended to start a function name with a capital letter if it takes no parameters.",
           examples:       ["
   # Define a new function called foo
   define :foo do
@@ -2783,7 +2787,16 @@ def define(name, &block)
   # For example, in a block:
   3.times do
     foo
-  end",]
+  end",
+
+  "
+  # Define a new function called play2, taking one parameter
+  define :play2 do |x|
+    play x, release: 2
+  end
+
+  # Call play2, passing in a value for the parameter
+  play2 42"]
 
 
 
@@ -4085,13 +4098,13 @@ def beat
           opts:          nil,
           accepts_block: false,
           examples:      ["
-  use_bpm 120  # The current BPM makes no difference
-  puts beat    #=> 0
-  sleep 1
-  puts beat    #=> 1
-  use_bpm 2000
-  sleep 2
-  puts beat    #=> 3"]
+use_bpm 120  #=> The initial beat does not start at 0
+puts beat    #=> 109252.703125
+sleep 1
+puts beat    #=> 109253.703125
+use_bpm 2000 # Changing the BPM makes no difference
+sleep 2
+puts beat    #=> 109255.703125"]
 
 
 

app/server/ruby/lib/sonicpi/lang/midi.rb

@@ -1599,7 +1599,7 @@ def __midi_send_timed_param_4(path, a, b, c, d)
 
       def __midi_send_timed_param_n(path, *args)
         t = __get_spider_schedule_time
-        @tau_api.send_midi_at(t, path *args)
+        @tau_api.send_midi_at(t, path, *args)
       end
 
       def __midi_message(m)

app/server/ruby/test/lang/core/test_sleep.rb

@@ -42,5 +42,14 @@ def test_bpm_scaled_sleep
       end
     end
 
+    def test_beat
+      @lang.run do
+        use_bpm 60
+        assert_equal beat, 0
+        sleep 2
+        assert_equal beat, 2
+      end
+    end
+
   end
 end