Merge pull request #24 from openlilylib/version-0.5.8

Version 0.5.8

Author: KlausBlum

Version history.txt

@@ -1,6 +1,33 @@
-*********************************************
-OOoLilyPond 0.5.7 Release Notes (May 2018)
-*********************************************
+*******************************************
+OOoLilyPond Version History (December 2018)
+*******************************************
+
+
+Changes to OOoLilyPond 0.5.8 since 0.5.7 (December 2018):
+==========================================================
+
+* Partial Spanish translation added (Thanks to Fernando Villagran!)
+  To have the new language file "espanol.ini" available in the config dialog, 
+  please launch OLy, open the config dialog and click the "Restore Language Files" button. 
+  (Your current language files will be backed up in a subfolder. If you like, you can delete that subfolder.
+* Added option to have PNG graphics with transparent background (instead of opaque white background)
+  (Issue 23) https://github.com/openlilylib/LO-ly/issues/23 
+  If you are missing the French or German translation for that option, 
+  click the "Restore Language Files" button (see above).
+* Fixed an incompatibility with LibreOffice's new GraphicURL handling. 
+  In LO 6.1.0  and 6.1.1 (for Draw/Impress: also 6.1.2, 6.1.3 and 6.1.4), the "Direct" option for "Insert Graphics" is broken. 
+  For those affected LO versions the "Via Clipboard" option should be used. 
+  The new OLy 0.5.8 release will work with all older and newer versions than those mentioned above, 
+  so as of LO 6.1.5, the "Direct" option should work again. 
+  (Issue 22) https://github.com/openlilylib/LO-ly/issues/22
+* The automatic toolbar creation during OLy installation has been reverted to the method used in OLy 0.5.6 and before. 
+  It turned out that the method used in 0.5.7 only worked in newer OpenOffice versions (due to a changed behavior
+  in the OpenOffice history), but is incompatible to LibreOffice. 
+  (Issue 19) https://github.com/openlilylib/LO-ly/issues/19
+  (There will be a dedicated version for OpenOffice...)
+
+Only for LibreOffice 6.1.3: Some dialog or message windows show "10" at the beginning of a line. This is due to a bug in LO 6.1.3 that has already been fixed for 6.1.4. 
+So LO 6.1.3 is the only affected version.
 
 
 Changes to OOoLilyPond 0.5.7 since 0.5.6:

extension/Addons.xcu

@@ -7,24 +7,19 @@
 	<node oor:name="AddonUI">
 		<node oor:name="OfficeToolBar">
 			<node oor:name="OOoLilyPond.OfficeToolBar" oor:op="replace">
-				<prop oor:name="Title">
-					<value>OOoLilyPond</value>
-				</prop>
-				<node oor:name="ToolBarItems">
-					<node oor:name="m1" oor:op="replace">
-						<prop oor:name="Context" oor:type="xs:string">
-							<value>com.sun.star.text.TextDocument,com.sun.star.drawing.DrawingDocument,com.sun.star.presentation.PresentationDocument</value>
-						</prop>
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:OOoLilyPond.OOoLilyPond.OOoLilyPond?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value>OLy</value>
-						</prop>
-						<prop oor:name="Target" oor:type="xs:string">
-							<value>_self</value>
-						</prop>
-					</node>
+				<node oor:name="m1" oor:op="replace">
+					<prop oor:name="Context" oor:type="xs:string">
+						<value>com.sun.star.text.TextDocument,com.sun.star.drawing.DrawingDocument,com.sun.star.presentation.PresentationDocument</value>
+					</prop>
+					<prop oor:name="URL" oor:type="xs:string">
+						<value>vnd.sun.star.script:OOoLilyPond.OOoLilyPond.OOoLilyPond?language=Basic&amp;location=application</value>
+					</prop>
+					<prop oor:name="Title" oor:type="xs:string">
+						<value>OLy</value>
+					</prop>
+					<prop oor:name="Target" oor:type="xs:string">
+						<value>_self</value>
+					</prop>
 				</node>
 			</node>
 		</node>

extension/Language/deutsch.ini

@@ -428,6 +428,8 @@ LabelGraphicDPIResolution.label=Auflösung (png)
 iGraphicDPI.helptext=Auflösung für Noten im PNG-Format.
 LabelDPI.label=dpi
 LabelFormatInfo.label=eps: Nur mit OpenOffice%10%10svg: Nur mit LibreOffice, Vorlage ohne%10        lilypond-book-preamble.ly verwenden
+bTransparentBackground.label=Transparenter Hintergrund für png
+bTransparentBackground.helptext=png ohne weißen undurchsichtigen Hintergrund erstellen (svg hat keinen weißen Hintergrund)
 
 RestoreTemplates.label=Vorlagen wiederherstellen
 RestoreTemplates.helptext=Mitgelieferte Vorlagen wiederherstellen. Ihre aktuellen Vorlagen werden in einem Unterordner gesichert.

extension/Language/english.ini

@@ -428,6 +428,8 @@ LabelGraphicDPIResolution.label=Resolution (png)
 iGraphicDPI.helptext=Resolution for pixel based (png-format) OOoLilyPond objects.
 LabelDPI.label=dpi
 LabelFormatInfo.label=eps: Only with OpenOffice%10%10svg: Only with LibreOffice, use Template%10       without lilypond-book-preamble.ly
+bTransparentBackground.label=Transparent Background for png
+bTransparentBackground.helptext=Create png graphics without opaque white background (svg never has a white background)
 
 RestoreTemplates.label=Restore Templates
 RestoreTemplates.helptext=Restore the original templates delivered with OLy. Your actual templates will be backed up in a subfolder.

extension/Language/espanol.ini

@@ -429,6 +429,8 @@ LabelGraphicDPIResolution.label=Resolución (png)
 iGraphicDPI.helptext=Resolución para objetos Oly basados en píxeles (formato-png).
 LabelDPI.label=dpi
 LabelFormatInfo.label=eps: Solamente con OpenOffice%10%10svg: Solamente con LibreOffice, usar Plantilla%10       sin lilypond-book-preamble.ly
+bTransparentBackground.label=Fondo transparente para png
+bTransparentBackground.helptext=Inserta imágenes png sin fondo opaco blanco (el svg no lo tiene)
 
 RestoreTemplates.label=Restaurar plantillas
 RestoreTemplates.helptext=Restaurar las plantillas originales entregados con Oly. Sus plantillas actuales serán resguardadas en una subcarpeta.

extension/Language/francais.ini

@@ -1,4 +1,4 @@
-' Fichier de traduction pour OOoLilyPond
+' Fichier de traduction pour OOoLilyPond
 
 ' Les lignes introduites par une apostrophe (') sont ignorées et servent de commentaires.
 ' Les lignes vides sont également ignorées.
