Reviewers: Trevor Daniels,

Message:
Please review.

Description:
As previously discussed, updates to the Windows tutorial to match the
way LilyPond currently works and fit the images into the PDF better.

Please review this at https://codereview.appspot.com/12980044/

Affected files:
  M Documentation/included/generating-output.itexi
  A Documentation/pictures/BadLog.png
  A Documentation/pictures/BadLog2.png
  A Documentation/pictures/DragDrop.png
  A Documentation/pictures/EditFile.png
  A Documentation/pictures/FileSave.png
  A Documentation/pictures/GenPDF.png
  D Documentation/pictures/Learning_Win7_All_Files_Created.png
  D Documentation/pictures/Learning_Win7_Log_File.png
  D Documentation/pictures/Learning_Win7_New_Menu.png
  D Documentation/pictures/Learning_Win7_Open_Context_Menu.png
  D Documentation/pictures/Learning_Win7_Open_Dragndrop.png
  D Documentation/pictures/Learning_Win7_Open_Menu.png
  D Documentation/pictures/Learning_Win7_Pdf_Output.png
  D Documentation/pictures/Learning_Win7_Save_File_With_Name.png
  D Documentation/pictures/Learning_Win7_Save_Menu.png
  D Documentation/pictures/Learning_Win7_Welcome_File_Whole.png
  A Documentation/pictures/LilyPad.png
  A Documentation/pictures/PDFRead.png
  A Documentation/pictures/SaveAs.png


Index: Documentation/pictures/Learning_Win7_All_Files_Created.png
diff --git a/Documentation/pictures/Learning_Win7_All_Files_Created.png b/Documentation/pictures/Learning_Win7_All_Files_Created.png
deleted file mode 100644
index 5d608555c30afa1413cb00821266ed37aed8ef32..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_All_Files_Created.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Log_File.png
diff --git a/Documentation/pictures/Learning_Win7_Log_File.png b/Documentation/pictures/Learning_Win7_Log_File.png
deleted file mode 100644
index 4a68339d458d64c5269c5def063489526bca3abe..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Log_File.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_New_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_New_Menu.png b/Documentation/pictures/Learning_Win7_New_Menu.png
deleted file mode 100644
index eebabd4eb570943d343bb735877a4238db0352ff..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_New_Menu.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Open_Context_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Context_Menu.png b/Documentation/pictures/Learning_Win7_Open_Context_Menu.png
deleted file mode 100644
index 8e7d420ee6075af8611cf8b2353d7e9e1765668f..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Open_Context_Menu.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Open_Dragndrop.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Dragndrop.png b/Documentation/pictures/Learning_Win7_Open_Dragndrop.png
deleted file mode 100644
index 2df9b1714c0fc62cf8e864c3dc62c9d7a2ea6396..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Open_Dragndrop.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Open_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Menu.png b/Documentation/pictures/Learning_Win7_Open_Menu.png
deleted file mode 100644
index 68cdcb44c351a81481f6c67f9050163680e30b5d..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Open_Menu.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Pdf_Output.png
diff --git a/Documentation/pictures/Learning_Win7_Pdf_Output.png b/Documentation/pictures/Learning_Win7_Pdf_Output.png
deleted file mode 100644
index 57190f3255468bbe3e77600b5f3a7a907bb55135..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Pdf_Output.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Save_File_With_Name.png
diff --git a/Documentation/pictures/Learning_Win7_Save_File_With_Name.png b/Documentation/pictures/Learning_Win7_Save_File_With_Name.png
deleted file mode 100644
index ba605da09da076dc3badca672236185de29022fb..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Save_File_With_Name.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Save_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Save_Menu.png b/Documentation/pictures/Learning_Win7_Save_Menu.png
deleted file mode 100644
index f9b3dd759bc98e407e746760f82768bbced728e7..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Save_Menu.png and /dev/null differ
Index: Documentation/pictures/Learning_Win7_Welcome_File_Whole.png
diff --git a/Documentation/pictures/Learning_Win7_Welcome_File_Whole.png b/Documentation/pictures/Learning_Win7_Welcome_File_Whole.png
deleted file mode 100644
index ac3cc7907032483f084659db947e403119128952..0000000000000000000000000000000000000000 Binary files a/Documentation/pictures/Learning_Win7_Welcome_File_Whole.png and /dev/null differ
Index: Documentation/included/generating-output.itexi
diff --git a/Documentation/included/generating-output.itexi b/Documentation/included/generating-output.itexi index de9fd0c87694ebc2a9c18ee12a21fe53dd7245ca..a2c2dd092b805ea767bbb796904f3a750c3cf55d 100644
--- a/Documentation/included/generating-output.itexi
+++ b/Documentation/included/generating-output.itexi
@@ -86,83 +86,83 @@ those programs if you have any problems compiling a file.}

 @subsubheading Step 1. Create your @file{.ly} file

