Merge pull request #657 from jwink75/master

Fix to Page Format Wizard

Author: rpatters1

src/page_format_wizard.lua

@@ -3,8 +3,8 @@ function plugindef()
   finaleplugin.Author = "Jacob Winkler" 
   finaleplugin.Copyright = "©2024 Jacob Winkler"
   finaleplugin.AuthorEmail = "[email protected]"
-  finaleplugin.Date = "2024/1/21"
-  finaleplugin.Version = "1.1"
+  finaleplugin.Date = "2024/1/25"
+  finaleplugin.Version = "1.2"
   finaleplugin.HandlesUndo = true
   finaleplugin.NoStore = false
   finaleplugin.MinJWLuaVersion = 0.70 -- https://robertgpatterson.com/-fininfo/-rgplua/rgplua.html
@@ -83,13 +83,14 @@ function bold_control(control)
   control:SetFont(font)
 end
 
-function math.sign(number)
+function math_sign(number)
   return (number >= 0 and 1) or -1
 end
 
-function math.round(number, round_to)
+function math_round(number, round_to)
+  number = number or 0
   round_to = round_to or 1
-  return math.floor(number/round_to + math.sign(number) * 0.5) * round_to
+  return math.floor(math.abs(number)/round_to + 0.5) * round_to * math_sign(number)
 end
 
 local function mm_to_efix(mm)
@@ -111,7 +112,7 @@ local function efix_to_mm_string(efix)
   str:SetMeasurement(efix/64*10, finale.MEASUREMENTUNIT_CENTIMETERS)
 --    str.LuaString = efix  * (25.4 / 18432)
   local temp = str.LuaString
-  temp = math.round(tonumber(temp), .1)
+  temp = math_round(tonumber(temp), .1)
   str.LuaString = tostring(temp)
   return str
 end
@@ -188,8 +189,8 @@ local special_ctrls = {}
 local special_ctrls_collection = {}
 
 local function match_page(w, h)
-  w = math.round(w, 1)
-  h = math.round(h, 1)
+  w = math_round(w, 1)
+  h = math_round(h, 1)
   local matched = -1
   local landscape = 0
   for k, v in pairs(page_sizes) do
@@ -258,11 +259,6 @@ local function orientation_set(w, h, mode) -- mode 0 is portrait, mode 1 is land
   else 
     return h, w 
   end
-  if mode == 1 and w > h then
-    return w, h
-  else
-    return h, w
-  end
 end
 
 local function orientation_set_popup(w, h, popup)
@@ -536,7 +532,7 @@ local function format_wizard()
     controls.first_system_left_edit:SetMeasurement(page_settings.first_system_left_margin, page_settings.system_units)
     controls.system_bottom_edit:SetMeasurement(page_settings.system_bottom_margin-96, page_settings.system_units) -- bottom margin is offset by 4 spaces (96 EVPUs) because Finale...
     --[[ STAFF HEIGHT ]]
-    temp = math.round(efix_to_mm(page_settings.staff_h)*10, 1)
+    temp = math_round(efix_to_mm(page_settings.staff_h)*10, 1)
     controls.staff_h_invisible:SetInteger(temp)
     controls.staff_h_updown:SetValue(temp)
     controls.staff_h_edit:SetText(efix_to_mm_string(page_settings.staff_h))
@@ -652,7 +648,6 @@ local function format_wizard()
 
   local function format_pages_and_save()
     local controls = {}
-    local page_settings = {}
 
     local score_format_prefs = finale.FCPageFormatPrefs()
     local parts_format_prefs = finale.FCPageFormatPrefs()
@@ -730,7 +725,7 @@ local function format_wizard()
 
     local function check_for_special(part_num)
       for i = 0, special_ctrls.parts_datalist:GetCount()-1 do
-        local row = special_ctrls.parts_datalist:GetItemAt(i)
+        row = special_ctrls.parts_datalist:GetItemAt(i)
         str = row:GetItemAt(1)
         if part_num == tonumber(str.LuaString) then 
           if row:GetCheck() then
@@ -834,9 +829,7 @@ local function format_wizard()
         --
         staff_height_set(system, page_settings.staff_h)
 
-        if controls.staff_spacing_popup:GetSelectedItem() == 0 then
-          -- Do nothing!
-        else
+        if controls.staff_spacing_popup:GetSelectedItem() > 0 then
           local sysstaves = finale.FCSystemStaves()
           sysstaves:LoadAllForItem(system:GetItemNo())
 
