Skip to content

Commit e6fd944

Browse files
chore: autopublish 2023-06-09T18:29:38Z
1 parent 641d2a8 commit e6fd944

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+387
-3531
lines changed

dist/clef_change.lua

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ end
9999
package.preload["library.clef"] = package.preload["library.clef"] or function()
100100

101101
local clef = {}
102-
103102
local client = require("library.client")
104-
105103
local clef_map = {
106104
treble = 0,
107105
alto = 1,
@@ -128,16 +126,12 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
128126
tab_serif = 17
129127
}
130128

131-
132-
133129
function clef.get_cell_clef(measure, staff_number)
134130
local cell_clef = -1
135131
local cell = finale.FCCell(measure, staff_number)
136132
local cell_frame_hold = finale.FCCellFrameHold()
137-
138133
cell_frame_hold:ConnectCell(cell)
139134
if cell_frame_hold:Load() then
140-
141135
if cell_frame_hold.IsClefList then
142136
cell_clef = cell_frame_hold:CreateFirstCellClefChange().ClefIndex
143137
else
@@ -147,7 +141,6 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
147141
return cell_clef
148142
end
149143

150-
151144
function clef.get_default_clef(first_measure, last_measure, staff_number)
152145
local staff = finale.FCStaff()
153146
local cell_clef = clef.get_cell_clef(first_measure - 1, staff_number)
@@ -160,10 +153,8 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
160153
return cell_clef
161154
end
162155

163-
164156
function clef.set_measure_clef(first_measure, last_measure, staff_number, clef_index)
165157
client.assert_supports("clef_change")
166-
167158
for measure = first_measure, last_measure do
168159
local cell = finale.FCCell(measure, staff_number)
169160
local cell_frame_hold = finale.FCCellFrameHold()
@@ -182,32 +173,25 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
182173
end
183174
end
184175

185-
186176
function clef.restore_default_clef(first_measure, last_measure, staff_number)
187177
client.assert_supports("clef_change")
188-
189178
local default_clef = clef.get_default_clef(first_measure, last_measure, staff_number)
190-
191179
clef.set_measure_clef(first_measure, last_measure, staff_number, default_clef)
192180

193-
194181
end
195182

196-
197183
function clef.process_clefs(mid_clefs)
198184
local clefs = {}
199185
local new_mid_clefs = finale.FCCellClefChanges()
200186
for mid_clef in each(mid_clefs) do
201187
table.insert(clefs, mid_clef)
202188
end
203189
table.sort(clefs, function (k1, k2) return k1.MeasurePos < k2.MeasurePos end)
204-
205190
for k, mid_clef in ipairs(clefs) do
206191
new_mid_clefs:InsertCellClefChange(mid_clef)
207192
new_mid_clefs:SaveAllAsNew()
208193
end
209194

210-
211195
for i = new_mid_clefs.Count - 1, 1, -1 do
212196
local later_clef_change = new_mid_clefs:GetItemAt(i)
213197
local earlier_clef_change = new_mid_clefs:GetItemAt(i - 1)
@@ -222,17 +206,14 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
222206
end
223207
::continue::
224208
end
225-
226209
return new_mid_clefs
227210
end
228211

229-
230212
function clef.clef_change(clef_type, region)
231213
local clef_index = clef_map[clef_type]
232214
local cell_frame_hold = finale.FCCellFrameHold()
233215
local last_clef
234216
local last_staff = -1
235-
236217
for cell_measure, cell_staff in eachcell(region) do
237218
local cell = finale.FCCell(region.EndMeasure, cell_staff)
238219
if cell_staff ~= last_staff then
@@ -243,7 +224,6 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
243224
cell_frame_hold:ConnectCell(cell)
244225
if cell_frame_hold:Load() then
245226
end
246-
247227
if region:IsFullMeasureIncluded(cell_measure) then
248228
clef.set_measure_clef(cell_measure, cell_measure, cell_staff, clef_index)
249229
if not region:IsLastEndMeasure() then
@@ -257,13 +237,10 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
257237
cell_frame_hold:SaveNew()
258238
end
259239
end
260-
261-
262240
else
263241
local mid_measure_clefs = cell_frame_hold:CreateCellClefChanges()
264242
local new_mid_measure_clefs = finale.FCCellClefChanges()
265243
local mid_measure_clef = finale.FCCellClefChange()
266-
267244
if not mid_measure_clefs then
268245
mid_measure_clefs = finale.FCCellClefChanges()
269246
mid_measure_clef:SetClefIndex(cell_frame_hold.ClefIndex)
@@ -272,7 +249,6 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
272249
mid_measure_clefs:InsertCellClefChange(mid_measure_clef)
273250
mid_measure_clefs:SaveAllAsNew()
274251
end
275-
276252
if cell_frame_hold.Measure == region.StartMeasure and region.StartMeasure ~= region.EndMeasure then
277253

278254
for mid_clef in each(mid_measure_clefs) do
@@ -288,10 +264,8 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
288264
new_mid_measure_clefs:InsertCellClefChange(mid_measure_clef)
289265
new_mid_measure_clefs:SaveAllAsNew()
290266
end
291-
292267
if cell_frame_hold.Measure == region.EndMeasure and region.StartMeasure ~= region.EndMeasure then
293268

294-
295269
for mid_clef in each(mid_measure_clefs) do
296270
if mid_clef.MeasurePos == 0 then
297271
mid_clef:SetClefIndex(clef_index)
@@ -304,17 +278,14 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
304278
end
305279
end
306280

307-
308281
mid_measure_clef:SetClefIndex(last_clef)
309282
mid_measure_clef:SetMeasurePos(region.EndMeasurePos)
310283
mid_measure_clef:Save()
311284
new_mid_measure_clefs:InsertCellClefChange(mid_measure_clef)
312285
new_mid_measure_clefs:SaveAllAsNew()
313286
end
314-
315287
if cell_frame_hold.Measure == region.StartMeasure and region.StartMeasure == region.EndMeasure then
316288
local last_clef = cell:CalcClefIndexAt(region.EndMeasurePos)
317-
318289
for mid_clef in each(mid_measure_clefs) do
319290
if mid_clef.MeasurePos == 0 then
320291
if region.StartMeasurePos == 0 then
@@ -355,7 +326,6 @@ package.preload["library.clef"] = package.preload["library.clef"] or function()
355326
end
356327
end
357328
end
358-
359329
return clef
360330
end
361331
function plugindef()
@@ -366,7 +336,6 @@ function plugindef()
366336
finaleplugin.Version = "1.0.1"
367337
finaleplugin.Date = "2022-08-30"
368338
finaleplugin.RequireSelection = true
369-
370339
finaleplugin.AuthorEmail = "[email protected]"
371340
finaleplugin.AdditionalMenuOptions = [[
372341
Clef 2: Bass
@@ -395,14 +364,12 @@ function plugindef()
395364
clef_type = "tenor"
396365
clef_type = "tenor_voice"
397366
clef_type = "percussion"
398-
]] finaleplugin.HashURL = "https://raw.githubusercontent.com/finale-lua/lua-scripts/master/hash/clef_change.hash"
367+
]]
368+
finaleplugin.HashURL = "https://raw.githubusercontent.com/finale-lua/lua-scripts/master/hash/clef_change.hash"
399369
return "Clef 1: Treble", "Clef 1: Treble", "Changes the selected region to treble clef"
400370
end
401-
402371
clef_type = clef_type or "treble"
403-
404372
local clef = require("library.clef")
405-
406373
local region = finenv.Region()
407374
region:SetCurrentSelection()
408375
clef.clef_change(clef_type, region)

0 commit comments

Comments
 (0)