Merge pull request #714 from Abjad/issue698/selector-by-leaf

Changed plural Selector.by_leaves() to singular Selector.by_leaf().

abjad/demos/bartok/make_bartok_score.py

@@ -72,7 +72,7 @@ def make_bartok_score():
     dynamic = Dynamic('mp')
     attach(dynamic, lower_measures[1][3])
     score.add_final_bar_line()
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     upper_leaves = selector(upper_staff)
     lower_leaves = selector(lower_staff)
     beam = Beam()

abjad/demos/ferneyhough/make_nested_tuplet.py

@@ -15,7 +15,7 @@ def make_nested_tuplet(
     outer_tuplet = scoretools.Tuplet.from_duration_and_ratio(
         tuplet_duration, outer_tuplet_proportions)
     inner_tuplet_proportions = inner_tuplet_subdivision_count * [1]
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     last_leaf = selector(outer_tuplet)[-1]
     right_logical_tie = inspect_(last_leaf).get_logical_tie()
     right_logical_tie.to_tuplet(inner_tuplet_proportions)

abjad/docs/source/cookbook/creating_annotation_aware_spanners.rst

@@ -393,7 +393,7 @@ Preparing for deployment
 
 ..  abjad::
 
-    selector = selectortools.Selector().by_leaves().by_run(Note)[:-1].flatten()
+    selector = selectortools.Selector().by_leaf().by_run(Note)[:-1].flatten()
 
 ..  abjad::
 
@@ -403,7 +403,7 @@ Preparing for deployment
 
 ..  abjad::
 
-    selector = selector.by_leaves()
+    selector = selector.by_leaf()
     for x in selector(staff):
         x
 
@@ -530,7 +530,7 @@ via rotation:
         for i, logical_tie in enumerate(iterate(staff).by_logical_tie(pitched=True)):
             for note in logical_tie:
                 note.written_pitch = pitches[i]
-        selector = selectortools.Selector().by_leaves().by_run(Note)[:-1].flatten()
+        selector = selectortools.Selector().by_leaf().by_run(Note)[:-1].flatten()
         for i, leaf in enumerate(selector(staff)):
             attach(annotations[i], leaf)
         attach(OscillationSpanner(), staff)

abjad/tools/agenttools/IterationAgent.py

@@ -779,7 +779,7 @@ def by_logical_voice(
 
             ::
 
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> leaf = leaves[0]
                 >>> signature = inspect_(leaf).get_parentage().logical_voice
@@ -882,7 +882,7 @@ def by_logical_voice_from_component(
 
             ::
 
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> leaf = leaves[0]
                 >>> for x in iterate(leaf).by_logical_voice_from_component(Note):

abjad/tools/agenttools/MutationAgent.py

@@ -151,7 +151,7 @@ def extract(self, scale_contents=False):
                 >>> staff.append(Tuplet((3, 2), "c'4 e'4"))
                 >>> staff.append(Tuplet((3, 2), "d'4 f'4"))
                 >>> hairpin = spannertools.Hairpin('p < f')
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> attach(hairpin, leaves)
                 >>> show(staff) # doctest: +SKIP
@@ -202,7 +202,7 @@ def extract(self, scale_contents=False):
                 >>> staff.append(Tuplet((3, 2), "c'4 e'4"))
                 >>> staff.append(Tuplet((3, 2), "d'4 f'4"))
                 >>> hairpin = spannertools.Hairpin('p < f')
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> attach(hairpin, leaves)
                 >>> show(staff) # doctest: +SKIP
@@ -418,7 +418,7 @@ def replace(self, recipients):
                 >>> tuplet_2 = Tuplet((2, 3), "d'4 e'4 f'4")
                 >>> staff = Staff([tuplet_1, tuplet_2])
                 >>> hairpin = spannertools.Hairpin('p < f')
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> attach(hairpin, leaves)
                 >>> slur = spannertools.Slur()
@@ -2441,7 +2441,7 @@ def split(
                 >>> staff = Staff()
                 >>> staff.append(Tuplet((2, 3), "c'4 d' e'"))
                 >>> staff.append(Tuplet((2, 3), "c'4 d' e'"))
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> slur = spannertools.Slur()
                 >>> attach(slur, leaves)
@@ -2712,7 +2712,7 @@ def swap(self, container):
                 >>> staff = Staff()
                 >>> staff.append(Measure((3, 4), "c'4 d'4 e'4"))
                 >>> staff.append(Measure((3, 4), "d'4 e'4 f'4"))
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> hairpin = spannertools.Hairpin('p < f')
                 >>> attach(hairpin, leaves)

abjad/tools/metertools/MetricAccentKernel.py

@@ -166,7 +166,7 @@ def count_offsets_in_expr(expr):
             ::
 
                 >>> MetricAccentKernel = metertools.MetricAccentKernel
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(score)
                 >>> counter = MetricAccentKernel.count_offsets_in_expr(leaves)
                 >>> for offset, count in sorted(counter.items()):

abjad/tools/rhythmmakertools/GalleryMaker.py

@@ -63,7 +63,7 @@ def _add_class_name_header(self, rhythm_maker, score_block):
     @staticmethod
     def _add_final_bar_line(score):
         score.add_final_bar_line()
-        selector = select().by_leaves(flatten=True)
+        selector = select().by_leaf(flatten=True)
         leaves = selector(score)
         leaves = leaves[-1:]
         last_leaf = leaves[0]

abjad/tools/scoretools/Container.py

@@ -1644,7 +1644,7 @@ def reverse(self):
 #
 #            ::
 #
-#                >>> selector = select().by_leaves(flatten=True)
+#                >>> selector = select().by_leaf(flatten=True)
 #                >>> selector(container)
 #                Selection(Note("c'8"), Note("d'8"), Rest('r8'), Note("e'8"))
 #

abjad/tools/scoretools/get_next_measure_from_component.py

@@ -43,7 +43,7 @@ def get_next_measure_from_component(component):
     ::
 
         >>> staff = Staff("abj: | 2/8 c'8 d'8 || 2/8 e'8 f'8 |")
-        >>> selector = select().by_leaves(flatten=True)
+        >>> selector = select().by_leaf(flatten=True)
         >>> leaves = selector(staff)
         >>> scoretools.get_previous_measure_from_component(leaves[0])
         Measure((2, 8), "c'8 d'8")

abjad/tools/scoretools/get_previous_measure_from_component.py

@@ -43,7 +43,7 @@ def get_previous_measure_from_component(component):
     ::
 
         >>> staff = Staff("abj: | 2/8 c'8 d'8 || 2/8 e'8 f'8 |")
-        >>> selector = select().by_leaves(flatten=True)
+        >>> selector = select().by_leaf(flatten=True)
         >>> leaves = selector(staff)
         >>> scoretools.get_previous_measure_from_component(leaves[0])
         Measure((2, 8), "c'8 d'8")

abjad/tools/selectiontools/Parentage.py

@@ -271,7 +271,7 @@ def score_index(self):
 
         ::
 
-            >>> selector = select().by_leaves(flatten=True)
+            >>> selector = select().by_leaf(flatten=True)
             >>> leaves = selector(score)
             >>> for leaf in leaves:
             ...     parentage = inspect_(leaf).get_parentage()

abjad/tools/selectiontools/Selection.py

@@ -540,7 +540,7 @@ def _copy(self, n=1, include_enclosing_containers=False):
 
             ::
 
-                >>> selector = select().by_leaves(flatten=True)
+                >>> selector = select().by_leaf(flatten=True)
                 >>> leaves = selector(staff)
                 >>> leaves = leaves[1:5]
                 >>> new_staff = leaves._copy(include_enclosing_containers=True)

abjad/tools/selectiontools/test/test_selectiontools_Selection__all_are_components_in_same_logical_voice.py

@@ -2,7 +2,7 @@
 from abjad import *
 Component = scoretools.Component
 Selection = selectiontools.Selection
-selector = select().by_leaves(flatten=True)
+selector = select().by_leaf(flatten=True)
 
 
 def test_selectiontools_Selection__all_are_components_in_same_logical_voice_01():

abjad/tools/selectiontools/test/test_selectiontools_Selection__attach_tie_spanner_to_leaf_pair.py

@@ -21,7 +21,7 @@ def test_selectiontools_Selection__attach_tie_spanner_to_leaf_pair_01():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(voice)
     leaves[1:3]._attach_tie_spanner_to_leaf_pair()
 
@@ -60,7 +60,7 @@ def test_selectiontools_Selection__attach_tie_spanner_to_leaf_pair_02():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(voice)
     leaves[1:3]._attach_tie_spanner_to_leaf_pair()
 
@@ -83,7 +83,7 @@ def test_selectiontools_Selection__attach_tie_spanner_to_leaf_pair_03():
     '''
 
     voice = Voice("c'8 c'8 c'8 c'8")
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(voice)
     leaves[1:3]._attach_tie_spanner_to_leaf_pair()
 

abjad/tools/selectiontools/test/test_selectiontools_Selection__withdraw_from_crossing_spanners.py

@@ -137,7 +137,7 @@ def test_selectiontools_Selection__withdraw_from_crossing_spanners_03():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(voice)
     leaves[2:3]._withdraw_from_crossing_spanners()
     assert not inspect_(voice).is_well_formed()

abjad/tools/selectiontools/test/test_selectiontools_Selection_partition_by_durations.py

@@ -35,7 +35,7 @@ def test_selectiontools_Selection_partition_by_durations_01():
         )
 
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [1.5],
@@ -53,7 +53,7 @@ def test_selectiontools_Selection_partition_by_durations_01():
     '''
 
     assert len(parts) == 2
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:3])
     assert parts[1] == list(leaves[3:6])
@@ -91,7 +91,7 @@ def test_selectiontools_Selection_partition_by_durations_02():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [1.5],
@@ -110,7 +110,7 @@ def test_selectiontools_Selection_partition_by_durations_02():
     '''
 
     assert len(parts) == 3
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:3])
     assert parts[1] == list(leaves[3:6])
@@ -146,7 +146,7 @@ def test_selectiontools_Selection_partition_by_durations_03():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [Duration(3, 8)],
@@ -165,7 +165,7 @@ def test_selectiontools_Selection_partition_by_durations_03():
     '''
 
     assert len(parts) == 3
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:3])
     assert parts[1] == list(leaves[3:6])
