Merge branch 'hotfix/1.7.1'

bwl21 · Oct 5, 2017 · 5702c2d · 5702c2d
2 parents 0835408 + 937a82e
commit 5702c2d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/30_sources/CHANGES.md b/30_sources/CHANGES.md
@@ -1,3 +1,13 @@
+
+
+# v 1.7.1
+
+## fix
+
+* improved fermata symbol in pdf #178
+* turnoff flowconf edit for pdf. This avoids noise around very short vertical flowlines #167 
+* print preview no longer clears unsaved indicator #176
+
 # v 1.7
 
 ## fix

diff --git a/30_sources/SRC_Zupfnoter/src/controller.rb b/30_sources/SRC_Zupfnoter/src/controller.rb
@@ -203,6 +203,7 @@ def call_consumers(clazz)
                                extracts:     [lambda {@extracts.each {|entry|
                                  title = "#{entry.first}: #{entry.last}"
                                  `set_extract_menu(#{entry.first}, #{title})`}
+                                 call_consumers(:systemstatus) # restore systemstatus as set_extract_menu redraws the toolbar
                                }]
     }
     @systemstatus_consumers[clazz].each {|c| c.call()}
@@ -354,14 +355,23 @@ def load_demo_tune
 
   # render the harpnotes to a3
   def render_a3(index = @systemstatus[:view])
-    printer = Harpnotes::PDFEngine.new
-    printer.draw(layout_harpnotes(index, 'A3'))
+    flowconf = $settings[:flowconf]
+    # turn of flowconf:  otherwise very short unconfigured undconfigured flowlines are
+    # longer because of the default values of the handles whihc make the curve from    +-+  to -+-+-
+    $settings[:flowconf] = false
+    result = Harpnotes::PDFEngine.new.draw(layout_harpnotes(index, 'A3'))
+    $settings[:flowconf] = flowconf
+    result
   end
 
 
   # render the harpnotes splitted on a4 pages
   def render_a4(index = @systemstatus[:view])
-    Harpnotes::PDFEngine.new.draw_in_segments(layout_harpnotes(index, 'A4'))
+    flowconf = $settings[:flowconf]
+    $settings[:flowconf] = false
+    result = Harpnotes::PDFEngine.new.draw_in_segments(layout_harpnotes(index, 'A4'))
+    $settings[:flowconf] = flowconf
+    result
   end
 
 
@@ -509,7 +519,7 @@ def render_harpnotepreview_callback
     $log.benchmark("render_harpnotepreview_callback") do
       begin
         $log.debug("viewid: #{@systemstatus[:view]} #{__FILE__} #{__LINE__}")
-        @song_harpnotes = layout_harpnotes(@systemstatus[:view])
+        @song_harpnotes = layout_harpnotes(@systemstatus[:view], "A3")
 
         if @song_harpnotes
           # todo: not sure if it is good to pass active_voices via @song_harpnotes

diff --git a/30_sources/SRC_Zupfnoter/src/harpnotes.rb b/30_sources/SRC_Zupfnoter/src/harpnotes.rb
@@ -982,7 +982,7 @@ class Glyph < Symbol
                          ["c", -0.09, -0.12, -0.09, -0.18, 0.03, -0.69],
                          ["c", 0.33, -1.62, 0.78, -3, 1.47, -4.38],
                          ["c", 1.77, -3.54, 4.44, -5.67, 7.56, -5.97], ["z"],
-                         ["m", 0.33, 7.47],
+                         ["M", -0.5, 1.5],    # don't know what I am doing, but "m" is not properly supported by opal-jspdf. So I do an sbsolute move
                          ["c", 1.38, -0.3, 2.58, 0.9, 2.31, 2.25],
                          ["c", -0.15, 0.72, -0.78, 1.35, -1.47, 1.5],
                          ["c", -1.38, 0.27, -2.58, -0.93, -2.31, -2.31],

diff --git a/30_sources/SRC_Zupfnoter/src/version.rb b/30_sources/SRC_Zupfnoter/src/version.rb
@@ -1,3 +1,3 @@
-VERSION = "1.7.0"
+VERSION = "1.7.1"
 SCHEMA_VERSION = 'https://zupfnoter.weichel21.de/schema/zupfnoter-config_1.0.json'
 COPYRIGHT = "© #{Time.now.year} https://www.zupfnoter.de"