-Double-click the LilyPond icon on your desktop, an example file will open.
+Double-click the LilyPond icon on your desktop and an example file will open.

-@sourceimage{Learning_Win7_Welcome_File_Whole,,,}
+@sourceimage{LilyPad,,,}

 From the menus that appear along the top of the example file,
 select @w{@code{File > Save as}}.  Do not use the @w{@code{File > Save}}
 for the example file as this will not work until you have given it a
 valid LilyPond file name.

-@sourceimage{Learning_Win7_Save_Menu,,,}
+@sourceimage{FileSave,,,}

 Choose a name for your file, for example @file{test.ly}.

-@sourceimage{Learning_Win7_Save_File_With_Name,,,}
+@sourceimage{SaveAs,,,}


-@subsubheading Step 2a. Compile (with drag-and-drop)
+@subsubheading Step 2. Compile

-Depending on what you prefer, to compile your file either:
+To turn your LilyPond file into a music score, you need to compile it. This
+can be done a number of ways -- using drag and drop, with right-click,
+double-clicking or using the command line (a DOS box).  We'll look at the
+first three to start with.

-Drag-and-drop the file directly onto the LilyPond icon.
+@enumerate a

-@sourceimage{Learning_Win7_Open_Dragndrop,,,}
+@item
+Drag-and-drop the file directly onto the LilyPond icon on the desktop.

-Right-click on the file and from the pop-up context menu choose
-@w{@code{Open with > LilyPond}}.
+@sourceimage{DragDrop,,,}

-@sourceimage{Learning_Win7_Open_Context_Menu,,,}
+Not much will seem to happen, but after a short while, you should
+see two new files on your desktop -- @file{test.log} and
+@file{test.pdf}.

+@item
+Right-click on the file and from the pop-up context menu and
+choose @w{@code{Generate PDF}}.

-@subsubheading Step 2b. Compile (with double-clicking)
+@sourceimage{GenPDF,,,}

+@item
 Or simply double-click the @file{test.ly}.

+@end enumerate

-@subsubheading Step 3. View output
-
-During the compilation of the @file{test.ly} file, a command window
-will, very briefly open and then close.  Three additional files will
-have been created during this process.

-@sourceimage{Learning_Win7_All_Files_Created,,,}
+@subsubheading Step 3. View output

-The PDF file contains the engraved @file{test.ly} file.
+@file{test.pdf} contains the engraved @file{test.ly}
+file. Double-click it and it should open in your PDF viewer:

-@sourceimage{Learning_Win7_Pdf_Output,,,}
+@sourceimage{PDFRead,,,}


 @subsubheading Other commands

 To create a new file, begin by selecting @w{@code{File > New}} from
-within any previously created file.
+within any previously created file or @w{@code{File > Open}} to open and
+edit any files you have saved before.  You can also edit a file by
+right-clicking it and selecting @w{@code{Edit source}}.

-@sourceimage{Learning_Win7_New_Menu,,,}
+@sourceimage{EditFile,,,}

-@noindent
-or @w{@code{File > Open}} to open and edit any files you have saved
-before.
+You must save any edits you make before you try to compile your
+file.  If the PDF file is not created or the output is not what you
+expected, check the log file that will have been created during the
+compilation attempt for any errors.

-@sourceimage{Learning_Win7_Open_Menu,,,}
-
-You must save any new edits you make before you compile it and if the
-PDF file is not created, check the log file that will have been created
-during the compilation attempt, for any errors.
-
-@sourceimage{Learning_Win7_Log_File,,,}
+@sourceimage{BadLog,,,}

 This log file is overwritten each time you compile your LilyPond file.

