From 4b0c43b8dad1e1c2bcb3253b5cc1409ee49d7d1b Mon Sep 17 00:00:00 2001
From: tmikulsk1 <FOR82qdm>
Date: Tue, 4 Dec 2018 10:21:14 -0200
Subject: [PATCH 1/3] Add slur on extender

---
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 465 ++++++++++--------
 .../comp_music_alg/Utils/SymbolKt.class       | Bin 0 -> 1256 bytes
 src/Main.java                                 |  98 ++--
 src/Utils/Symbol.kt                           |  14 +
 5 files changed, 330 insertions(+), 249 deletions(-)
 create mode 100644 out/production/comp_music_alg/Utils/SymbolKt.class
 create mode 100644 src/Utils/Symbol.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0548357..8e8843c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="true" project-jdk-name="9.0" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9867e87..475173b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,27 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="603e9f44-5bbf-4144-9fea-13bfa84c4649" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/IntervalExpander.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/IntervalExpander.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Ostinato.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Ostinato.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Rhythm.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Rhythm.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Objects/Note.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Objects/Note.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Conversor.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Conversor.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Normalizer.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Normalizer.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Randomic.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Randomic.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Rest.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Rest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Composition/NoteExtender.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Composition/NoteExtender.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Utils/Splitter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Utils/Splitter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -100,88 +86,30 @@
     </session>
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.50831354">
-      <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/Main.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="230">
-                  <caret line="25" column="65" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/Composition/Ostinato.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="69">
-                  <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/Composition/Crossover.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="319">
-                  <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/Finals/NoteDurations.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="253">
-                  <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="330">
-                  <caret line="51" selection-start-line="51" selection-end-line="51" />
-                  <folding>
-                    <element signature="e#21#100#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/Utils/Splitter.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1058">
-                  <caret line="46" selection-start-line="46" selection-end-line="46" />
-                  <folding>
-                    <element signature="e#15#66#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/Finals/NoteDuration.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state>
-                  <caret column="14" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="23" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf>
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Main.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Symbol.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Utils/Symbol.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="299">
+              <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -228,6 +156,7 @@
         <option value="$PROJECT_DIR$/src/Composition/NoteExtender.kt" />
         <option value="$PROJECT_DIR$/src/Utils/Splitter.kt" />
         <option value="$PROJECT_DIR$/src/Composition/Crossover.kt" />
+        <option value="$PROJECT_DIR$/src/Utils/Symbol.kt" />
         <option value="$PROJECT_DIR$/src/Main.java" />
       </list>
     </option>
@@ -238,46 +167,50 @@
     <option name="height" value="1047" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="AndroidView" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Composition" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="Finals" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Objects" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Utils" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -285,6 +218,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -309,45 +243,106 @@
       <option name="HEIGHT" value="0" />
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <option name="WIDTH" value="0" />
-      <method v="2">
+      <module />
+      <method>
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="Main" />
-      <module name="comp_music_alg" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="comp_music_alg" />
+      <envs />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method>
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="old_NoteConversor" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="old_NoteConversor" />
-      <module name="comp_music_alg" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="comp_music_alg" />
+      <envs />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <method v="2">
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method>
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
       <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
       <properties />
       <listeners />
-      <method v="2">
+      <method>
         <option name="Make" enabled="true" />
       </method>
     </configuration>
@@ -356,21 +351,24 @@
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
-      <method v="2">
+      <method>
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <list>
-      <item itemvalue="Application.old_NoteConversor" />
-      <item itemvalue="Application.Main" />
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="Application.old_NoteConversor" />
+      <item index="1" class="java.lang.String" itemvalue="Application.Main" />
     </list>
     <recent_temporary>
-      <list>
-        <item itemvalue="Application.Main" />
-        <item itemvalue="Application.old_NoteConversor" />
+      <list size="2">
+        <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+        <item index="1" class="java.lang.String" itemvalue="Application.old_NoteConversor" />
       </list>
     </recent_temporary>
   </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -397,60 +395,80 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12291667" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Image Layers" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32944915" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.27012712" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.28283897" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.329718" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32944915" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.32944915" />
-      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Messages" order="10" weight="0.32944915" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Theme Preview" order="5" />
-      <window_info anchor="right" id="Palette&#9;" order="6" />
-      <window_info anchor="right" id="Maven Projects" order="7" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28283897" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27012712" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12291667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1227758" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info id="Image Layers" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3296131" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.23809524" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39880952" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32998884" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Maven Projects" order="4" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="right" id="Theme Preview" order="7" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39880952" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23809524" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1227758" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296131" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -511,6 +529,24 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/Utils/Slurs.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="13" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="13" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="382">
+          <caret line="18" column="31" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="305" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Utils/Pause.java" />
     <entry file="file://$PROJECT_DIR$/src/old_NoteConversor.java" />
     <entry file="file://$PROJECT_DIR$/src/Octave.java" />
@@ -518,30 +554,30 @@
     <entry file="file://$PROJECT_DIR$/src/Utils/Randomic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/IntervalExpander.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="690">
