Merge pull request #28 from edgar79/windows-utf8-codepage65001

Windows batch encoded in UTF-8 (using chcp 65001)

Author: KlausBlum

extension/OOoLilyPond/LilyPond.xba

@@ -82,7 +82,7 @@ Function CallLilyPond() As Boolean
 
 	ElseIf sOSType = "Windows" Then
 
-		sCommand = "cd /d " & Chr(34) & ConvertFromURL(sTmpPath) & Chr(34) & Chr(10) _
+		sCommand = "cd /d " & Chr(34) & ConvertFromURL(sTmpPath) & Chr(34) & Chr(10) & Chr(13) _
 		& Chr(34) & sLilyPondExecutable & Chr(34) & " -dno-point-and-click"
 		If Len(sIncludeStatement) > 0 Then
 			sCommand = sCommand & " " & sIncludeStatement
@@ -91,21 +91,21 @@ Function CallLilyPond() As Boolean
 			If bTransparentBackground Then
 				sCommand = sCommand & " -dno-delete-intermediate-files -dpixmap-format=pngalpha --png " & sBackendOpt & " -dresolution=" _
 				& iGraphicDPI & " "& Chr(34) & ConvertFromURL(sTmpPath) & constOLyFileName & ".ly" & Chr (34) _
-				& " >" & constOLyFileName & ".out 2>&1" &Chr(10)
+				& " >" & constOLyFileName & ".out 2>&1" & Chr(10) & Chr(13)
 			Else
 				sCommand = sCommand & " -dno-delete-intermediate-files --png " & sBackendOpt & " -dresolution=" _
 				& iGraphicDPI & " " & Chr(34) & ConvertFromURL(sTmpPath) & constOLyFileName & ".ly" & Chr (34) _
-			& " >" & constOLyFileName & ".out 2>&1" &Chr(10)
+			& " >" & constOLyFileName & ".out 2>&1" & Chr(10) & Chr(13)
 			End If
 		ElseIf sFormat="eps" Then
 			sCommand = sCommand & " " & sBackendOpt & " -f eps " & Chr(34) & ConvertFromURL(sTmpPath) & constOLyFileName & ".ly" & Chr (34) _
-			& " >" & constOLyFileName & ".out 2>&1" & Chr(10)
+			& " >" & constOLyFileName & ".out 2>&1" & Chr(10) & Chr(13)
 		ElseIf sFormat="svg" Then
 			sCommand = sCommand & " " & sBackendOpt & " " & Chr(34) & ConvertFromURL(sTmpPath) & constOLyFileName & ".ly" & Chr (34) _
-			& " >" & constOLyFileName & ".out 2>&1" & Chr(10)
+			& " >" & constOLyFileName & ".out 2>&1" & Chr(10) & Chr(13)
 		End If
-		sCommand=sCommand & "if %ERRORLEVEL% equ 9009 echo cannot execute >LilyPond-cannot_execute" & Chr(10) _
-		& "if %ERRORLEVEL% equ 3 echo cannot execute >LilyPond-cannot_execute" & Chr(10)
+		sCommand=sCommand & "if %ERRORLEVEL% equ 9009 echo cannot execute >LilyPond-cannot_execute" & Chr(10) & Chr(13) _
+		& "if %ERRORLEVEL% equ 3 echo cannot execute >LilyPond-cannot_execute" & Chr(10) & Chr(13)
 		'ToDo: 9009 and 3 OK? Other errors? Wrong Permissions?
 		WindowsCommand(sCommand)
 

extension/OOoLilyPond/Tools.xba

@@ -335,6 +335,7 @@ End Function
 
 
 Sub WindowsCommand(sCommand as String)
+	
 	' I did not achieve to run lilypond directly with the Shell command and the 
 	' Output redirected to files.
 	' I tried: Shell("cmd /c lilypond >file1 2>file2")
@@ -344,15 +345,24 @@ Sub WindowsCommand(sCommand as String)
 
 	Dim sBatFile As String
 	Dim iNumber As Integer
+	Dim oTextStream As Object
 
 	sBatFile=TmpFileName(ConvertFromURL(sTmpPath) & "CommandCallFromOOo_",".bat")
+	
+	' Open output stream
+	oTextStream  = createUnoService("com.sun.star.io.TextOutputStream")
+	If oFileAccess.exists( sBatFile ) Then oFileAccess.kill( sBatFile )
+	oTextStream.setOutputStream(oFileAccess.openFileWrite(sBatFile)) 
+    
+	'Set CodePage to 65001 - which is UTF-8 (Supports any except bidirectional and scripted languages)
+	oTextStream.setEncoding("utf-8")
+	oTextStream.writeString( Chr(10) & Chr(13) )
+	oTextStream.writeString("chcp 65001" & Chr(10) & Chr(13) & sCommand)
+	oTextStream.closeOutput()
 
-	iNumber = Freefile
-	Open sBatFile For Output As #iNumber
-	Print #iNumber, "chcp 1252" & Chr (10) & sCommand
-	Close #iNumber
-	Shell (sBatFile, 1, "", True)
+	Shell (sBatFile, 6, "", True) ' Window-code 6 : only show symbol and leave focus on the current window
 	Kill(sBatFile)
+	
 End Sub