The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 428d5f8978099b643ce5a256ac33b2d1bb12b7f8 Author: Julien Rioux <[email protected]> Date: Mon Dec 31 17:15:51 2012 +0100 Layout whitespace. diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index 8e1b80b..a1ab5ee 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -236,7 +236,7 @@ Style Acknowledgments Shape Smallcaps Size Larger EndFont - TopSep 0.7 + TopSep 0.7 End @@ -244,7 +244,7 @@ End Style Ruled_Table CopyStyle Standard - Category Specials + Category Specials LatexName ruledtabular LatexType environment End @@ -252,7 +252,7 @@ End Style Turn_Page CopyStyle Standard - Category Specials + Category Specials LatexName turnpage LatexType environment End @@ -260,7 +260,7 @@ End Style Wide_Text CopyStyle Standard - Category Specials + Category Specials LatexName widetext LatexType environment End commit 90f7007a2e6c78ffd031e4636ff909ab1bc2ddec Author: Julien Rioux <[email protected]> Date: Mon Dec 31 17:13:04 2012 +0100 Update my email and status. diff --git a/lib/CREDITS b/lib/CREDITS index b1f4073..adc9010 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -409,8 +409,8 @@ The driving force behind, and maintainer of, the LyX wiki wiki. Swedish translation of the Windows installer @bJulien Rioux -@iE-mail: jrioux () physics ! utoronto ! ca - Bug fixes, lilypond support +@iE-mail: jrioux () lyx ! org + Bug fixes, lilypond and revtex support, citation modules. @bBernhard Roider @iE-mail: bernhard.roider () sonnenkinder ! org Various bug fixes diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 4ed5749..afac963 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -1418,12 +1418,12 @@ contributers = [ u"The driving force behind, and maintainer of, the LyX wiki wiki.\nSwedish translation of the Windows installer"), contributer(u"Julien Rioux", - "jrioux () physics ! utoronto ! ca", + "jrioux () lyx ! org", "GPL", "Re: #6361: configure.py ignores packages required by user-defined modules", "m=125986505101722", "3 December 2009", - u"Bug fixes, lilypond support"), + u"Bug fixes, lilypond and revtex support, citation modules."), contributer(u"Bernhard Roider", "bernhard.roider () sonnenkinder ! org", diff --git a/lib/layouts/lilypond.module b/lib/layouts/lilypond.module index c08c2bf..d3f2260 100644 --- a/lib/layouts/lilypond.module +++ b/lib/layouts/lilypond.module @@ -5,7 +5,7 @@ #DescriptionEnd #Excludes: sweave -# Author: Julien Rioux <[email protected]> +# Author: Julien Rioux <[email protected]> Format 43 OutputFormat lilypond-book diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index 65c66e8..8e1b80b 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -5,7 +5,7 @@ # Based on official article.layout, revtex4.layout and stdclass.inc definition files, # and on the unofficial revtex4-1.layout by Manoj Rajagopalan, posted to the wiki. -# Author: Julien Rioux <[email protected]> +# Author: Julien Rioux <[email protected]> # Some notes: # - The \definecolor's are there to avoid LyX bug #4625. commit 40f8e1b45315e9c0c2800df1031ed8e496da35b8 Author: Julien Rioux <[email protected]> Date: Tue Jun 26 23:15:04 2012 +0200 Update the lilypond example file. - Add a note about HTML. - Add a note about using external files. - Add a note about using lilypond variables and commands. - Some corrections and nitpicks. diff --git a/lib/examples/lilypond.lyx b/lib/examples/lilypond.lyx index 0a1c37f..737af00 100644 --- a/lib/examples/lilypond.lyx +++ b/lib/examples/lilypond.lyx @@ -12,9 +12,9 @@ lilypond \language_package default \inputencoding auto \fontencoding global -\font_roman default -\font_sans default -\font_typewriter default +\font_roman lmodern +\font_sans lmss +\font_typewriter lmtt \font_default_family default \use_non_tex_fonts false \font_sc false @@ -31,7 +31,7 @@ lilypond \spacing single \use_hyperref true \pdf_title "LilyPond-book and LyX" -\pdf_author "Your Name" +\pdf_author "The LyX Team" \pdf_bookmarks true \pdf_bookmarksnumbered true \pdf_bookmarksopen true @@ -83,17 +83,7 @@ LilyPond-book and LyX \end_layout \begin_layout Author -Fake Author -\begin_inset Note Note -status open - -\begin_layout Plain Layout -author of this example file: Julien Rioux -\end_layout - -\end_inset - - +The LyX Team \end_layout \begin_layout Abstract @@ -123,7 +113,7 @@ While LilyPond itself supports the display of title, author information, \end_layout \begin_layout Standard -This document describes the use of the Lilypond music notation within LyX +This document describes the use of the LilyPond music notation within LyX documents that use a LaTeX-based layout, thus combining the beauty and quality of the typesetting achieved by both LaTeX and LilyPond. While a basic understanding of the LilyPond syntax for music notation is @@ -173,8 +163,8 @@ Settings You can use any LaTeX-based LyX layout and use the regular preview and export mechanism; LyX will take care of processing the mixed LaTeX/LilyPond code through LilyPond-book for you. - LilyPond-book can also handle DocBook documents but LilyPond-DocBook support - in LyX is missing at the moment. + LilyPond-book can also handle DocBook and HTML documents, but the integration + of these document types with LilyPond-book and LyX is missing at the moment. \end_layout \begin_layout Subsection @@ -296,17 +286,19 @@ includegraphics{\SpecialChar \ldots{} \end_layout \begin_layout Standard -Thus, the conversion path is as follow: +Thus, the conversion process is as follow: \family sans LyX\SpecialChar \menuseparator LilyPond-book\SpecialChar \menuseparator LaTeX \family default . + LyX creates a .lytex file, LilyPond-book creates a .tex files and the accompanyin +g image files, and LaTeX creates the final document. Every step of the tool chain obeys your spacing, so whether you put the - musical extract in line, or in its own paragraph, centered, left-aligned, + musical extract inline, or in its own paragraph, centered, left-aligned, etc., what you see in the LyX window should be respected in the final format. - An example of in-line use may be to display a chord name, such as + An example of inline use may be to display a chord name, such as \begin_inset Flex LilyPond status open @@ -572,12 +564,19 @@ score given \end_layout +\begin_layout Standard +Writing the notes directly within braces without using any LilyPond command + is convenient when writing short snippets. + Advanced users will probably want to enter their musical content using + LilyPond variables and commands, which is of course supported. +\end_layout + \begin_layout Subsubsection Fret diagrams \end_layout \begin_layout Standard -Another gotcha is with subsequent lilypond snippets with +Another gotcha is with subsequent LilyPond snippets with \family typewriter \backslash @@ -633,6 +632,44 @@ end{lilypond} \begin_layout Standard For some reason LilyPond-book version 2.13 barks on this when run in safe mode (which you always should use, unless you know what you are doing). + This has been corrected as of version 2.15 (was LilyPond issue #1900). +\end_layout + +\begin_layout Subsubsection +The +\family typewriter + +\backslash +lilypondfile +\family default + command +\end_layout + +\begin_layout Standard +LilyPond-book supports including LilyPond code that resides in external + files with the +\family typewriter + +\backslash +lilypondfile +\family default + command. + With this command, the LilyPond code is processed as if it was typed inside + the document and the output score follows the typesetting determined by + LaTeX with respect to line width, page breaks, and so on. + This is in contrast to the long-standing LyX feature to include LilyPond + scores as external material, which calls LilyPond on the external file + to produce a rigid figure, and includes this figure in the document, leaving + the typesetting decisions to LilyPond. + Unfortunately, support for the +\family typewriter + +\backslash +lilypondfile +\family default + command in LyX is not implemented yet, but it is possible to use it inside + a TeX-Code block, provided that one writes the complete, absolute path + to the desired file. \end_layout \begin_layout Section @@ -654,7 +691,7 @@ reference "sub:Editorial-headword" \end_inset - shows a complex example using many LilyPond constructs; some scheme code + shows a complex score using many LilyPond constructs; some scheme code has been removed from the original source of this snippet, to be able to run in safe mode. Example commit 10b2ef1af5fdeced877ef01171ac49828b47c1dd Author: Julien Rioux <[email protected]> Date: Wed Jun 27 13:41:19 2012 +0200 lyxpreview: Allow to find python scripts. In particular, lilypond-book is just a python script. On windows, we need to call the python interpreter, using the full path to the script while being wary of spaces in the path. diff --git a/lib/scripts/lyxpreview_tools.py b/lib/scripts/lyxpreview_tools.py index 546ed24..8408b3a 100644 --- a/lib/scripts/lyxpreview_tools.py +++ b/lib/scripts/lyxpreview_tools.py @@ -36,6 +36,7 @@ path = os.environ["PATH"].split(os.pathsep) extlist = [''] if "PATHEXT" in os.environ: extlist += os.environ["PATHEXT"].split(os.pathsep) +extlist.append('.py') use_win32_modules = 0 if os.name == "nt": @@ -99,6 +100,9 @@ def find_exe(candidates): # have found it). Return just the basename to avoid # problems when the path to the executable contains # spaces. + if full_path.lower().endswith('.py'): + return command.replace(prog, '"%s" "%s"' + % (sys.executable, full_path)) return command return None ----------------------------------------------------------------------- Summary of changes: lib/CREDITS | 4 +- lib/examples/lilypond.lyx | 83 ++++++++++++++++++++++++++++----------- lib/generate_contributions.py | 4 +- lib/layouts/lilypond.module | 2 +- lib/layouts/revtex4-1.layout | 10 ++-- lib/scripts/lyxpreview_tools.py | 4 ++ 6 files changed, 74 insertions(+), 33 deletions(-) hooks/post-receive -- The LyX Source Repository