@@ -428,6 +428,8 @@ LabelGraphicDPIResolution.label=Résolution (png) :
 iGraphicDPI.helptext=Résolution pour les objets OOoLilyPond pixelisés (format png).
 LabelDPI.label=ppp
 LabelFormatInfo.label=eps: Seulement pour OpenOffice%10%10svg: Seulement pour LibreOffice ; utiliser%10       un modèle sans lilypond-book-preamble.ly
+bTransparentBackground.label=Fond transparent pour png
+bTransparentBackground.helptext=Créer les images png sans fond opaque blanc (il n’y a jamais de fond blanc en svg)
 
 RestoreTemplates.label=Restaurer les modèles
 RestoreTemplates.helptext=Restaurer les modèles d’origine fournis avec OLy. Vos propres modèles seront sauvegardés dans un sous-dossier.

extension/OOoLilyPond/Config.xba

@@ -57,6 +57,7 @@ Sub ConfigDialogUpdate()
 	oConfigDialog.getControl("sLilyPondExecutable").setText(ConvertFromURL(sLilyPondExecutable))
 	oConfigDialog.getControl("sFormat").setText(sFormat)
 	oConfigDialog.getControl("iGraphicDPI").setValue(iGraphicDPI)
+	oConfigDialog.getControl("bTransparentBackground").setState(BoolToCheckBoxState(bTransparentBackground))
 	oConfigDialog.getControl("sEditorFontName").setText(sEditorFontName)
 	oConfigDialog.getControl("sEditorFontSize").setText(sEditorFontSize)
 	oConfigDialog.getControl("sExtEditorExecutable").setText(ConvertFromURL(sExtEditorExecutable))