-The PS file is used internally by LilyPond to create the PDF file and
-can be ignored.  It also gets overwritten each time you compile your
-file.
-
-If you are viewing your file in a PDF viewer, then you must close the
-PDF if you wish to make a new compilation as it may fail to create
-the new PDF while it is still being viewed.
+If you are viewing your file in a PDF viewer, then you must close the PDF
+if you wish to try a new compilation as it may fail to create the new PDF
+while it is still being viewed.

+@sourceimage{BadLog2,,,}

 @end macro

@@ -184,7 +184,7 @@ Create a text file called @file{test.ly} and enter:
 @example
 \\version "@w{@versionStable{}}"
 @{
-  c' e' g' e'
+@ @ c' e' g' e'
 @}
 @end example

Index: Documentation/pictures/BadLog.png
diff --git a/Documentation/pictures/BadLog.png b/Documentation/pictures/BadLog.png
new file mode 100755
index 0000000000000000000000000000000000000000..ce95e98ffc784eaff360b07dfd59bf3a4caee1c1
Binary files /dev/null and b/Documentation/pictures/BadLog.png differ
Index: Documentation/pictures/BadLog2.png
diff --git a/Documentation/pictures/BadLog2.png b/Documentation/pictures/BadLog2.png
new file mode 100755
index 0000000000000000000000000000000000000000..2be3b29c22326734c0be63c08ced58107989ccd3
Binary files /dev/null and b/Documentation/pictures/BadLog2.png differ
Index: Documentation/pictures/DragDrop.png
diff --git a/Documentation/pictures/DragDrop.png b/Documentation/pictures/DragDrop.png
new file mode 100755
index 0000000000000000000000000000000000000000..e67b9473bc8d90ec2f6a5ba360592f2b234f2887
Binary files /dev/null and b/Documentation/pictures/DragDrop.png differ
Index: Documentation/pictures/EditFile.png
diff --git a/Documentation/pictures/EditFile.png b/Documentation/pictures/EditFile.png
new file mode 100755
index 0000000000000000000000000000000000000000..747ecad68d5b38c17029b4e24ab6b5a933b71207
Binary files /dev/null and b/Documentation/pictures/EditFile.png differ
Index: Documentation/pictures/FileSave.png
diff --git a/Documentation/pictures/FileSave.png b/Documentation/pictures/FileSave.png
new file mode 100755
index 0000000000000000000000000000000000000000..8d91121f339584fd620d433b57ca3eb7adc6aa26
Binary files /dev/null and b/Documentation/pictures/FileSave.png differ
Index: Documentation/pictures/GenPDF.png
diff --git a/Documentation/pictures/GenPDF.png b/Documentation/pictures/GenPDF.png
new file mode 100755
index 0000000000000000000000000000000000000000..8030910965122ac2f09049491344fa0b90bca96f
Binary files /dev/null and b/Documentation/pictures/GenPDF.png differ
Index: Documentation/pictures/LilyPad.png
diff --git a/Documentation/pictures/LilyPad.png b/Documentation/pictures/LilyPad.png
new file mode 100755
index 0000000000000000000000000000000000000000..5a9e976dad218df84821490259c5836e2bb484a7
Binary files /dev/null and b/Documentation/pictures/LilyPad.png differ
Index: Documentation/pictures/PDFRead.png
diff --git a/Documentation/pictures/PDFRead.png b/Documentation/pictures/PDFRead.png
new file mode 100755
index 0000000000000000000000000000000000000000..aaa1175b526999b3e2aee4b2d00ced254c294349
Binary files /dev/null and b/Documentation/pictures/PDFRead.png differ
Index: Documentation/pictures/SaveAs.png
diff --git a/Documentation/pictures/SaveAs.png b/Documentation/pictures/SaveAs.png
new file mode 100755
index 0000000000000000000000000000000000000000..ead5d0d17cf91e5e1643418a90682e57c5b47ebd
Binary files /dev/null and b/Documentation/pictures/SaveAs.png differ



_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to