Merge branch 'main' of github.com:sonic-pi-net/sonic-pi into dev

Author: samaaron

.gitignore

@@ -129,6 +129,7 @@ book/
 ## IntelliJ IDEA
 
 *.iml
+.idea
 
 ## i18n auto-generated files
 

README.md

@@ -80,7 +80,8 @@ Status
 [![Translation Status of Sonic Pi: ru](https://hosted.weblate.org/widgets/sonic-pi/ru/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/)           | Russian             | :white_check_mark: | :white_check_mark:
 [![Translation Status of Sonic Pi: zh_Hans](https://hosted.weblate.org/widgets/sonic-pi/zh_Hans/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Simplified Chinese  | :white_check_mark: | :red_circle:
 [![Translation Status of Sonic Pi: es](https://hosted.weblate.org/widgets/sonic-pi/es/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/)           | Spanish             | :white_check_mark: | :white_check_mark:
-[![Translation Status of Sonic Pi: si](https://hosted.weblate.org/widgets/sonic-pi/si/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/)     | sinhalese| :white_check_mark: | :red_circle:
+[![Translation Status of Sonic Pi: si](https://hosted.weblate.org/widgets/sonic-pi/si/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/)           | sinhalese           | :white_check_mark: | :red_circle:
+[![Translation Status of Sonic Pi: tr_TR](https://hosted.weblate.org/widgets/sonic-pi/tr_TR/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Turkish             | :white_check_mark: | :red_circle:
 
 Would you like to contribute a translation too? If so, please take a look at our [translation docs](https://github.com/samaaron/sonic-pi/blob/main/TRANSLATION.md) to get started.
 

TESTING.md

@@ -10,7 +10,7 @@ Sonic Pi doesn't have a database, so the tests are quite a lot
 simpler than your average web app.
 
 ```
-$ cd app/server/sonicpi/test
+$ cd app/server/ruby/test
 $ rake test
 ```
 

app/server/ruby/lib/sonicpi/scale.rb

@@ -46,25 +46,26 @@ class InvalidDegreeError < ArgumentError; end ;
       # Basic "besli"
       cargah_beslisi         = cargah_dortlusu + [tanini]
       buselik_beslisi        = buselik_dortlusu + [tanini]
-      kurdi_beslisi          = kurdi_dortlusu + [tanini]
       rast_beslisi           = rast_dortlusu + [tanini]
       huseyni_beslisi        = [buyuk_mucenneb, kucuk_mucenneb, tanini, tanini]
       hicaz_beslisi          = hicaz_dortlusu + [tanini]
       # Other "dortlu" and "besli"
-      saba_dortlusu          = [buyuk_mucenneb, kucuk_mucenneb, kucuk_mucenneb]
       segah_dortlusu         = [kucuk_mucenneb, tanini, buyuk_mucenneb]
       tam_segah_beslisi      = segah_dortlusu + [tanini]
       eksik_segah_beslisi    = segah_dortlusu + [kucuk_mucenneb]
       mustear_dortlusu       = [tanini, kucuk_mucenneb, buyuk_mucenneb]
-      tam_mustear_beslisi    = mustear_dortlusu + [tanini]
-      eksik_mustear_beslisi  = mustear_dortlusu + [kucuk_mucenneb]
       huzzam_beslisi         = [kucuk_mucenneb, tanini, kucuk_mucenneb, artik_ikili]
       nikriz_beslisi         = [tanini, kucuk_mucenneb, artik_ikili, kucuk_mucenneb]
-      pencgah_beslisi        = [tanini, tanini, buyuk_mucenneb, kucuk_mucenneb]
       tam_ferahnak_beslisi   = [kucuk_mucenneb, tanini, tanini, buyuk_mucenneb]
       eksik_ferahnak_beslisi = [kucuk_mucenneb, tanini, tanini, bakiyye]
       nisabur_dortlusu       = [buyuk_mucenneb, kucuk_mucenneb, tanini]
-      nisabur_beslisi        = nisabur_dortlusu + [bakiyye]
+      # currently unused, but can be used to extend other scales 
+      # kurdi_beslisi          = kurdi_dortlusu + [tanini]
+      # saba_dortlusu          = [buyuk_mucenneb, kucuk_mucenneb, kucuk_mucenneb]
+      # tam_mustear_beslisi    = mustear_dortlusu + [tanini]
+      # eksik_mustear_beslisi  = mustear_dortlusu + [kucuk_mucenneb]
+      # pencgah_beslisi        = [tanini, tanini, buyuk_mucenneb, kucuk_mucenneb]
+      # nisabur_beslisi        = nisabur_dortlusu + [bakiyye]
       {
            diatonic:           ionian_sequence,
            ionian:             ionian_sequence,
@@ -330,4 +331,4 @@ def inspect
       to_s
     end
   end
-end
+end

etc/doc/tutorial/10-State.md

@@ -19,6 +19,6 @@ might sound complex and difficult (in fact, in the UK, programming with
 multiple threads and shared memory is typically a university level
 subject). However, as you'll see, just like playing your first note,
 *Sonic Pi makes it incredibly simple to share state across threads*
-whilst still keeping your programs *thread-safe and deterministic.*.
+whilst still keeping your programs *thread-safe and deterministic*.
 
 Meet `get` and `set`...