@@ -272,6 +273,7 @@ Sub ApplyConfig
 	sLanguagePath = AddSlash(ConvertToURL(oConfigDialog.getControl("sLanguagePath").getText()))
 	sFormat = oConfigDialog.getControl("sFormat").getText()
 	iGraphicDPI = oConfigDialog.getControl("iGraphicDPI").getValue()
+	bTransparentBackground = CheckBoxStateToBool(oConfigDialog.getControl("bTransparentBackground").getState())
 	bIgnoreWarnings = CheckBoxStateToBool(oConfigDialog.getControl("bIgnoreWarnings").getState())
 	sEditorFontName = oConfigDialog.getControl("sEditorFontName").getText()
 	sEditorFontSize = oConfigDialog.getControl("sEditorFontSize").getText()
@@ -408,6 +410,7 @@ Sub DefaultConfig()
 	' General Settings
 	sFormat = "png"
 	iGraphicDPI = 300
+	bTransparentBackground = False
 	sEditorFontName = "Courier"
 	sEditorFontSize = "8"
 
@@ -474,6 +477,8 @@ Sub ReadConfig()
 				iGraphicDPI = sValue
 			Case "sFormat"
 				sFormat = sValue
+			Case "bTransparentBackground"
+				bTransparentBackground = StringToBool(sValue)
 			Case "bIgnoreWarnings"
 				bIgnoreWarnings = StringToBool(sValue)
 
@@ -545,6 +550,7 @@ Sub SaveConfig
 	oTextOutputStream.writeString("sLanguagePath=" & sLanguagePath & Chr(10) )
 	oTextOutputStream.writeString("iGraphicDPI=" & iGraphicDPI & Chr(10))
 	oTextOutputStream.writeString("sFormat=" & sFormat & Chr(10))	
+	oTextOutputStream.writeString("bTransparentBackground=" & BoolToString(bTransparentBackground) & Chr(10))	
 	oTextOutputStream.writeString("bIgnoreWarnings=" & BoolToString(bIgnoreWarnings) & Chr(10))	
 	oTextOutputStream.writeString("sEditorFontName=" & sEditorFontName & Chr(10) )
 	oTextOutputStream.writeString("sEditorFontSize=" & sEditorFontSize & Chr(10) )

extension/OOoLilyPond/GUI_Config.xdl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="GUI_Config" dlg:left="29" dlg:top="52" dlg:width="323" dlg:height="333" dlg:closeable="true" dlg:moveable="true" dlg:title="OOoLilyPond Configuration">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="GUI_Config" dlg:left="29" dlg:top="52" dlg:width="324" dlg:height="333" dlg:closeable="true" dlg:moveable="true" dlg:title="OOoLilyPond Configuration">
  <dlg:bulletinboard>
   <dlg:radiogroup>
    <dlg:radio dlg:id="WriterAnchorAsCharacter" dlg:tab-index="8" dlg:left="10" dlg:top="82" dlg:width="60" dlg:height="12" dlg:help-text="The OOoLilyPond object is inserted into the Text like a character." dlg:tabstop="true" dlg:value="As Character" dlg:checked="true"/>
