refactoring

Author: gilbertohasnofb

src/score_maker/__init__.py

@@ -5,6 +5,22 @@
 score_maker contains the main make_score function used to generate the score.
 """
 
+from .compile_ly_file import compile_ly_file
+from .create_staves import create_staves
+from .final_tweaks import final_tweaks
+from .generate_lilypond_file_structure import generate_lilypond_file_structure
+from .generate_materials import generate_materials
+from .generate_segments import generate_segments
+from .prettify_score import prettify_score
 from .score_maker import score_maker
 
-__all__ = ["score_maker"]
+__all__ = [
+    "compile_ly_file",
+    "create_staves",
+    "final_tweaks",
+    "generate_lilypond_file_structure",
+    "generate_materials",
+    "generate_segments",
+    "prettify_score",
+    "score_maker",
+]

src/score_maker/final_tweaks.py

@@ -2,12 +2,7 @@
 
 import abjad
 
-from .add_final_bar_line import add_final_bar_line as add_final_bar_line_func
-from .add_initial_clefs import add_initial_clefs as add_initial_clefs_func
-from .add_initial_tempo import add_initial_tempo as add_initial_tempo_func
-from .add_instrument_names import add_instrument_names as add_instrument_names_func
-from .add_large_time_signatures import add_large_time_signatures as add_large_time_signatures_func
-from .add_miscellaneous_tweaks import add_miscellaneous_tweaks as add_miscellaneous_tweaks_func
+from .. import utils
 
 
 def final_tweaks(
@@ -47,15 +42,15 @@ def final_tweaks(
     print()
 
     if add_instrument_names:
-        add_instrument_names_func(instrument_properties)
+        utils.add_instrument_names(instrument_properties)
     if add_initial_clefs:
-        add_initial_clefs_func(instrument_properties)
+        utils.add_initial_clefs(instrument_properties)
     if add_initial_tempo:
-        add_initial_tempo_func(score)
+        utils.add_initial_tempo(score)
     if add_large_time_signatures:
-        add_large_time_signatures_func(score)
+        utils.add_large_time_signatures(score)
     if add_final_bar_line:
-        add_final_bar_line_func(score)
+        utils.add_final_bar_line(score)
     if add_miscellaneous_tweaks:
-        add_miscellaneous_tweaks_func(score)
+        utils.add_miscellaneous_tweaks(score)
     print()

src/score_maker/score_maker.py

@@ -1,11 +1,11 @@
+from .. import utils
 from .compile_ly_file import compile_ly_file
 from .create_staves import create_staves
 from .final_tweaks import final_tweaks
 from .generate_lilypond_file_structure import generate_lilypond_file_structure
 from .generate_materials import generate_materials
 from .generate_segments import generate_segments
 from .prettify_score import prettify_score
-from .print_header import print_header
 
 
 def score_maker() -> None:
@@ -19,7 +19,7 @@ def score_maker() -> None:
         None
     """
     # Header
-    print_header()
+    utils.print_header()
 
     # Creating music
     staves, instrument_properties = create_staves()
@@ -31,7 +31,16 @@ def score_maker() -> None:
     lilypond_file, score = generate_lilypond_file_structure(instrument_properties)
 
     # Adding indicators and other text
-    final_tweaks(instrument_properties, score)
+    final_tweaks(
+        instrument_properties,
+        score,
+        add_instrument_names=True,
+        add_initial_clefs=True,
+        add_initial_tempo=True,
+        add_large_time_signatures=True,
+        add_final_bar_line=True,
+        add_miscellaneous_tweaks=True,
+    )
 
     # Outputting score
     compile_ly_file(lilypond_file)

src/utils/__init__.py

@@ -1,3 +1,19 @@
+from .add_final_bar_line import add_final_bar_line
+from .add_initial_clefs import add_initial_clefs
+from .add_initial_tempo import add_initial_tempo
+from .add_instrument_names import add_instrument_names
+from .add_large_time_signatures import add_large_time_signatures
+from .add_miscellaneous_tweaks import add_miscellaneous_tweaks
 from .load_config import load_config
+from .print_header import print_header
 
-__all__ = ["load_config"]
+__all__ = [
+    "add_final_bar_line",
+    "add_initial_clefs",
+    "add_initial_tempo",
+    "add_instrument_names",
+    "add_large_time_signatures",
+    "add_miscellaneous_tweaks",
+    "load_config",
+    "print_header",
+]

src/score_maker/add_final_bar_line.py src/utils/add_final_bar_line.pysrc/score_maker/add_final_bar_line.py renamed to src/utils/add_final_bar_line.py

@@ -1,7 +1,7 @@
 import abjad
 import auxjad
 
-from ..utils import load_config
+from .load_config import load_config
 
 
 def add_large_time_signatures(