@@ -993,7 +986,7 @@ local function format_wizard()
   local special_static = add_ctrl(dialog, "static", "SPECIAL PARTS", x + 12, 0, col_w, row_h)
 
 
-  local function section_create(controls, page_settings, ctrls_collection, section_n)
+  local function section_create(controls, page_settings, ctrls_collection)
     row = 1
     y = row*row_h
     x = section_n*section_w
@@ -1240,7 +1233,7 @@ local function format_wizard()
     controls.staff_h_updown:ConnectIntegerEdit(controls.staff_h_invisible, 30, 100)
     controls.staff_h_mm_static = add_ctrl(dialog, "static", "mm", x+col[4]+12, y, 20, row_h)
     -- Initialize the staff height edit boxes, starting with the invisible one connected to the UpDown
-    temp = math.round(efix_to_mm(page_settings.staff_h)*10, .1)
+    temp = math_round(efix_to_mm(page_settings.staff_h)*10, .1)
     controls.staff_h_invisible:SetInteger(temp ,1)
     controls.staff_h_edit:SetText(efix_to_mm_string(page_settings.staff_h))
     controls.staff_h_updown:SetValue(controls.staff_h_invisible:GetInteger())
@@ -1311,7 +1304,7 @@ local function format_wizard()
       for part in each(parts) do
         if part:IsPart() then
           part:GetName(str)
-          local row = controls.parts_datalist:CreateRow()
+          row = controls.parts_datalist:CreateRow()
           row:GetItemAt(0).LuaString = str.LuaString
           row:GetItemAt(1).LuaString = part:GetItemNo()
         end
@@ -1400,10 +1393,15 @@ local function format_wizard()
     return controls, page_settings, ctrls_collection
   end -- section_create()    
 
-  score_ctrls, score_settings, score_ctrls_collection = section_create(score_ctrls, score_settings, score_ctrls_collection, 0)   
-  parts_ctrls, parts_settings, parts_ctrls_collection = section_create(parts_ctrls, parts_settings, parts_ctrls_collection, 1)
-  special_ctrls, special_settings, special_ctrls_collection = section_create(special_ctrls, special_settings, special_ctrls_collection, 2)
-
+  section_n = 0
+  score_ctrls, score_settings, score_ctrls_collection = section_create(score_ctrls, score_settings, score_ctrls_collection)   
+  section_n = 1
+  --
+  parts_ctrls, parts_settings, parts_ctrls_collection = section_create(parts_ctrls, parts_settings, parts_ctrls_collection)
+  section_n = 2
+  --
+  special_ctrls, special_settings, special_ctrls_collection = section_create(special_ctrls, special_settings, special_ctrls_collection)
+  --
   section_enable(score_enable_checkbox, score_ctrls, score_settings, score_ctrls_collection)
   section_enable(parts_enable_checkbox, parts_ctrls, parts_settings, parts_ctrls_collection)
   section_enable(special_enable_checkbox, special_ctrls, special_settings, special_ctrls_collection)
@@ -1677,7 +1675,7 @@ local function format_wizard()
         if not hold then
           hold = true
           page_settings.staff_h = mm_to_efix(controls.staff_h_edit:GetMeasurement(finale.MEASUREMENTUNIT_MILLIMETERS))
-          temp = math.round(controls.staff_h_edit:GetMeasurement(finale.MEASUREMENTUNIT_MILLIMETERS)*10, 1)
+          temp = math_round(controls.staff_h_edit:GetMeasurement(finale.MEASUREMENTUNIT_MILLIMETERS)*10, 1)
           controls.staff_h_invisible:SetInteger(temp)
           controls.staff_h_updown:SetValue(temp)
           hold = false
@@ -1766,7 +1764,7 @@ local function format_wizard()
 
     dialog:RegisterHandleControlEvent (controls.clear_datalist_button, function(control)
         for i = 0, controls.parts_datalist:GetCount()-1 do
-          local row = controls.parts_datalist:GetItemAt(i)
+          row = controls.parts_datalist:GetItemAt(i)
           row:SetCheck(false)
         end
       end)
@@ -1858,7 +1856,6 @@ local function format_wizard()
   bold_control(score_ctrls.staff_settings)
   bold_control(parts_ctrls.staff_settings)
   bold_control(special_ctrls.staff_settings)
---  finale.FCFileSaveAsDialog(finenv.UI()):GetFileName(str)
 end
 
 format_wizard()