Merge pull request #16 from openlilylib/version-0.5.6

Version 0.5.6

Author: KlausBlum

Release Notes.txt

@@ -1,6 +1,22 @@
-*******************************************
-OOoLilyPond 0.5.5 Release Notes  (May 2017)
-*******************************************
+*********************************************
+OOoLilyPond 0.5.6 Release Notes (March 2018)
+*********************************************
+
+
+Changes to OOoLilyPond 0.5.6 since 0.5.5:
+==========================================
+
+* French translation added (Thanks to Valentin Villenave!)
+  To have the new language file "francais.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.
+* Bugfix: When no graphics file was created, LY compiler error messages were not shown in OLy Editor window.
+* some minor spacing adjustments in dialogs
+* documentation URLs inside the templates updated to recent stable LY versions
+  To have the recent URLs in the comment section at the beginning of the templates, 
+  you can hit the "Restore Templates" button in the config dialog 
+  (Attention, this will move your current templates into a subfolder).
+  Doing that will not be necessary if you already know where to find the documentation section on the LilyPond website.
 
 
 Changes to OOoLilyPond 0.5.5 since 0.5.4:

extension/Language/francais.ini

@@ -341,18 +341,7 @@ Sub DefaultConfig()
 	sOSType=GetOSType()
 
 	' Config file, temporary folder, include statement(s), LilyPond and Ext. Editor executable