@@ -204,7 +204,7 @@ def test_selectiontools_Selection_partition_by_durations_04():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [1.5],
@@ -217,7 +217,7 @@ def test_selectiontools_Selection_partition_by_durations_04():
     "[[Note(c'', 8), Note(b', 8), Note(a', 8)]]"
 
     assert len(parts) == 1
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:3])
 
@@ -251,7 +251,7 @@ def test_selectiontools_Selection_partition_by_durations_05():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [Duration(3, 8)],
@@ -264,7 +264,7 @@ def test_selectiontools_Selection_partition_by_durations_05():
     "[[Note(c'', 8), Note(b', 8), Note(a', 8)]]"
 
     assert len(parts) == 1
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:3])
 
@@ -299,7 +299,7 @@ def test_selectiontools_Selection_partition_by_durations_06():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [Duration(3, 16), Duration(1, 16)],
@@ -318,7 +318,7 @@ def test_selectiontools_Selection_partition_by_durations_06():
     '''
 
     assert len(parts) == 5
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:2])
     assert parts[1] == list(leaves[2:3])
@@ -359,7 +359,7 @@ def test_selectiontools_Selection_partition_by_durations_07():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [0.75],
@@ -382,7 +382,7 @@ def test_selectiontools_Selection_partition_by_durations_07():
     '''
 
     assert len(parts) == 7
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:1])
     assert parts[1] == list(leaves[1:2])
