Merge branch 'release/1.8.0_dev_1'

30_sources/CHANGES.md

@@ -1,5 +1,25 @@
 
+# v 1.8
 
+## fix
+
+* print preview no longer clears unsave indicator #176
+* update to abc2svg 1.14
+  * crash when bad value in transpose
+  * bad pitches after ties and repeat
+  * the accidentals must be reset on a measure bar
+* improved fermata symbol in pdf #178
+* crash when config references a non existing voice #179
+* improved localization #182
+
+## enhancement
+
+* now have menu to import from local disc #177  
+* support for 25 string bass harp #180
+* strip =duration on meter "M:3/4 4/4 =3/4" #181
+* initial support to work with file templates #71
+* No initial render after a crash in previous session #103
+
 # v 1.7.1
 
 ## fix
@@ -8,6 +28,7 @@
 * 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

30_sources/SRC_Zupfnoter/index_opal.html.erb

@@ -59,6 +59,7 @@
 </div>
 <div id="statusbar-layout" style="height:25px">
 </div>
+<input id="file_input" style="display:none;" type="file" accept=".abc, .mxl, .xml"/>
 
 <%= begin
       result = javascript_include_analytics()
@@ -68,6 +69,5 @@
     result
 %>
 
-
 </body>
 </html>

30_sources/SRC_Zupfnoter/public/index.css

@@ -221,6 +221,9 @@ rect.highlight {
 .w2ui-button .active {
   background-color: #ffedf2; }
 
+.znconfig-button {
+  padding: 1px; }
+
 #statusbar-layout .w2ui-tb-caption {
   vertical-align: top; }
 

30_sources/SRC_Zupfnoter/public/index.scss

@@ -313,6 +313,10 @@ rect.highlight {
   background-color: #ffedf2;
 }
 
+.znconfig-button{
+  padding: 1px;
+}
+
 #statusbar-layout .w2ui-tb-caption {
   vertical-align: top;
 }

30_sources/SRC_Zupfnoter/public/locale/de-de.json

@@ -115,6 +115,7 @@
     "18-strings-b-e": "18 Saiten b-e",
     "2": "2",
     "21-strings-a-f": "21 Saiten a-f",
+    "25-strings-G-g Bass": "25 Saiten G-g Bass",
     "25-strings-g-g": "25 Saiten g-g",
     "3": "3",
     "37-strings-g-g": "37 Saiten g-g",
@@ -179,8 +180,8 @@
     "configure your sheet": "Blatt konfigureren",
     "could not find extract with number": "Es gibt keinen Auszug mit nummer",
     "could not open file": "konnte Datei nicht öffnen",
-    "countnotes": "Zählmarken",
     "countnote": "Zählmarke",
+    "countnotes": "Zählmarken",
     "cp1": "cp1",
     "cp2": "cp2",
     "Create new sheet": "Neues Blatt erstellen",
@@ -255,6 +256,8 @@
     "Extract": "Auszug",
     "extract": "Auszug",
     "Extract-Annotation": "Auszugsbeschriftung",
+    "File": "Datei",
+    "filebase": "Dateibasis",
     "Filename not specified in song add an F: instruction": "Kein Filename angegeben. Bitte füge eine F: - Kopfzeile hinzu",
     "filenamepart": "Filename-Zusatz",
     "Files saved to dropbox": "Dateien in Dropbox gespeichert",
@@ -269,6 +272,7 @@
     "font_size": "Schriftgröße",
     "font_style": "Schriftstil",
     "FONT_STYLE_DEF": "Schriftstildefinition",
+    "Free software to create sheets for table harps": "Freies Programm zur Erstellung von Unterlegnoten für Tischharfen",
     "Get help": "Hilfe anzeigen",
     "global settings": "Globale Einstellungen",
     "Goto": "Sprung",
@@ -280,6 +284,8 @@
     "horizontal position": "horizontale Position (von links nach rechts)",
     "hpos": "horiz. Position",
     "Id": "Identifikationsnummer",
+    "import abc, xml from local system": "abc oder xml Datei importieren",
+    "Import": "Import",
     "in distance": "Abstand der Eingangslinie",
     "inject the default configuration (for development use only)": "inject the default configuration (for development use only)",
     "insert a title for the \ncurrent extract": "Titel für den aktuellen\n Auszug einfügen",
@@ -288,6 +294,7 @@
     "instrument specific": "Intrumentspezifika",
     "instrument": "Instrument",
     "Interact with dropbox": "Arbeiten mit Dropbox",
+    "interact with local files": "Arbeit mit lokalen Dateien",
     "italic": "kursiv",
     "jumpline_anchor": "Sprungl.Anker",
     "jumplineoffset": "Sprungl.Anker",
@@ -298,6 +305,7 @@
     "label": "**--label",
     "large view\nto see all details": "große Darstellung\nzur Beurteilung\nvon Details",
     "large": "groß",
+    "last session failed. Did not render. Cleanup ABC, then render manually": "Fehler in letzter Sitzung. Bereinige ABC und drücke [rendern]",
     "layout": "Layout",
     "layout_compact": "Kompaktes Layout",
     "layout_large": "Großes Layout",
@@ -470,6 +478,7 @@
     "T05_printed_extracts": "T05 verfügbare Auszüge",
     "T99_do_not_copy": "T99 bitte nicht kopieren",
     "target to jump to": "Sprungziel",
+    "template": "Dateivorlate",
     "templates": "Vorlagen",
     "tempo change not suported by zupfnoter": "Zupfnoter unterstüzt keine Tempoänderungen",
     "Text of annotation": "Text der Notenbeschriftung",