-          <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+          <caret line="30" column="1" lean-forward="false" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/Rhythm.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="552">
-          <caret line="24" column="52" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
+          <caret line="24" column="52" lean-forward="false" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="667">
-          <caret line="30" column="81" selection-start-line="30" selection-start-column="81" selection-end-line="30" selection-end-column="81" />
+          <caret line="30" column="81" lean-forward="false" selection-start-line="30" selection-start-column="81" selection-end-line="30" selection-end-column="81" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -549,61 +585,58 @@
     <entry file="file://$PROJECT_DIR$/src/Finals/NoteDurations.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
-          <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+          <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Objects/Note.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Utils/Normalizer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
-          <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
+          <caret line="3" column="22" lean-forward="false" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Utils/Rest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
-          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+          <caret line="4" column="27" lean-forward="false" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Utils/Conversor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1277">
-          <caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
+          <caret line="30" column="67" lean-forward="false" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Generator.kt">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/Ostinato.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
-          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+          <caret line="3" column="27" lean-forward="false" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Finals/NoteDuration.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="14" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="23" />
+        <state relative-caret-position="0">
+          <caret line="0" column="14" lean-forward="false" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="23" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
-          <caret line="51" selection-start-line="51" selection-end-line="51" />
+          <caret line="51" column="0" lean-forward="false" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
           <folding>
-            <element signature="e#21#100#0" expanded="true" />
+            <element signature="e#21#100#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -611,9 +644,9 @@
     <entry file="file://$PROJECT_DIR$/src/Utils/Splitter.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1058">
-          <caret line="46" selection-start-line="46" selection-end-line="46" />
+          <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
           <folding>
-            <element signature="e#15#66#0" expanded="true" />
+            <element signature="e#15#66#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -621,14 +654,22 @@
     <entry file="file://$PROJECT_DIR$/src/Composition/Crossover.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="319">