@@ -95,7 +95,7 @@
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:OOoLilyPond.Config.RestoreLanguageFilesButton?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:combobox dlg:id="sLanguageFileName" dlg:tab-index="59" dlg:left="173" dlg:top="20" dlg:width="143" dlg:height="12" dlg:help-text="Specify a file name for the language file that contains OLy&apos;s translation strings" dlg:spin="true" dlg:linecount="24"/>
-  <dlg:text dlg:id="LabelFormatInfo" dlg:tab-index="50" dlg:left="174" dlg:top="234" dlg:width="148" dlg:height="59" dlg:value="eps: Only with OpenOffice&#x0a;&#x0a;svg: Only with LibreOffice, use Template&#x0a;        without &quot;lilypond-book-preamble.ly&quot;" dlg:tabstop="false" dlg:nolabel="true"/>
+  <dlg:text dlg:id="LabelFormatInfo" dlg:tab-index="50" dlg:left="174" dlg:top="249" dlg:width="148" dlg:height="44" dlg:value="eps: Only with OpenOffice&#x0a;&#x0a;svg: Only with LibreOffice, use Template&#x0a;        without &quot;lilypond-book-preamble.ly&quot;" dlg:tabstop="false" dlg:nolabel="true"/>
   <dlg:button dlg:id="ExtEditorPickButton" dlg:tab-index="60" dlg:left="282" dlg:top="150" dlg:width="35" dlg:height="12" dlg:help-text="Select an executable file" dlg:value="Select">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:OOoLilyPond.Config.ExtEditorPickButton?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
@@ -110,5 +110,6 @@
   <dlg:button dlg:id="LanguagePathPickButton" dlg:tab-index="65" dlg:left="282" dlg:top="98" dlg:width="35" dlg:height="12" dlg:help-text="Select a folder" dlg:value="Select">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:OOoLilyPond.Config.LanguagePathPickButton?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
+  <dlg:checkbox dlg:id="bTransparentBackground" dlg:tab-index="66" dlg:left="173" dlg:top="234" dlg:width="143" dlg:height="10" dlg:help-text="Create png graphics without opaque white background (svg never has a white background)" dlg:value="Transparent Background for png" dlg:checked="false"/>
  </dlg:bulletinboard>
 </dlg:window>

extension/OOoLilyPond/GUI_Editor.xdl

@@ -94,4 +94,4 @@
   <dlg:checkbox dlg:id="bKeepCrop" dlg:tab-index="34" dlg:left="7" dlg:top="261" dlg:width="140" dlg:height="9" dlg:help-text="When editing/replacing an existing object, preserve its current size and crop settings" dlg:value="Keep Size &amp; Crop Settings" dlg:checked="false"/>
   <dlg:text dlg:id="TemplateLabel" dlg:tab-index="8" dlg:left="149" dlg:top="214" dlg:width="46" dlg:height="10" dlg:value="Template:" dlg:align="right"/>
  </dlg:bulletinboard>
-</dlg:window>
+</dlg:window>

extension/OOoLilyPond/LilyPond.xba

@@ -25,7 +25,11 @@ Function CallLilyPond() As Boolean
 			sCommand = sCommand & " " & sIncludeStatement
 		End If
 		If sFormat="png" Then
-			sCommand = sCommand & " -dno-delete-intermediate-files --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1; "
+			If bTransparentBackground Then
+				sCommand = sCommand & " -dno-delete-intermediate-files -dpixmap-format=pngalpha --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1; "
+			Else
+				sCommand = sCommand & " -dno-delete-intermediate-files --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1; "
+			End If
 		ElseIf sFormat="eps" Then
 			sCommand = sCommand & " " & sBackendOpt & " -f eps " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1; "
 		ElseIf sFormat="svg" Then
@@ -42,7 +46,11 @@ Function CallLilyPond() As Boolean
 			sCommand = sCommand & " " & sIncludeStatement
 		End If
 		If sFormat="png" Then
-			sCommand = sCommand & " -dno-delete-intermediate-files --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1" &Chr(10)
+			If bTransparentBackground Then
+				sCommand = sCommand & " -dno-delete-intermediate-files -dpixmap-format=pngalpha --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1" &Chr(10)
+			Else
+				sCommand = sCommand & " -dno-delete-intermediate-files --png " & sBackendOpt & " -dresolution=" & iGraphicDPI & " " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1" &Chr(10)
+			End If
 		ElseIf sFormat="eps" Then
 			sCommand = sCommand & " " & sBackendOpt & " -f eps " & constOLyFileName & ".ly >" & constOLyFileName & ".out 2>&1" & Chr(10)
 		ElseIf sFormat="svg" Then