@@ -515,6 +524,7 @@
     "Zupfnoter": "Zupfnoter",
     "_ende_der_liste": "",
     "+: lyric without music": "+: Liedtext ohne Musik",
+    "+: symbol line without music": "+: symbol line without music",
     "+: without previous info field": "+: ohne vorhergehends Info-Feld",
     "'{' in grace note": "'{' in Verzierungsnote",
     "'}', ')' or ']' missing in %%staves": "'}', ')' oder ']' fehlt in  %%staves",
@@ -547,8 +557,6 @@
     "Bad %%stafflines value": "fehlerhafter Wert für %%stafflines",
     "Bad %%staffscale value": "fehlerhafter Wert für %%staffscale",
     "Bad char '$1' in M:": "fehlerhaftes Zeichen '$1' in M:",
-    "Bad character '}'": "fehlerhaftes Zeichen '}'",
-    "Bad character ')'": "fehlerhaftes Zeichen ')'",
     "Bad character '$1'": "fehlerhaftes Zeichen '$1'",
     "Bad duration '$1' in M:": "fehlerhafte Dauer '$1' in M:",
     "Bad integer value": "fehlerhafte Ganzzahl",
@@ -569,6 +577,7 @@
     "Cannot have !$1! on a head": "!$1! kann nicht im Kopfbereich stehen",
     "Cannot have %%fullsvg inside a tune": "'%%fullsvg' kann nicht innerhalb einer Stimme stehen",
     "Cannot have a bar in grace notes": "Taktstrich in Vorschlagnote nicht erlaubIl ne peut pas y avoir de barre dans les notes d'agrément",
+    "Cannot have V:* in tune body": "Cannot have V:* in tune body",
     "Cannot read file '$1'": "File '$1' kann nicht gelesen werden",
     "Decoration ignored": "Dekoration ignoriert",
     "Empty line in tune header - ignored": "Leerzeile in Kopfbereich - ignoriert",
@@ -606,12 +615,15 @@
     "Not a note in grace note sequence": "Keine Note in Sequenz von Vorschlagnoten",
     "Not an ASCII character": "kein ASCII - Zeichen",
     "Not enough measure bars for lyric line": "nicht genug Takte für Liedtextzeile",
+    "Not enough measure bars for symbol line": "Not enough measure bars for symbol line",
     "Not enough measures for %%repeat": "nicht genug Takte für %%repeat",
     "Not enough parameters in %%map": "nicht genug Parameter in  %%map",
     "Not enough symbols after repeat sequence": "nicht genug Symbole nach einer Wiederholungssequenz",
     "Not enough notes/rests for %%repeat": "nicht genug Noten/Pausen für %%repeat",
     "Note too long": "Note zu lang",
     "Note too short": "Note zu kurz",
+    "s: without music": "s: without music",
+    "Too many elements in symbol line": "Too many elements in symbol line",
     "Too many include levels": "Verschachtelung für include zu tiefr",
     "Too many ties": "zu viele Haltebogen",
     "Too many words in lyric line": "zu viele Worte in Liedtextzeile",

30_sources/SRC_Zupfnoter/src/Rakefile

@@ -59,13 +59,23 @@ task :updateAbc2svgDev do
     sources.each {|f| sh  " rm #{f} ; NOMIN=1 ./ninja #{f}"}
   end
 
+  ["de", "en"].each do |lang|
+    File.open(%Q{localization/abc2svg_#{lang}-#{lang}.json}, "w") do |f|
+      f.puts ("{")
+      f.puts File.read(%Q{#{abc2svgrepo}/err-#{lang}.js}).gsub("user.textrans = ", %Q{"phrases":})
+      f.puts ("}")
+    end
+  end
+
   File.open("#{VENDORFOLDER}/#{abc2svg_file}", "w") do |f|
     f.puts "// compiled for Zupfnoter #{Time.now}"
     [sources].flatten.each do |s|
       puts "copying #{s}"
       f.puts File.read("#{abc2svgrepo}/#{s}")
     end
   end
+
+
 end
 
 desc "Build our app to #{ZUPFNOTER_JS}"

30_sources/SRC_Zupfnoter/src/abc2svg_to_harpnotes.rb

@@ -48,6 +48,7 @@ def transform(zupfnoter_abc)
       def _make_harpnote_options
         result = {lyrics: {text: @info_fields[:W]}}
 
+        result[:template] = $conf.get('template')
         result[:print] = $conf.get("produce").map do |i|
           title = $conf.get("extract.#{i}.title")
           if title

30_sources/SRC_Zupfnoter/src/config-form.rb

@@ -326,7 +326,7 @@ def initialize
           FloatPair       => ['pos', 'size', 'spos', 'ELLIPSE_SIZE', 'REST_SIZE', "DRAWING_AREA_SIZE", 'cp1', 'cp2', 'a3_offset', 'a4_offset', 'jumpline_anchor'],
           IntegerList     => ['a4_pages', 'voices', 'flowlines', 'subflowlines', 'jumplines', 'layoutlines', 'verses', 'hpos', 'vpos', "produce", "llpos", "trpos"],
           Integer         => ['startpos', 'pack_method', 'p_repeat', 'p_begin', 'p_end', 'p_follow', 'PITCH_OFFSET'],
-          OneLineString   => ['title', 'filenamepart', 'url'],
+          OneLineString   => ['title', 'filenamepart', 'url', 'filebase'],
           MultiLineString => ['text'],
           Boolean         => ['limit_a3', 'autopos', 'show_border', 'nonflowrest', "show", "fill", "grid"],
           Float           => ['LINE_THIN', 'LINE_MEDIUM', 'LINE_THICK', 'pack_max_spreadfactor', 'pack_min_increment', 'minc_f', "X_SPACING", "X_OFFSET"],