head_music.rb in head_music-0.19.1

- old
+ new
@@ -59,45 +59,45 @@
 # analysis
 require 'head_music/style/analysis'
 require 'head_music/style/annotation'
 require 'head_music/style/mark'
 
-# annotations
-require 'head_music/style/annotations/always_move'
-require 'head_music/style/annotations/approach_perfection_contrarily'
-require 'head_music/style/annotations/at_least_eight_notes'
-require 'head_music/style/annotations/avoid_crossing_voices'
-require 'head_music/style/annotations/avoid_overlapping_voices'
-require 'head_music/style/annotations/consonant_climax'
-require 'head_music/style/annotations/consonant_downbeats'
-require 'head_music/style/annotations/diatonic'
-require 'head_music/style/annotations/direction_changes'
-require 'head_music/style/annotations/end_on_perfect_consonance'
-require 'head_music/style/annotations/end_on_tonic'
-require 'head_music/style/annotations/frequent_direction_changes'
-require 'head_music/style/annotations/limit_octave_leaps'
-require 'head_music/style/annotations/moderate_direction_changes'
-require 'head_music/style/annotations/mostly_conjunct'
-require 'head_music/style/annotations/notes_same_length'
-require 'head_music/style/annotations/no_rests'
-require 'head_music/style/annotations/no_unisons_in_middle'
-require 'head_music/style/annotations/one_to_one'
-require 'head_music/style/annotations/prefer_contrary_motion'
-require 'head_music/style/annotations/prefer_imperfect'
-require 'head_music/style/annotations/prepare_octave_leaps'
-require 'head_music/style/annotations/recover_large_leaps'
-require 'head_music/style/annotations/singable_intervals'
-require 'head_music/style/annotations/singable_range'
-require 'head_music/style/annotations/single_large_leaps'
-require 'head_music/style/annotations/start_on_perfect_consonance'
-require 'head_music/style/annotations/start_on_tonic'
-require 'head_music/style/annotations/step_down_to_final_note'
-require 'head_music/style/annotations/step_out_of_unison'
-require 'head_music/style/annotations/step_to_final_note'
-require 'head_music/style/annotations/step_up_to_final_note'
-require 'head_music/style/annotations/up_to_fourteen_notes'
+# guidelines
+require 'head_music/style/guidelines/always_move'
+require 'head_music/style/guidelines/approach_perfection_contrarily'
+require 'head_music/style/guidelines/at_least_eight_notes'
+require 'head_music/style/guidelines/avoid_crossing_voices'
+require 'head_music/style/guidelines/avoid_overlapping_voices'
+require 'head_music/style/guidelines/consonant_climax'
+require 'head_music/style/guidelines/consonant_downbeats'
+require 'head_music/style/guidelines/diatonic'
+require 'head_music/style/guidelines/direction_changes'
+require 'head_music/style/guidelines/end_on_perfect_consonance'
+require 'head_music/style/guidelines/end_on_tonic'
+require 'head_music/style/guidelines/frequent_direction_changes'
+require 'head_music/style/guidelines/limit_octave_leaps'
+require 'head_music/style/guidelines/moderate_direction_changes'
+require 'head_music/style/guidelines/mostly_conjunct'
+require 'head_music/style/guidelines/notes_same_length'
+require 'head_music/style/guidelines/no_rests'
+require 'head_music/style/guidelines/no_unisons_in_middle'
+require 'head_music/style/guidelines/one_to_one'
+require 'head_music/style/guidelines/prefer_contrary_motion'
+require 'head_music/style/guidelines/prefer_imperfect'
+require 'head_music/style/guidelines/prepare_octave_leaps'
+require 'head_music/style/guidelines/recover_large_leaps'
+require 'head_music/style/guidelines/singable_intervals'
+require 'head_music/style/guidelines/singable_range'
+require 'head_music/style/guidelines/single_large_leaps'
+require 'head_music/style/guidelines/start_on_perfect_consonance'
+require 'head_music/style/guidelines/start_on_tonic'
+require 'head_music/style/guidelines/step_down_to_final_note'
+require 'head_music/style/guidelines/step_out_of_unison'
+require 'head_music/style/guidelines/step_to_final_note'
+require 'head_music/style/guidelines/step_up_to_final_note'
+require 'head_music/style/guidelines/up_to_fourteen_notes'
 
-# rulesets
-require 'head_music/style/rulesets/fux_cantus_firmus'
-require 'head_music/style/rulesets/modern_cantus_firmus'
-require 'head_music/style/rulesets/first_species_melody'
-require 'head_music/style/rulesets/first_species_harmony'
+# guides
+require 'head_music/style/guides/fux_cantus_firmus'
+require 'head_music/style/guides/modern_cantus_firmus'
+require 'head_music/style/guides/first_species_melody'
+require 'head_music/style/guides/first_species_harmony'