-	If sOSType="Unix" Then
-		sConfigFile = ConvertToURL(Environ("HOME")) & "/.ooolilypond"
-		sTmpPath = ConvertToURL(Environ("HOME")) & "/.cache/ooolilypond/tmp/"
-		If Not oFileAccess.exists(sTmpPath) then oFileAccess.createFolder(sTmpPath)
-		sTemplatePath = ConvertToURL(Environ("HOME")) & "/OOoLilyPond-Templates/"
-		sLanguagePath = ConvertToURL(Environ("HOME")) & "/OOoLilyPond-Language/"
-	 	' LilyPond Executable (not an URL)
- 		sLilyPondExecutable = "lilypond"
- 		sExtEditorExecutable = "frescobaldi"
-		sIncludeStatement = "-I" & Chr(34) & ConvertFromURL(Environ("HOME")) & Chr(34)
-	Else
-		'Operating System is Windows
+	If sOSType="Windows" Then
 		' Create Folder %APPDATA%\OOoLilyPond if it does not exist
 		If Not oFileAccess.isFolder( Environ("APPDATA") & "\" & constOLyWinConfigFolderName ) Then
 			If oFileAccess.exists( Environ("APPDATA") & "\" & constOLyWinConfigFolderName ) Then
@@ -376,7 +365,22 @@ Sub DefaultConfig()
 		While InStr (sIncludeStatement, "\") > 0	' replace "\" by "/", even in Windows LilyPond expects paths to be written with forward slashes
 			Mid (sIncludeStatement, InStr (sIncludeStatement, "\"), 1, "/")
 		Wend
- 	End If
+	Else	' Unix or Mac
+		sConfigFile = ConvertToURL(Environ("HOME")) & "/.ooolilypond"
+		sTmpPath = ConvertToURL(Environ("HOME")) & "/.cache/ooolilypond/tmp/"
+		If Not oFileAccess.exists(sTmpPath) then oFileAccess.createFolder(sTmpPath)
+		sTemplatePath = ConvertToURL(Environ("HOME")) & "/OOoLilyPond-Templates/"
+		sLanguagePath = ConvertToURL(Environ("HOME")) & "/OOoLilyPond-Language/"
+	 	' LilyPond Executable (not an URL)
+	 	If sOSType="Unix" Then
+ 			sLilyPondExecutable = "lilypond"
+ 			sExtEditorExecutable = "frescobaldi"
+ 		Else	' Mac
+ 			sLilyPondExecutable = "lilypond"
+ 			sExtEditorExecutable = "frescobaldi"
+ 		End If
+		sIncludeStatement = "-I" & Chr(34) & ConvertFromURL(Environ("HOME")) & Chr(34)
+	End If
 
 
 	' Writer specific settings
@@ -638,7 +642,7 @@ Function PickExecutableFile (sExeFileName As String) As Boolean
 		iPos = InStr (sFile, "/")
 	Wend
 	If (Not oFileAccess.isFolder (sDirectory)) Or (sDirectory = "file:///") Then	
-		If sOSType = "Unix" Then
+		If (sOSType = "Unix") Or (sOSType = "Mac") Then
 			sDirectory = ConvertToURL ("/usr/bin")
 		Else	' Windows
 			sDirectory = ConvertToURL (Environ ("ProgramFiles"))
@@ -647,7 +651,7 @@ Function PickExecutableFile (sExeFileName As String) As Boolean
 	oFileDlg.setDefaultName (sFile)
 	' oFileDlg.setDisplayDirectory (sDirectory)		' seems to crash LibO 5.3.1.2 (Win7 x64) unless LibO's own open/save dialogs are used, so better comment it out until the problem is found and fixed
  	oFileDlg.AppendFilter (oMessages.getPropertyValue ("sFilterAllFiles"), "*.*")
-	If sOSType = "Unix" Then
+	If (sOSType = "Unix") Or (sOSType = "Mac") Then
 		oFileDlg.SetCurrentFilter (oMessages.getPropertyValue ("sFilterAllFiles"))
 	Else	' Windows
 		oFileDlg.AppendFilter (oMessages.getPropertyValue ("sFilterExecutableFiles"), "*.exe")
@@ -680,7 +684,7 @@ Function PickFolder (sFolderName As String) As Boolean
 	If sFolder <> "" Then
 		sFolder = ConvertToURL (sFolder)
 	Else
-		If sOSType = "Unix" Then
+		If (sOSType = "Unix") Or (sOSType = "Mac") Then
 			sFolder = ConvertToURL (Environ("HOME"))
 		Else	' Windows
 			sFolder = ConvertToURL (Environ("ProgramFiles"))

extension/OOoLilyPond/Config.xba

@@ -18,17 +18,17 @@ Sub EditorDialog()
 	' DialogLibraries.LoadLibrary (constOLyLibraryName)
 
 	' Create the dialog object
-	' --- too late, now that must happen before ReadLanguageFile()
 	oEditorDialog = createUnoDialog( DialogLibraries.GetByName(constOLyLibraryName).GetByName("GUI_Editor") )
 	ReadDialogStringsFromVar (oEditorDialog, sEditorDialogStrings)
-
+	
+	
 	' Change the font of the editor pane
 	oFieldModel = oEditorDialog.getControl("sCode").getModel()
 	MyFont.Name = sEditorFontName
 	' MyFont.StyleName = "Fett"  ' bad idea...
 	MyFont.Height = sEditorFontSize
 	oFieldModel.FontDescriptor = MyFont
-  
+	  
 	' Fill in the values
 	If bUseDefaultCode Then
 		sCode=""
@@ -166,6 +166,7 @@ Sub DisplayError()
 	End If
 	oEditorDialog.getControl ("sErrMsg").setText (sText)
 	oEditorDialog.getModel().getByName ("sErrMsg").BackgroundColor = lErrMsgHighlightColor
+	oEditorDialog.getControl ("sErrMsg").Visible = True
 	If iErrNum > 1 Then
 		oEditorDialog.getModel().getByName ("PrevErr").Enabled = True
 	Else
@@ -181,7 +182,7 @@ End Sub
 
 
 Sub GotoError(n)
-	' set Curser to Error
+	' set Cursor to Error
 
 	Dim oSelection As Object
 	Dim iLilyPondCodePos As Integer ' Error position in sLilyPondCode
@@ -257,7 +258,7 @@ Sub CallExtEditor()
 	Dim sCommand As String
 	Dim sParam As String
 
-	If sOSType = "Unix" Then
+	If (sOSType = "Unix") Or (sOSType = "Mac") Then
 		sCommand="cd " & Chr(34) & ConvertFromURL(sTmpPath) & Chr(34) & "; " _
 		& Chr(34) & sExtEditorExecutable & Chr(34) & " " & constOLyFileName & "Temp.ly; if [ $? -ge 127 ]; then touch ExtEditor-cannot_execute; fi; if [ $? -ge 126 ]; then touch ExtEditor-cannot_execute; fi" ' not found -> 127, denied ->126
 		' On Error GoTo ErrorHandler	' doesn't work here, so let's use the cannot_execute-File...			

extension/OOoLilyPond/Editor.xba

@@ -45,21 +45,21 @@
   </dlg:checkbox>
   <dlg:textfield dlg:id="sTemplatePath" dlg:tab-index="48" dlg:left="173" dlg:top="124" dlg:width="102" dlg:height="12" dlg:help-text="The path where OOoLiliyPond looks for templates."/>
   <dlg:textfield dlg:id="sLilyPondExecutable" dlg:tab-index="49" dlg:left="173" dlg:top="176" dlg:width="102" dlg:height="12" dlg:help-text="The LilyPond executable with or without path."/>
-  <dlg:numericfield dlg:id="iGraphicDPI" dlg:tab-index="52" dlg:left="208" dlg:top="218" dlg:width="20" dlg:height="12" dlg:help-text="Resolution for pixel based (png-format) OOoLilyPond objects." dlg:decimal-accuracy="0" dlg:value="300" dlg:value-min="75" dlg:value-max="2400" dlg:value-step="0"/>
-  <dlg:combobox dlg:id="sFormat" dlg:tab-index="51" dlg:left="174" dlg:top="218" dlg:width="25" dlg:height="12" dlg:help-text="The png format looks better on the screen. The eps and svg formats are optimized for printing." dlg:spin="true"/>
+  <dlg:numericfield dlg:id="iGraphicDPI" dlg:tab-index="52" dlg:left="228" dlg:top="218" dlg:width="30" dlg:height="12" dlg:help-text="Resolution for pixel based (png-format) OOoLilyPond objects." dlg:decimal-accuracy="0" dlg:value="300" dlg:value-min="75" dlg:value-max="2400" dlg:value-step="0"/>
+  <dlg:combobox dlg:id="sFormat" dlg:tab-index="51" dlg:left="174" dlg:top="218" dlg:width="50" dlg:height="12" dlg:help-text="The png format looks better on the screen. The eps and svg formats are optimized for printing." dlg:spin="true"/>
   <dlg:checkbox dlg:id="bIgnoreWarnings" dlg:tab-index="53" dlg:left="173" dlg:top="192" dlg:width="143" dlg:height="10" dlg:help-text="Don&apos;t list warnings along with LilyPond&apos;s error messages" dlg:value="Ignore Warnings" dlg:checked="false"/>
   <dlg:textfield dlg:id="sExtEditorExecutable" dlg:tab-index="47" dlg:left="173" dlg:top="150" dlg:width="102" dlg:height="12" dlg:help-text="The external Editor&apos;s executable with or without path."/>
   <dlg:textfield dlg:id="sIncludeStatement" dlg:tab-index="46" dlg:left="173" dlg:top="72" dlg:width="143" dlg:height="12" dlg:help-text="The path(s) where LilyPond looks for include files (multiple statements possible)"/>
   <dlg:textfield dlg:id="sEditorFontName" dlg:tab-index="42" dlg:left="173" dlg:top="46" dlg:width="102" dlg:height="12" dlg:help-text="Specify the font name for the editor pane"/>
   <dlg:textfield dlg:id="sEditorFontSize" dlg:tab-index="43" dlg:left="281" dlg:top="46" dlg:width="35" dlg:height="12" dlg:help-text="Specify the font size for the editor pane"/>
   <dlg:radiogroup>
-   <dlg:radio dlg:id="WriterInsertViaClipboard" dlg:tab-index="16" dlg:left="9" dlg:top="133" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images via Clipboard. Recommended for OpenOffice." dlg:value="Via Clipboard (OpenOffice)"/>
-   <dlg:radio dlg:id="WriterInsertDirect" dlg:tab-index="17" dlg:left="9" dlg:top="145" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images without Clipboard use. Recommended for LibreOffice." dlg:value="Direct (LibreOffice)"/>
-   <dlg:radio dlg:id="ImpressInsertViaClipboard" dlg:tab-index="30" dlg:left="9" dlg:top="278" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images via Clipboard. Recommended for OpenOffice." dlg:value="Via Clipboard (OpenOffice)"/>
-   <dlg:radio dlg:id="ImpressInsertDirect" dlg:tab-index="31" dlg:left="9" dlg:top="290" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images without Clipboard use. Recommended for LibreOffice." dlg:value="Direct (LibreOffice)"/>
+   <dlg:radio dlg:id="WriterInsertViaClipboard" dlg:tab-index="16" dlg:left="10" dlg:top="133" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images via Clipboard. Recommended for OpenOffice." dlg:value="Via Clipboard (OpenOffice)"/>
+   <dlg:radio dlg:id="WriterInsertDirect" dlg:tab-index="17" dlg:left="10" dlg:top="145" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images without Clipboard use. Recommended for LibreOffice." dlg:value="Direct (LibreOffice)"/>
+   <dlg:radio dlg:id="ImpressInsertViaClipboard" dlg:tab-index="30" dlg:left="10" dlg:top="278" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images via Clipboard. Recommended for OpenOffice." dlg:value="Via Clipboard (OpenOffice)"/>
+   <dlg:radio dlg:id="ImpressInsertDirect" dlg:tab-index="31" dlg:left="10" dlg:top="290" dlg:width="145" dlg:height="12" dlg:help-text="Insert Images without Clipboard use. Recommended for LibreOffice." dlg:value="Direct (LibreOffice)"/>
   </dlg:radiogroup>
-  <dlg:checkbox dlg:id="bWriterKeepCrop" dlg:tab-index="18" dlg:left="9" dlg:top="166" dlg:width="147" dlg:height="9" dlg:help-text="When editing/replacing an existing object in Writer, preserve its current size and crop settings" dlg:value="Keep Size &amp; Crop Settings" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="bImpressKeepCrop" dlg:tab-index="32" dlg:left="9" dlg:top="311" dlg:width="147" dlg:height="9" dlg:help-text="When editing/replacing an existing object in Impress/Draw, preserve its current size and crop settings" dlg:value="Keep Size &amp; Crop Settings" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="bWriterKeepCrop" dlg:tab-index="18" dlg:left="10" dlg:top="166" dlg:width="147" dlg:height="9" dlg:help-text="When editing/replacing an existing object in Writer, preserve its current size and crop settings" dlg:value="Keep Size &amp; Crop Settings" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="bImpressKeepCrop" dlg:tab-index="32" dlg:left="10" dlg:top="311" dlg:width="147" dlg:height="9" dlg:help-text="When editing/replacing an existing object in Impress/Draw, preserve its current size and crop settings" dlg:value="Keep Size &amp; Crop Settings" dlg:checked="false"/>
   <dlg:titledbox dlg:id="WriterDefaultsFrame" dlg:tab-index="0" dlg:left="6" dlg:top="7" dlg:width="155" dlg:height="173">
    <dlg:title dlg:value="Default Values for Writer"/>
   </dlg:titledbox>
@@ -81,9 +81,9 @@
   <dlg:text dlg:id="LabelExtEditorExecutable" dlg:tab-index="39" dlg:left="173" dlg:top="139" dlg:width="142" dlg:height="9" dlg:value="External Editor Executable:"/>
   <dlg:text dlg:id="LabelTemplatePath" dlg:tab-index="35" dlg:left="173" dlg:top="113" dlg:width="143" dlg:height="9" dlg:value="Template Path:"/>
   <dlg:text dlg:id="LabelLilyPondExecutable" dlg:tab-index="36" dlg:left="173" dlg:top="165" dlg:width="143" dlg:height="9" dlg:value="LilyPond Executable:"/>
-  <dlg:text dlg:id="LabelFormat" dlg:tab-index="37" dlg:left="174" dlg:top="207" dlg:width="31" dlg:height="10" dlg:value="Format:"/>
-  <dlg:text dlg:id="LabelDPI" dlg:tab-index="19" dlg:left="231" dlg:top="220" dlg:width="66" dlg:height="9" dlg:help-text="dots per inch" dlg:value="dpi"/>
-  <dlg:text dlg:id="LabelGraphicDPIResolution" dlg:tab-index="38" dlg:left="209" dlg:top="207" dlg:width="89" dlg:height="10" dlg:value="Resolution (png):"/>
+  <dlg:text dlg:id="LabelFormat" dlg:tab-index="37" dlg:left="174" dlg:top="207" dlg:width="51" dlg:height="10" dlg:value="Format:"/>
+  <dlg:text dlg:id="LabelDPI" dlg:tab-index="19" dlg:left="260" dlg:top="220" dlg:width="58" dlg:height="9" dlg:help-text="dots per inch" dlg:value="dpi"/>
+  <dlg:text dlg:id="LabelGraphicDPIResolution" dlg:tab-index="38" dlg:left="229" dlg:top="207" dlg:width="89" dlg:height="10" dlg:value="Resolution (png):"/>
   <dlg:text dlg:id="LabelImpressDefaultTemplate" dlg:tab-index="57" dlg:left="9" dlg:top="215" dlg:width="41" dlg:height="10" dlg:value="Template:" dlg:align="right"/>
   <dlg:titledbox dlg:id="ImpressDefaultsFrame" dlg:tab-index="20" dlg:left="6" dlg:top="199" dlg:width="155" dlg:height="126">
    <dlg:title dlg:value="Default Values for Impress and Draw"/>