-          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <caret line="20" column="33" lean-forward="false" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Utils/Symbol.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="25" column="65" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
+        <state relative-caret-position="115">
+          <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/out/production/comp_music_alg/Utils/SymbolKt.class b/out/production/comp_music_alg/Utils/SymbolKt.class
new file mode 100644
index 0000000000000000000000000000000000000000..15552166521e94093153edc2566d0282dad138f8
GIT binary patch
literal 1256
zcmah}TTc@~7(KHs-Lke&ii)L(7f{-&EY!ON1rc;(#Y+_vG0|x|)@ir9y1OOngW<tH
z;gb)V;G-`Z@WG&u{wFWrwnb4)Ogb|?XXd+}ul@S{<0k;eaEYPomM2YDFFdUmZS%6H
zf-%IZe2MEOw<`M8VpWug4KQfZa)sj+%!b2|O66zl`Xk$wp0q8!;PD3!a_N6?3`2R_
zspwVV6&+44bZ%L;$9*$bpSQjFhH2&)I$YmH7-5FNn(dj=(yL2#U0R-SEN<$C<vC<6
zORfryp|A8%lxo+w!|Q@x7;f7W!$>Osclx<aOu=_k$)y(}h#;zA8@d>Jw$!2`#?V<2
zUaK(-@l?9yr9u7D^V0Ql5ya7}p$FTkjm?<9?o{k#2)go_U<jnrMg+T%*oHpzGpOX1
zvK0{ww9I$Y8{!ytq>OfuO}(cud$8BH-S>wwtwK}`F@(7zW*;}W`QPeWa^})^A~=A9
ze)S^^?0Fbz%E9$>7)cqMy0!6sD;2>Z9QLz1LfT2IES``fgQ54IGtiT7YkEa^yv#jL
ziYxV{08JtDw<y746T*iyZLH>hQHU>((+sUIYZ@(Om!c_QrN1k-zTB^jv1}-&_~)0m
zA+k}*SyG}zb9t}cpi#NU%?hd5l5n&})dgqlGD#B8+a+!;a7Xf@DQ@~3Lw8<UV!lx?
z3a8CPX{<}NEBsL#CvP+?Pu7KDElF3B(e&?8W*Gka_Sba&@k}e&4W}gLq#rZUwprNX
z593e}q!v(zkU$4Q)R`$lpNaKbBQx>NRdfd?G9R#G4M{4lJeeGLjqAza{Y~5(gjSFx
zVlcUe{R-AG+yue<8*mk=mx%c$$#`ZBqXFDb4!lC=3&vJ{ywAL&U;#|izLQc);4*ZK
zQBsrw!jvX(o>o647=lXoVH`mxu0q3I!WBd@L-!hj-;iLecT~d#!XfgY(m6{@CAphG
z!5l#a=WvnEDPpr!`O!rL3><5Ij^o4zI%(h(P8&Fb+#;BZ2}~~1Z;t*+FzzDk;_Oev
Cl`cpC

literal 0
HcmV?d00001

diff --git a/src/Main.java b/src/Main.java
index debb08c..9fccb2c 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -16,7 +16,10 @@
 import static Composition.Ostinato.*;
 import static Utils.Conversor.*;
 import static Utils.Rest.*;
+
 import static Utils.SplitterKt.splitDuration;
+import static Utils.SymbolKt.insertSlur;
+
 
 
 public class Main {
@@ -33,7 +36,7 @@ public static void main(String[] args) {
             e.printStackTrace();
         }
         System.setOut(out);
-        
+
         /**
          * START WRITE
          */
@@ -150,43 +153,44 @@ private static void GenerateBody() {
         System.out.println("\t\t\\new StaffGroup");
         System.out.println("\t\t\t<<");
 
-            // Cello 1
-            System.out.println("\t\t\t\\new Staff = \"CelloOne\" {");
-            System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 1\"");
-            // INSERT NOTES
-            System.out.println("\t\t\t\t\\clef bass");
-            System.out.println("\t\t\t\t\\extendedNotesONE");
-            System.out.println("\t\t\t}");
-
-            // Cello 2
-            System.out.println("\t\t\t\\new Staff = \"CelloTwo\" {");
-            System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 2\"");
-            // INSERT NOTES
-            System.out.println("\t\t\t\t\\clef bass");
-            System.out.println("\t\t\t\t\\extendedNotesTWO");
-            System.out.println("\t\t\t}");
-
-            //Cello 3
-            System.out.println("\t\t\t\\new Staff = \"CelloThree\" {");
-            System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 3\"");
-            // INSERT NOTES
-            System.out.println("\t\t\t\t\\clef bass");
-            System.out.println("\t\t\t\t\\extendedNotesTHREE");
-            System.out.println("\t\t\t}");
-
-            //Cello 4
-            System.out.println("\t\t\t\\new Staff = \"CelloFour\" {");
-            System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 4\"");
-            // INSERT NOTES
-            System.out.println("\t\t\t\t\\clef bass");
-            System.out.println("\t\t\t\t\\extendedNotesFOUR");
-            System.out.println("\t\t\t}");
+        // Cello 1
+        System.out.println("\t\t\t\\new Staff = \"CelloOne\" {");
+        System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 1\"");
+        // INSERT NOTES
+        System.out.println("\t\t\t\t\\clef bass");
+        System.out.println("\t\t\t\t\\extendedNotesONE");
+        System.out.println("\t\t\t}");
+
+        // Cello 2
+        System.out.println("\t\t\t\\new Staff = \"CelloTwo\" {");
+        System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 2\"");
+        // INSERT NOTES
+        System.out.println("\t\t\t\t\\clef bass");
+        System.out.println("\t\t\t\t\\extendedNotesTWO");
+        System.out.println("\t\t\t}");
+
+        //Cello 3
+        System.out.println("\t\t\t\\new Staff = \"CelloThree\" {");
+        System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 3\"");
+        // INSERT NOTES
+        System.out.println("\t\t\t\t\\clef bass");
+        System.out.println("\t\t\t\t\\extendedNotesTHREE");
+        System.out.println("\t\t\t}");
+
+        //Cello 4
+        System.out.println("\t\t\t\\new Staff = \"CelloFour\" {");
+        System.out.println("\t\t\t\t\\set Staff.instrumentName = #\"Cello 4\"");
+        // INSERT NOTES
+        System.out.println("\t\t\t\t\\clef bass");
+        System.out.println("\t\t\t\t\\extendedNotesFOUR");
+        System.out.println("\t\t\t}");
 
         System.out.println("\t\t\t>>");
         System.out.println("\t\t>>");
         System.out.println("\t}");
     }
 
+
     private static void GenerateExtendedNotes1() {
         List<String> listOfNotes = Arrays.asList("a","b", "cis", "g", "gis");
         List<Staff> extendedNotes = extendNotes(55, 4, listOfNotes);
@@ -196,27 +200,49 @@ private static void GenerateExtendedNotes1() {
         Result cello3 = splitDuration(extendedNotes.get(2));
         Result cello4 = splitDuration(extendedNotes.get(3));
 
+        Staff cello1WithSlur = insertSlur(cello1.getStaff());
+        Staff cello2WithSlur = insertSlur(cello2.getStaff());
+        Staff cello3WithSlur = insertSlur(cello3.getStaff());
+        Staff cello4WithSlur = insertSlur(cello4.getStaff());
+
         System.out.println("extendedNotesONE = { ");
         for (int i = 0 ; i < cello1.getStaff().getNote().size() ; i++) {
-            System.out.print(cello1.getStaff().getNote().get(i) + cello1.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(
+                    cello1.getStaff().getNote().get(i) +
+                            cello1.getStaff().getDuration().get(i).getLilypondDuration() +
+                            cello1WithSlur.getSymbol().get(i) + " "
+
+            );
         }
         System.out.println("}");
 
         System.out.println("extendedNotesTWO = { ");
         for (int i = 0 ; i < cello2.getStaff().getNote().size() ; i++) {
-            System.out.print(cello2.getStaff().getNote().get(i) + cello2.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(
+                    cello2.getStaff().getNote().get(i) +
+                            cello2.getStaff().getDuration().get(i).getLilypondDuration() +
+                            cello2WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
         System.out.println("extendedNotesTHREE = { ");
         for (int i = 0 ; i < cello3.getStaff().getNote().size() ; i++) {
-            System.out.print(cello3.getStaff().getNote().get(i) + cello3.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(
+                    cello3.getStaff().getNote().get(i) +
+                            cello3.getStaff().getDuration().get(i).getLilypondDuration() +
+                            cello3WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
         System.out.println("extendedNotesFOUR = { ");
         for (int i = 0 ; i < cello4.getStaff().getNote().size() ; i++) {
-            System.out.print(cello4.getStaff().getNote().get(i) + cello4.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(
+                    cello4.getStaff().getNote().get(i) +
+                            cello4.getStaff().getDuration().get(i).getLilypondDuration() +
+                            cello4WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
diff --git a/src/Utils/Symbol.kt b/src/Utils/Symbol.kt
new file mode 100644
index 0000000..18bb0e8
--- /dev/null
+++ b/src/Utils/Symbol.kt
@@ -0,0 +1,14 @@
+package Utils
+
+import Composition.Staff
+
+fun insertSlur(staff: Staff): Staff {
+
+    for (index in 0..(staff.symbol.size-1)) {
+        if (index+1 > staff.symbol.size-1) { continue }
+        if (staff.note[index] == staff.note[index + 1]) {
+            staff.symbol.set(index, "~")
+        }
+    }
+    return staff
+}
\ No newline at end of file

From a2741f361c1f3df70bba7ab686c9336bbf5e5e4e Mon Sep 17 00:00:00 2001
From: tmikulsk1 <FOR82qdm>
Date: Tue, 4 Dec 2018 10:29:33 -0200
Subject: [PATCH 2/3] Add slur in crossover

---
 .idea/workspace.xml | 21 ++++++++++++++-------
 src/Main.java       | 27 +++++++++++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 475173b..93aa0d2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="603e9f44-5bbf-4144-9fea-13bfa84c4649" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtender.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtender.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" />
       <change beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -90,8 +97,8 @@
       <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
+            <state relative-caret-position="415">
+              <caret line="350" column="0" lean-forward="true" selection-start-line="350" selection-start-column="0" selection-end-line="350" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -404,7 +411,7 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -668,8 +675,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
+        <state relative-caret-position="415">
+          <caret line="350" column="0" lean-forward="true" selection-start-line="350" selection-start-column="0" selection-end-line="350" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/Main.java b/src/Main.java
index 9fccb2c..153bace 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -20,8 +20,6 @@
 import static Utils.SplitterKt.splitDuration;
 import static Utils.SymbolKt.insertSlur;
 
-
-
 public class Main {
     public static void main(String[] args) {
         /**
@@ -306,27 +304,44 @@ private static void GenerateCrossOver(Staff one, Staff two, Staff three, Staff f
         Result crossover3 = SimpleCrossover(three, four);
         Result crossover4 = SimpleCrossover(four, one);
 
+        Staff cross1WithSlur = insertSlur(crossover1.getStaff());
+        Staff cross2WithSlur = insertSlur(crossover2.getStaff());
+        Staff cross3WithSlur = insertSlur(crossover3.getStaff());
+        Staff cross4WithSlur = insertSlur(crossover4.getStaff());
+
         System.out.println("crossoverONE = { ");
         for (int i = 0 ; i < crossover1.getStaff().getNote().size() ; i++) {
-            System.out.print(crossover1.getStaff().getNote().get(i) + crossover1.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(crossover1.getStaff().getNote().get(i) +
+                    crossover1.getStaff().getDuration().get(i).getLilypondDuration() +
+                    cross1WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
         System.out.println("crossoverTWO = { ");
         for (int i = 0 ; i < crossover2.getStaff().getNote().size() ; i++) {
-            System.out.print(crossover2.getStaff().getNote().get(i) + crossover2.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(crossover2.getStaff().getNote().get(i) +
+                    crossover2.getStaff().getDuration().get(i).getLilypondDuration() +
+                    cross2WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
         System.out.println("crossoverTHREE = { ");
         for (int i = 0 ; i < crossover3.getStaff().getNote().size() ; i++) {
-            System.out.print(crossover3.getStaff().getNote().get(i) + crossover3.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(crossover3.getStaff().getNote().get(i) +
+                    crossover3.getStaff().getDuration().get(i).getLilypondDuration() +
+                    cross3WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 
         System.out.println("crossoverFOUR = { ");
         for (int i = 0 ; i < crossover4.getStaff().getNote().size() ; i++) {
-            System.out.print(crossover4.getStaff().getNote().get(i) + crossover4.getStaff().getDuration().get(i).getLilypondDuration() + " ");
+            System.out.print(crossover4.getStaff().getNote().get(i) +
+                    crossover4.getStaff().getDuration().get(i).getLilypondDuration() +
+                    cross4WithSlur.getSymbol().get(i) + " "
+            );
         }
         System.out.println("}");
 

From a39c72b40a52bea11a35030134e2a2bcab019125 Mon Sep 17 00:00:00 2001
From: Tahbata Mikulski Ali <tahbata@msn.com>
Date: Sun, 16 Dec 2018 15:36:27 -0200
Subject: [PATCH 3/3] Add staffs together

---
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 552 +++++++++---------
 .../Utils/StaffInsertionKt.class              | Bin 0 -> 1592 bytes
 src/Main.java                                 |  26 +-
 src/Utils/Conversor.java                      |  47 ++
 src/Utils/Rest.java                           |  14 +
 src/Utils/StaffInsertion.kt                   |  25 +
 7 files changed, 377 insertions(+), 289 deletions(-)
 create mode 100644 out/production/comp_music_alg/Utils/StaffInsertionKt.class
 create mode 100644 src/Utils/StaffInsertion.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8e8843c..0548357 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="true" project-jdk-name="9.0" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 93aa0d2..24108a9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/Utils/Rest.java" line="3" />
+    <bookmark url="file://$PROJECT_DIR$/src/Utils/Rest.java" line="5" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="603e9f44-5bbf-4144-9fea-13bfa84c4649" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtender.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtender.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" />
-      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" />
-      <change beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/IntervalExpander.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/IntervalExpander.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/NoteExtenderKt.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Ostinato.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Ostinato.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Rhythm.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Composition/Rhythm.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Finals/NoteDurations.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/META-INF/comp_music_alg.kotlin_module" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Main.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Objects/Note.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Objects/Note.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Conversor.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Conversor.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Duration.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Normalizer.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Normalizer.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Randomic.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Randomic.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Rest.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Rest.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/Result.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/SplitterKt.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/comp_music_alg/Utils/TimeSignature.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Utils/Conversor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Utils/Conversor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Utils/Rest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Utils/Rest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -62,43 +72,100 @@
           <entry key="project.closed" value="2" />
           <entry key="project.open.time.3" value="1" />
           <entry key="project.open.time.5" value="1" />
-          <entry key="project.open.time.8" value="2" />
-          <entry key="project.opened" value="4" />
+          <entry key="project.open.time.8" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2999" />
-          <entry key="kt" value="5179" />
+          <entry key="java" value="3804" />
+          <entry key="kt" value="5567" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2999" />
-          <entry key="Kotlin" value="5179" />
+          <entry key="JAVA" value="3804" />
+          <entry key="Kotlin" value="5567" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="5" />
-          <entry key="kt" value="8" />
+          <entry key="java" value="9" />
+          <entry key="kt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="5" />
-          <entry key="Kotlin" value="8" />
+          <entry key="JAVA" value="9" />
+          <entry key="Kotlin" value="13" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="415">
-              <caret line="350" column="0" lean-forward="true" selection-start-line="350" selection-start-column="0" selection-end-line="350" selection-end-column="0" />
+            <state relative-caret-position="4531">
+              <caret line="197" selection-start-line="197" selection-end-line="197" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://C:/Program Files/Java/jdk1.8.0_112/src.zip!/java/util/ArrayList.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="652" selection-start-line="652" selection-end-line="652" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Utils/StaffInsertion.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="414">
+              <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Utils/Rest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="445">
+              <caret line="24" selection-start-line="24" selection-end-line="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Utils/Splitter.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="583">
+              <caret line="60" selection-start-line="60" selection-end-line="60" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Composition/Crossover.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="468">
+              <caret line="27" selection-start-line="27" selection-end-line="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Utils/Conversor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="43" selection-start-line="43" selection-end-line="43" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -106,12 +173,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Symbol.kt" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="514">
+              <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Finals/NoteDuration.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="485">
+              <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Utils/Symbol.kt">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="299">
-              <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-              <folding />
+              <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -149,22 +233,23 @@
         <option value="$PROJECT_DIR$/src/Utils/Note.java" />
         <option value="$PROJECT_DIR$/src/Utils/Normalizer.java" />
         <option value="$PROJECT_DIR$/src/Utils/Pause.java" />
-        <option value="$PROJECT_DIR$/src/Utils/Conversor.java" />
         <option value="$PROJECT_DIR$/src/Utils/Randomic.java" />
         <option value="$PROJECT_DIR$/src/Objects/Note.java" />
         <option value="$PROJECT_DIR$/src/Composition/Rhythm.java" />
-        <option value="$PROJECT_DIR$/src/Utils/Rest.java" />
         <option value="$PROJECT_DIR$/src/Composition/Ostinato.java" />
         <option value="$PROJECT_DIR$/src/Main.kt" />
         <option value="$PROJECT_DIR$/src/Composition/IntervalExpander.java" />
         <option value="$PROJECT_DIR$/src/Composition/NoteExtender.java" />
         <option value="$PROJECT_DIR$/src/Finals/NoteDurations.java" />
-        <option value="$PROJECT_DIR$/src/Finals/NoteDuration.kt" />
-        <option value="$PROJECT_DIR$/src/Composition/NoteExtender.kt" />
         <option value="$PROJECT_DIR$/src/Utils/Splitter.kt" />
         <option value="$PROJECT_DIR$/src/Composition/Crossover.kt" />
         <option value="$PROJECT_DIR$/src/Utils/Symbol.kt" />
+        <option value="$PROJECT_DIR$/src/Finals/NoteDuration.kt" />
+        <option value="$PROJECT_DIR$/src/Composition/NoteExtender.kt" />
+        <option value="$PROJECT_DIR$/src/Utils/Conversor.java" />
+        <option value="$PROJECT_DIR$/src/Utils/Rest.java" />
         <option value="$PROJECT_DIR$/src/Main.java" />
+        <option value="$PROJECT_DIR$/src/Utils/StaffInsertion.kt" />
       </list>
     </option>
   </component>
@@ -174,50 +259,46 @@
     <option name="height" value="1047" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Composition" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Finals" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Objects" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="Algotithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Algotithmic_Composer" type="462c0819:PsiDirectoryNode" />
+              <item name="Algorithmic_Composer" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Algorithmic_Composer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="Utils" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -225,11 +306,10 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543894365084" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544981562145" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="settings.editor.selected.configurable" value="preferences.language.Kotlin" />
   </component>
@@ -250,106 +330,45 @@
       <option name="HEIGHT" value="0" />
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <option name="WIDTH" value="0" />
-      <module />
-      <method>
+      <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="Main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="comp_music_alg" />
-      <envs />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method>
+      <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="old_NoteConversor" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="old_NoteConversor" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="comp_music_alg" />
-      <envs />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method>
+      <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
       <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
       <properties />
       <listeners />
-      <method>
+      <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
@@ -358,24 +377,21 @@
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
-      <method>
+      <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <list size="2">
-      <item index="0" class="java.lang.String" itemvalue="Application.old_NoteConversor" />
-      <item index="1" class="java.lang.String" itemvalue="Application.Main" />
+    <list>
+      <item itemvalue="Application.old_NoteConversor" />
+      <item itemvalue="Application.Main" />
     </list>
     <recent_temporary>
-      <list size="2">
-        <item index="0" class="java.lang.String" itemvalue="Application.Main" />
-        <item index="1" class="java.lang.String" itemvalue="Application.old_NoteConversor" />
+      <list>
+        <item itemvalue="Application.Main" />
+        <item itemvalue="Application.old_NoteConversor" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -402,80 +418,60 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28283897" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27012712" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12291667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32944915" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12291667" />
+      <window_info id="Structure" order="1" weight="0.25" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32944915" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.27012712" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.28283897" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.329718" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32944915" />
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.32944915" />
+      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.32944915" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Maven Projects" order="7" />
     </layout>
     <layout-to-restore>
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39880952" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23809524" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998884" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1227758" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296131" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1227758" />
+      <window_info id="Structure" order="1" weight="0.25" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Image Layers" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3296131" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.23809524" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39880952" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="8" />
+      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32998884" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Maven Projects" order="4" />
+      <window_info anchor="right" id="Palette&#9;" order="5" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info anchor="right" id="Theme Preview" order="7" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -484,17 +480,23 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/src/Composition/Crossover.kt</url>
-          <line>27</line>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/Utils/Rest.java</url>
+          <line>24</line>
+          <properties />
+          <option name="timeStamp" value="28" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/Main.java</url>
+          <line>200</line>
           <properties />
-          <option name="timeStamp" value="23" />
+          <option name="timeStamp" value="29" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/src/Utils/Splitter.kt</url>
-          <line>60</line>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/Utils/Conversor.java</url>
+          <line>43</line>
           <properties />
-          <option name="timeStamp" value="24" />
+          <option name="timeStamp" value="30" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -536,24 +538,7 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Utils/Slurs.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="13" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="382">
-          <caret line="18" column="31" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="305" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Utils/Slurs.kt" />
     <entry file="file://$PROJECT_DIR$/src/Utils/Pause.java" />
     <entry file="file://$PROJECT_DIR$/src/old_NoteConversor.java" />
     <entry file="file://$PROJECT_DIR$/src/Octave.java" />
@@ -561,122 +546,129 @@
     <entry file="file://$PROJECT_DIR$/src/Utils/Randomic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/IntervalExpander.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="690">
-          <caret line="30" column="1" lean-forward="false" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+          <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/Rhythm.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="552">
-          <caret line="24" column="52" lean-forward="false" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
+          <caret line="24" column="52" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="667">
-          <caret line="30" column="81" lean-forward="false" selection-start-line="30" selection-start-column="81" selection-end-line="30" selection-end-column="81" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
+          <caret line="30" column="81" selection-start-line="30" selection-start-column="81" selection-end-line="30" selection-end-column="81" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Finals/NoteDurations.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
-          <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+          <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Objects/Note.java">
+    <entry file="file://$PROJECT_DIR$/src/Utils/Normalizer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="69">
+          <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Utils/Normalizer.java">
+    <entry file="file://$PROJECT_DIR$/src/Composition/Ostinato.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
-          <caret line="3" column="22" lean-forward="false" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
+          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Utils/Rest.java">
+    <entry file="file://$PROJECT_DIR$/src/Objects/Note.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="27" lean-forward="false" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+        <state relative-caret-position="322">
+          <caret line="14" column="45" lean-forward="true" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Utils/Conversor.java">
+    <entry file="file://$PROJECT_DIR$/src/Utils/Splitter.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1277">
-          <caret line="30" column="67" lean-forward="false" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
+        <state relative-caret-position="583">
+          <caret line="60" selection-start-line="60" selection-end-line="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Composition/Ostinato.java">
+    <entry file="file://$PROJECT_DIR$/src/Composition/Crossover.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" column="27" lean-forward="false" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+        <state relative-caret-position="468">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Finals/NoteDuration.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="14" lean-forward="false" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="23" />
+        <state relative-caret-position="485">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Utils/Symbol.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Composition/NoteExtender.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="51" column="0" lean-forward="false" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
-          <folding>
-            <element signature="e#21#100#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="514">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Utils/Splitter.kt">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_112/src.zip!/java/util/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1058">
-          <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
+        <state relative-caret-position="221">
+          <caret line="652" selection-start-line="652" selection-end-line="652" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Utils/Conversor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="43" selection-start-line="43" selection-end-line="43" />
           <folding>
-            <element signature="e#15#66#0" expanded="false" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Composition/Crossover.kt">
+    <entry file="file://$PROJECT_DIR$/src/Utils/Rest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="20" column="33" lean-forward="false" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+        <state relative-caret-position="445">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Utils/Symbol.kt">
+    <entry file="file://$PROJECT_DIR$/src/Utils/StaffInsertion.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="414">
+          <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="350" column="0" lean-forward="true" selection-start-line="350" selection-start-column="0" selection-end-line="350" selection-end-column="0" />
+        <state relative-caret-position="4531">
+          <caret line="197" selection-start-line="197" selection-end-line="197" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/out/production/comp_music_alg/Utils/StaffInsertionKt.class b/out/production/comp_music_alg/Utils/StaffInsertionKt.class
new file mode 100644
index 0000000000000000000000000000000000000000..9cfaf3e7f4a1fbcc893a45b87a1251b075932a1a
GIT binary patch
literal 1592
zcmah}T~8ZF6g{(GuQ3KTCL!2q(v(2(2W1IOKb<C}rm0pnBq}Xci_~bm9-PJN-Dqdl
zRo^JTrjLE<r&OUn<~QWGRK2q{7&}Onyfbsp+_`hlxp(~X-#`Bba37yDEPSmzU)p<$
zA09e^6p`}6;0tAfF<3{u$8DbnZTm^{NVtSfFid-iTXKS-R%+D4?u$@*`d~j!?GmVb
z3C3`z5k_tMNT_DSDXh(dAXHpOlJ;(>c4ObKF=Qj*3a=-k<&6w747WO=^1Z-5>UC`|
zP$CMrZ##jCD1_%q6Iq7q?sMUGp7Mxy1$j7f5RPHB)EMVgyMXNJFzs4-KZhJ<vY5s!
zLnaVEB!n}t7_Pj=*hHSeYzsxV2!?#A+>aQOxOT&ns+Pl5T+3n}3k+A2`;)zT==&rr
z5jL^NFgx7Qr%V(X(!AB$@_mNFAn~z-weoj4yn&n3xPe<#9?D`njuH`bxZS_>Eruz=
z_kQd)LqCT*eRP@7<uh#=<}WSLtQ=_#hSZ@KNtHpFQj@|BgH{GrT0igtPd#L4UQ9FL
zKCZ>M?KCbc=(afIv9IdX3o43T6-GNe>WC;Q&D&VlV%l_X7^@etqN<!l*%6AjxZ>0~
zMz=RXozC<yLuNBEp-t*!*3k=t@YX$sN2kZxEPckJku@@@;(~R0Tr@V=X4*0a^Msy@
zd23S7mHu8zumAZuoz`JCse~>)hiBcGI`J9z+mzSn+gk5Xu9Nk!rTe52y4>IAk;j|9
z_(~59a}6&LyK%QEq5*Q_%Q#S8S2#h>lO8#34W9|a^7!s~(~r1i_rf@G#bZz3Q5c-r
ze=Q#F!N4TRLc*Yc6w;*DCuIFZwn6h&B|r5$=BoKCG**7a^(uX*DExsp4SYku5&=sW
zffWK)hQKdL=q(x-`T=nlt7K7VShQmJl-7AlB1f0sgo$-z@CZ|=6P~7hljd#uW{iQ+
zhYBd2XZwnrba78A`AU-Q8jXKp{#(YFWwPI}v9m^b>-^6%)4&KB0+uwPiyouw$YX^(
zhU_#jLU(OQ_cmoz#B)-3H6eb2@__gWs^`R)h%Ei_kmnqs79NlkJJjmm;~GMe>==vx
zCxn5|h`K?VJ*L?qkv6H2?;K#l!Tsd-F5Ww{-goc;K6LOAY6oDF?)&%vrbJ0%RiZ3W
Ll}Jfg5)c0av><kr

literal 0
HcmV?d00001

diff --git a/src/Main.java b/src/Main.java
index 153bace..cb358c5 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -18,15 +18,16 @@
 import static Utils.Rest.*;
 
 import static Utils.SplitterKt.splitDuration;
+import static Utils.StaffInsertionKt.staffInsertion;
 import static Utils.SymbolKt.insertSlur;
 
 public class Main {
+    private static Staff expanderAsStaff;
+
     public static void main(String[] args) {
         /**
-         *
          * GENERATE .LY
          */
-
         PrintStream out = null;
         try {
             out = new PrintStream(new FileOutputStream("output.ly"));
@@ -39,8 +40,6 @@ public static void main(String[] args) {
          * START WRITE
          */
         GenerateHeader();
-
-        GenerateExtendedNotes1();
         GenerateGrupetos();
 
         /**
@@ -55,6 +54,7 @@ public static void main(String[] args) {
         }
 
         String[] finalConversion = LilypondConversor(notes);
+        expanderAsStaff = StaffConversor(notes);
 
         System.out.println("partONE = { ");
 
@@ -113,6 +113,7 @@ public static void main(String[] args) {
 
         System.out.println("}");
 
+        GenerateExtendedNotes1();
         GenerateBody();
         GenerateFooter();
 
@@ -190,13 +191,22 @@ private static void GenerateBody() {
 
 
     private static void GenerateExtendedNotes1() {
+
+        Staff begin1 = expanderAsStaff;
+        Staff restForStaffs = RestGeneratorForStaff(expanderAsStaff);
+
         List<String> listOfNotes = Arrays.asList("a","b", "cis", "g", "gis");
         List<Staff> extendedNotes = extendNotes(55, 4, listOfNotes);
 
-        Result cello1 = splitDuration(extendedNotes.get(0));
-        Result cello2 = splitDuration(extendedNotes.get(1));
-        Result cello3 = splitDuration(extendedNotes.get(2));
-        Result cello4 = splitDuration(extendedNotes.get(3));
+        Staff cello1Line = staffInsertion(begin1, extendedNotes.get(0));
+        Staff cello2Line = staffInsertion(restForStaffs, extendedNotes.get(1));
+        Staff cello3Line = staffInsertion(restForStaffs, extendedNotes.get(2));
+        Staff cello4Line = staffInsertion(restForStaffs, extendedNotes.get(3));
+
+        Result cello1 = splitDuration(cello1Line);
+        Result cello2 = splitDuration(cello2Line);
+        Result cello3 = splitDuration(cello3Line);
+        Result cello4 = splitDuration(cello4Line);
 
         Staff cello1WithSlur = insertSlur(cello1.getStaff());
         Staff cello2WithSlur = insertSlur(cello2.getStaff());
diff --git a/src/Utils/Conversor.java b/src/Utils/Conversor.java
index 5783d62..81db2ac 100644
--- a/src/Utils/Conversor.java
+++ b/src/Utils/Conversor.java
@@ -1,5 +1,7 @@
 package Utils;
 
+import Composition.Staff;
+import Finals.NoteDuration;
 import Objects.Note;
 
 public class Conversor {
@@ -28,6 +30,20 @@ public static String[] LilypondConversor(Note[] notes) {
         return output;
     }
 
+    public static Staff StaffConversor(Note[] notes) {
+        Staff output = new Staff();
+
+        for (int i = 0 ; i < notes.length ; i++) {
+            String note = convertToPitch(notes[i].getPitchClass()) + convertToLilypondOctave( notes[i].getOctave());
+            output.component1().add(i, note);
+            NoteDuration duration = new NoteDuration(notes[i].getDuration(), String.valueOf(notes[i].getDuration()));
+            output.component2().add(i,duration);
+            output.component3().add(i, "");
+        }
+
+        return output;
+    }
+
     public static String[] LilypondConversorWithRandomRest(Note[] notes, int randomLevel) {
         String[] output = new String[notes.length];
 
@@ -141,4 +157,35 @@ private static String convertToDuration(int octave, int duration) {
         }
         return output;
     }
+
+    private static String convertToLilypondOctave(int octave) {
+        String output;
+        switch (octave) {
+            case 0:
+                output = ",,,";
+                break;
+            case 1:
+                output = ",,";
+                break;
+            case 2:
+                output = ",";
+                break;
+            case 3:
+                output = "";
+                break;
+            case 4:
+                output = "'";
+                break;
+            case 5:
+                output = "''";
+                break;
+            case 6:
+                output = "'''";
+                break;
+            default:
+                output = "";
+                break;
+        }
+        return output;
+    }
 }
diff --git a/src/Utils/Rest.java b/src/Utils/Rest.java
index eac84d6..90aa978 100644
--- a/src/Utils/Rest.java
+++ b/src/Utils/Rest.java
@@ -1,5 +1,7 @@
 package Utils;
 
+import Composition.Staff;
+
 public class Rest {
 
     public static String[] RestGenerator(int[] rhythm, int size, int beginAt) {
@@ -10,4 +12,16 @@ public static String[] RestGenerator(int[] rhythm, int size, int beginAt) {
         }
         return restList;
     }
+
+    public static Staff RestGeneratorForStaff(Staff baseStaff) {
+        Staff output = new Staff();
+
+        for (int i = 0 ; i < baseStaff.getDuration().size() ; i++) {
+            output.component1().add(i, "r");
+            output.component2().add(i, baseStaff.getDuration().get(i));
+            output.component3().add(i, baseStaff.getSymbol().get(i));
+        }
+
+        return output;
+    }
 }
\ No newline at end of file
diff --git a/src/Utils/StaffInsertion.kt b/src/Utils/StaffInsertion.kt
new file mode 100644
index 0000000..196718d
--- /dev/null
+++ b/src/Utils/StaffInsertion.kt
@@ -0,0 +1,25 @@
+package Utils
+
+import Composition.Staff
+
+fun Staff.insertStaff(newStaff: Staff) : Staff {
+    note.addAll(newStaff.note)
+    duration.addAll(newStaff.duration)
+    symbol.addAll(newStaff.symbol)
+    return this
+}
+
+fun staffInsertion(first: Staff, second: Staff) : Staff {
+    var output = Staff()
+
+    output.note.addAll(first.note)
+    output.note.addAll(second.note)
+
+    output.duration.addAll(first.duration)
+    output.duration.addAll(second.duration)
+
+    output.symbol.addAll(first.symbol)
+    output.symbol.addAll(second.symbol)
+
+    return output
+}
\ No newline at end of file