@@ -422,7 +422,7 @@ def test_selectiontools_Selection_partition_by_durations_08():
         '''
         )
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [Duration(3, 16)],
@@ -445,7 +445,7 @@ def test_selectiontools_Selection_partition_by_durations_08():
     '''
 
     assert len(parts) == 7
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:1])
     assert parts[1] == list(leaves[1:2])
@@ -463,7 +463,7 @@ def test_selectiontools_Selection_partition_by_durations_09():
     tempo = Tempo(Duration(1, 4), 60)
     attach(tempo, staff, scope=Staff)
 
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [0.75],
@@ -476,7 +476,7 @@ def test_selectiontools_Selection_partition_by_durations_09():
     "[[Note(c', 8)]]"
 
     assert len(parts) == 1
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:1])
 
@@ -485,7 +485,7 @@ def test_selectiontools_Selection_partition_by_durations_10():
 
     staff = Staff("abj: | 2/8 c'8 d'8 || 2/8 e'8 f'8 |"
         "| 2/8 g'8 a'8 || 2/8 b'8 c''8 |")
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     parts = leaves.partition_by_durations(
         [Duration(3, 16)],
@@ -498,6 +498,6 @@ def test_selectiontools_Selection_partition_by_durations_10():
     "[[Note(c', 8)]]"
 
     assert len(parts) == 1
-    selector = select().by_leaves(flatten=True)
+    selector = select().by_leaf(flatten=True)
     leaves = selector(staff)
     assert parts[0] == list(leaves[:1])