>From 5bafa5a6cb5c855c2b6b1815347956c004e00072 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 31 Jul 2010 09:52:21 +0200 Subject: [PATCH 1/4] Fix typos in the English manual. --- Documentation/GNUmakefile | 4 +- Documentation/contributor/doc-work.itexi | 26 +++++++++--------- Documentation/contributor/introduction.itexi | 4 +- Documentation/contributor/issues.itexi | 6 ++-- Documentation/contributor/lsr-work.itexi | 2 +- Documentation/contributor/programming-work.itexi | 28 ++++++++++---------- Documentation/contributor/regressions.itexi | 4 +- Documentation/contributor/source-code.itexi | 8 +++--- Documentation/essay/computer-notation.bib | 2 +- Documentation/essay/engraving.itely | 2 +- Documentation/essay/engravingbib.bib | 4 +- Documentation/extending/scheme-tutorial.itely | 2 +- Documentation/included/chord-names-languages.ly | 8 +++--- Documentation/included/compile.itexi | 2 +- Documentation/included/helpus.itexi | 2 +- Documentation/learning.tely | 2 +- Documentation/learning/fundamental.itely | 2 +- Documentation/learning/tweaks.itely | 2 +- Documentation/macros.itexi | 2 +- Documentation/music-glossary.tely | 10 +++--- Documentation/notation/changing-defaults.itely | 4 +- Documentation/notation/expressive.itely | 2 +- Documentation/notation/fretted-strings.itely | 8 +++--- Documentation/notation/input.itely | 2 +- Documentation/notation/keyboards.itely | 4 +- Documentation/notation/percussion.itely | 2 +- Documentation/notation/pitches.itely | 2 +- Documentation/notation/repeats.itely | 2 +- Documentation/notation/rhythms.itely | 4 +- Documentation/notation/simultaneous.itely | 2 +- Documentation/notation/spacing.itely | 4 +- Documentation/notation/text.itely | 2 +- Documentation/notation/unfretted-strings.itely | 2 +- Documentation/notation/vocal.itely | 4 +- Documentation/notation/wind.itely | 4 +- Documentation/snippets/README | 2 +- .../snippets/new/using-the-whiteout-property.ly | 2 +- Documentation/usage/latex-lilypond-example.latex | 2 +- Documentation/usage/running.itely | 2 +- Documentation/usage/suggestions.itely | 2 +- Documentation/web/community.itexi | 4 +- Documentation/web/download.itexi | 8 +++--- 42 files changed, 96 insertions(+), 96 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index f26af1f..62db037 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -92,7 +92,7 @@ include $(depth)/make/stepmake.make OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES))) -### Web site idiosyncrases +### Web site idiosyncrasies $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node ### AJAX scripts @@ -239,7 +239,7 @@ $(outdir)/%/source: ln -sf $(depth)/.. $(@) -## Snippets rules idiosyncrases +## Snippets rules idiosyncrasies $(outdir)/%.itely: snippets/%-intro.itely snippets/%.snippet-list xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^) diff --git a/Documentation/contributor/doc-work.itexi b/Documentation/contributor/doc-work.itexi index efcc606..572c454 100644 --- a/Documentation/contributor/doc-work.itexi +++ b/Documentation/contributor/doc-work.itexi @@ -128,7 +128,7 @@ unless we are certain that the new version is an improvement. @enumerate @item -Ask on the lilypond-devel maillist if such a rewrite is necessary; +Ask on the lilypond-devel mailing list if such a rewrite is necessary; somebody else might already be working on this issue! @item @@ -142,7 +142,7 @@ Please prepare a formal git patch. Once you have followed these guidelines, please send a message to lilypond-devel with your documentation submissions. Unfortunately -there is a strict “no top-posting” check on the mailist; to avoid +there is a strict “no top-posting” check on the mailing list; to avoid this, add: > I'm not top posting. @@ -299,7 +299,7 @@ convention to follow. @item All context or layout object strings should be prefaced with @code{#}. Again, LilyPond does not strictly require this, but it is helpful -to get users accustomed to this scheme construct. i.e. @code{\set +to get users accustomed to this scheme construct, i.e. @code{\set Staff.instrumentName = #"cello"} @item @@ -413,7 +413,7 @@ but instead: \chordmode @{ c e g @} @end example @item -Use @{ @} marks for additional @code{\markup} format comands; ie +Use @{ @} marks for additional @code{\markup} format commands; ie @example not: c^\markup \tiny\sharp @@ -574,7 +574,7 @@ cross-reference to be rendered incorrectly in html documents. @code{@@address@hidden@address@hidden --- link to Notation Reference. @item address@hidden@@address@hidden@address@hidden --- link to General Informaion. address@hidden@@address@hidden@address@hidden --- link to General Information. @end itemize @@ -848,7 +848,7 @@ must be duplicated in the @code{@@seealso} section at the bottom. Introducing examples must be done with @example -. (ie finish the previous sentence/paragaph) +. (ie finish the previous sentence/paragraph) : (ie `in this example:') , (ie `may add foo with the blah construct,') @end example @@ -1354,7 +1354,7 @@ to work on them, please ask for help. The mailing list @code{translations@@lilynet.net} is dedicated to LilyPond web site and documentation translation; on this list, you will get support from the Translations Meister and experimented translators, -and we regularly discuss translations issues common to all languagues. +and we regularly discuss translations issues common to all languages. All people interested in LilyPond translations are invited to subscribe to this list regardless of the amount of their contribution, by sending an email to @code{translations-request@@lilynet.net} with subject @@ -1557,7 +1557,7 @@ everything in some Texinfo files, and you may take distance from the original text; for instance, in the translation of the web site section Community, you may take this into account depending on what you know the community in your language is willing to support, which is possible only -if you personnally assume this support, or there exists a public forum +if you personally assume this support, or there exists a public forum or mailing list listed in Community for LilyPond in your language: @itemize @@ -1790,7 +1790,7 @@ or to update a single file make address@hidden/@var{manual}/foo.itely} update-translation @end example -For each file to be udpated, @code{update-translation} will open your +For each file to be updated, @code{update-translation} will open your text editor with this file and a diff of the file in English; if the diff cannot be generated or is bigger than the file in English itself, the full file in English will be opened instead. @@ -1940,7 +1940,7 @@ macros.itexi until the documentation translation has been updated and no longer uses this macro. @item Update @file{*.tely} files completely with address@hidden check-translation} -- you may want to redirect ouptput address@hidden check-translation} -- you may want to redirect output to a file because of overwhelming output, or call check-translation.py on individual files, see @ref{Check state of translation}. @@ -2018,7 +2018,7 @@ make address@hidden fix-xrefs @end example @noindent -This step requires a sucessful documentation build (with @command{make +This step requires a successful documentation build (with @command{make doc}). Some cross-references are broken because they point to a node that exists in the documentation in English, which has not been added to the translation; in this case, do not fix the cross-reference but @@ -2077,11 +2077,11 @@ its documentation, and in this case they should be pushed to @item @code{lilypond/translation} Git branch may be merged into master only if LilyPond (@command{make all}) and documentation -(@command{make doc}) compile succesfully. +(@command{make doc}) compile successfully. @item @code{master} Git branch may be merged into @code{lilypond/translation} whenever @command{make} and @command{make -doc} are succesful (in order to ease documentation compilation by +doc} are successful (in order to ease documentation compilation by translators), or when significant changes had been made in documentation in English in master branch. diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi index 480aba6..b708ca7 100644 --- a/Documentation/contributor/introduction.itexi +++ b/Documentation/contributor/introduction.itexi @@ -144,7 +144,7 @@ than we think you can handle. @item Respond to questions from your contributor(s) promptly, even if -the reponse is just @qq{sorry, I don't know} or @qq{sorry, I'm +the response is just @qq{sorry, I don't know} or @qq{sorry, I'm very busy for the next 3 days; I'll get back to you then}. Make sure they feel valued. @@ -154,7 +154,7 @@ emails -- do you work on lilypond every day, or every weekend, or what? Also, if you'll be unavailable for longer than usual (say, if you normally reply within 24 hours, but you'll be at a conference for a week), let your contributors know. Again, make -sure thay feel valued, and that your silence (if they ask a +sure they feel valued, and that your silence (if they ask a question during that period) isn't their fault. @item diff --git a/Documentation/contributor/issues.itexi b/Documentation/contributor/issues.itexi index e018638..b3c8404 100644 --- a/Documentation/contributor/issues.itexi +++ b/Documentation/contributor/issues.itexi @@ -189,7 +189,7 @@ check to see who else has replied to it), delete it. @item If the email is a question about how to use LilyPond, reply with -this reponse: +this response: @example For questions about how to use LilyPond, please read our @@ -218,7 +218,7 @@ What version of lilypond was used (if not given) and operating system (if this is a suspected cause of the problem)? In short, if you cannot understand what the problem is, ask the user to explain more. It is the user's responsibility to explain the -problem, not your reponsibility to understand it. +problem, not your responsibility to understand it. @item If the behavior is expected, the user should be told to read the @@ -542,7 +542,7 @@ Frog: the fix is believed to be suitable for a new contributor issue should also have an estimated time in a comment. @item -Maintainability: hinders developent of LilyPond. For example, +Maintainability: hinders development of LilyPond. For example, improvements to the build system, or @qq{helper} python scripts. @item diff --git a/Documentation/contributor/lsr-work.itexi b/Documentation/contributor/lsr-work.itexi index 5cb4e70..e1e770a 100644 --- a/Documentation/contributor/lsr-work.itexi +++ b/Documentation/contributor/lsr-work.itexi @@ -182,7 +182,7 @@ followed to fix it reliably. @item Look up the snippet filename @address@hidden@/.ly} in the error output or log, then fix the file @file{Documentation/@/snippets/@/@var{foo}@/.ly} to make the -documentation build succesfully. +documentation build successfully. @item Determine where it comes from by looking at its first line, e.g. run diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi index 30e5adb..1a938ca 100644 --- a/Documentation/contributor/programming-work.itexi +++ b/Documentation/contributor/programming-work.itexi @@ -131,12 +131,12 @@ METAFONT tutorial page}. PostScript is used to generate graphical output. A brief PostScript tutorial is @uref{http://local.wasp.uwa.edu.au/~pbourke/dataformats/postscript/, available online}. The address@hidden://www.adobe.com/devnet/postscript/pdfs/PLRM.pdf, PostScript Lanugage address@hidden://www.adobe.com/devnet/postscript/pdfs/PLRM.pdf, PostScript Language Reference} is available online in PDF format. @subsection Python -Python is used for XML2ly and is used for buillding the documentation and the +Python is used for XML2ly and is used for building the documentation and the website. Python documentation is available at @uref{http://www.python.org/doc/, @@ -200,7 +200,7 @@ describes a process for finding interesting code. @subsection Using the ROADMAP The file ROADMAP is located in the main directory of the lilypond source. -ROADMAP lists all of the directories in the LilPond source tree, along +ROADMAP lists all of the directories in the LilyPond source tree, along with a brief description of the kind of files found in each directory. This can be a very helpful tool for deciding which directories to search when looking for a function. @@ -406,7 +406,7 @@ set number autocmd BufWritePre * :%s/\s\+$//e @end verbatim -With this .vimrc, files can be reindented automatically by highlihting +With this .vimrc, files can be reindented automatically by highlighting the lines to be indented in visual mode (use V to enter visual mode) and pressing =. @@ -656,7 +656,7 @@ _f ("cannot find character number: %d", i) @item Think about translation issues. In a lot of cases, it is better to -translate a whole message. The english grammar must not be imposed +translate a whole message. The English grammar must not be imposed on the translator. So, instead of @example @@ -699,7 +699,7 @@ _f ("Huh? Not a Request: `%s'. Ignoring.", request) @item Do not modularize too much; words frequently cannot be translated -without context. It is probably safe to treat most occurences of +without context. It is probably safe to treat most occurrences of words like stem, beam, crescendo as separately translatable words. @item @@ -792,7 +792,7 @@ out/bin/lilypond This is important as you will need to let gdb know where to find the image containing the symbol tables. You can invoke gdb from the -command line usinga the following: +command line using the following: @example gdb out/bin/lilypond @@ -1055,7 +1055,7 @@ number of different platforms: In order for the Graphviz tool to work, config.make must be modified. It is probably a good idea to first save a copy of config.make under -a different name. Then, edit config.make by removing every occurence +a different name. Then, edit config.make by removing every occurrence of @code{-DNDEBUG}. @item Rebuilding LilyPond @@ -1086,7 +1086,7 @@ lilypond graphviz.ly 2> graphviz.log The logfile has standard lilypond output, as well as the Graphviz output data. Delete everything from the beginning of the file -up to but not including the first occurence of @code{digraph}. +up to but not including the first occurrence of @code{digraph}. @item Process the logfile with @code{dot} @@ -1124,7 +1124,7 @@ for feature addition and modification. * Write the code:: * Write regression tests:: * Write convert-ly rule:: -* Automaticaly update auxiliary information:: +* Automatically update auxiliary information:: * Manually update auxiliary information:: * Edit changes.tely:: * Verify successful build:: @@ -1178,7 +1178,7 @@ rule will simply point out to the user that the feature needs manual correction. address@hidden Automaticaly update auxiliary information address@hidden Automatically update auxiliary information @subsection Automatically update auxiliary information convert-ly should be used to update the documentation, the snippets, @@ -1435,7 +1435,7 @@ with the modified branch checked out. Sometimes in response to comments on revisions, the best way to work may require creation of a new branch in git. In order to -associate the new branch with an existing Reitveld issue, +associate the new branch with an existing Rietveld issue, the following command can be used: @example @@ -1785,7 +1785,7 @@ Spanners (derived class) -slurs, beams- or Items (also a derived class) -notes, clefs, etc. There are two other derived classes System (derived from Spanner, -contaning a "line of music") and Paper_column (derived from Item, it +containing a "line of music") and Paper_column (derived from Item, it contains all items that happen at the same moment). They are separate classes because they play a special role in the linebreaking process. @@ -2114,7 +2114,7 @@ finds out about the breakpoint. Han-Wen answered as follows: -You can see the defintion by doing +You can see the definition by doing @example #(display conditionalMark) diff --git a/Documentation/contributor/regressions.itexi b/Documentation/contributor/regressions.itexi index ba4a5e7..f421a00 100644 --- a/Documentation/contributor/regressions.itexi +++ b/Documentation/contributor/regressions.itexi @@ -80,7 +80,7 @@ comparisons is archived online: @uref{http://lilypond.org/test/} @end example -The test comparison shows all of the changes that occured between +The test comparison shows all of the changes that occurred between the current release and the prior release. Each test that has a significant difference in output is displayed, with the old version on the left and the new version on the right. Blurs @@ -153,7 +153,7 @@ than building the source code, as described in @section Identifying code regressions Before modified code is committed to master, a regression test -comparision must be completed to ensure that the changes have +comparison must be completed to ensure that the changes have not caused problems with previously working code. The comparison is made automatically upon compiling the regression test suite twice. diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index e6d49ab..ac3ccc0 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -1028,7 +1028,7 @@ copy and paste the committish. A @emph{branch} is nothing more than a pointer to a particular commit, which is called the @emph{head} of the branch; when -referring to a branch, one often acutally thinks about its head +referring to a branch, one often actually thinks about its head and the ancestor commits of the head. Now we will explain the two last commands you used to get the @@ -1180,7 +1180,7 @@ repository. The commands above don't only bring you the latest version of the -sources, but also the full history of revisions (revisons, also +sources, but also the full history of revisions (revisions, also called commits, are changes made to the sources), stored in the @file{.git} directory. You can browse this history with @@ -1371,7 +1371,7 @@ where @var{user} is your username on Savannah. @item -After your membership has been activated and you’ve configured Git +After your membership has been activated and you've configured Git to use SSH, test the connection with: @example @@ -1530,7 +1530,7 @@ paragraphs next to analogous Unix instructions? -mp Git is a system for tracking the changes made to source files by a distributed set of editors. It is designed to work without a -master repository, but we have chosen to have a master respository +master repository, but we have chosen to have a master repository for LilyPond files. Editors hold a local copy of the master repository together with any changes they have made locally. Local changes are held in a local @q{branch}, of which there may diff --git a/Documentation/essay/computer-notation.bib b/Documentation/essay/computer-notation.bib index b5887cb..5ad0888 100644 --- a/Documentation/essay/computer-notation.bib +++ b/Documentation/essay/computer-notation.bib @@ -128,7 +128,7 @@ pages = {17--20}, volume = 18, number = 1, - note = {Byrd (author of Nightinggale) shows four problematic + note = {Byrd (author of Nightingale) shows four problematic fragments of notation, and rants about notation programs that try to exhibit intelligent behaviour. HWN} } diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely index 1015b0b..225170c 100644 --- a/Documentation/essay/engraving.itely +++ b/Documentation/essay/engraving.itely @@ -1113,7 +1113,7 @@ between staves, and the staves have different time signatures. Many software packages would struggle with reproducing this example because they are built on the nested box structure. With LilyPond, on the other hand, we have tried to keep the input format and the structure as -flexbile as possible. +flexible as possible. @node What symbols to engrave? @unnumberedsubsec What symbols to engrave? diff --git a/Documentation/essay/engravingbib.bib b/Documentation/essay/engravingbib.bib index 73cef39..cf4ec30 100644 --- a/Documentation/essay/engravingbib.bib +++ b/Documentation/essay/engravingbib.bib @@ -134,7 +134,7 @@ of print. } title = {Music Engraving and printing. Historical and Technical Treatise}, publisher = {Sir Isaac Pitman & Sons, ltd.}, year = 1923, - note = {This pattriotic book was an attempt to promote and help + note = {This patriotic book was an attempt to promote and help British music engravers. It is somewhat similar to Hader's book\cite{hader48} in scope and style, but Gamble focuses more on technical details (Which French punch cutters are worth buying from, @@ -227,7 +227,7 @@ year={1989} note={This is the style guide for Schirmer publications. This manual specifically focuses on preparing print for publication by Schirmer. It discusses many details that are not in other, normal -notation books. It als gives a good idea of what is necessary to bring +notation books. It also gives a good idea of what is necessary to bring printouts to publication quality. It can be ordered from the rental department. diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely index 42bc118..c1d5858 100644 --- a/Documentation/extending/scheme-tutorial.itely +++ b/Documentation/extending/scheme-tutorial.itely @@ -1135,7 +1135,7 @@ Now we examine the input, @end example So in our function, we need to clone this expression (so that we -have two notes to build the sequence), add @code{SlurEvents} to the +have two notes to build the sequence), add a @code{SlurEvent} to the @code{'elements} property of each one, and finally make a @code{SequentialMusic} with the two @code{EventChords}. diff --git a/Documentation/included/chord-names-languages.ly b/Documentation/included/chord-names-languages.ly index e446afa..cf81dbb 100644 --- a/Documentation/included/chord-names-languages.ly +++ b/Documentation/included/chord-names-languages.ly @@ -1,10 +1,10 @@ \version "2.12.0" \header { texidoc = "@cindex Chord Names German -The english naming of chords (default) can be changed to german -(@code{\germanChords} replaces B and Bes to H and B), semi-german -(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian -(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french +The English naming of chords (default) can be changed to German +(@code{\germanChords} replaces B and Bes to H and B), semi-German +(@code{\semiGermanChords} replaces B and Bes to H and Bb), Italian +(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or French (@code{\frenchChords} replaces Re to Ré). " } diff --git a/Documentation/included/compile.itexi b/Documentation/included/compile.itexi index 34f66a2..e36661d 100644 --- a/Documentation/included/compile.itexi +++ b/Documentation/included/compile.itexi @@ -1195,7 +1195,7 @@ We currently use make and stepmake, which is complicated and only used by us. Hopefully this will change in the future. address@hidden Version-specific texinfo macors address@hidden Version-specific texinfo macros @itemize diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi index 0bccb67..3d08c27 100644 --- a/Documentation/included/helpus.itexi +++ b/Documentation/included/helpus.itexi @@ -140,7 +140,7 @@ Website: GOP will be our big recruiting drive for new contributors. We desperately need to spread the development duties (including @qq{simple tasks} which require no programming or interaction with -soruce code!) over more people. We also need to document +source code!) over more people. We also need to document knowledge from existing developers so that it does not get lost. Unlike most @qq{Grand Projects}, GOP is not about adding huge new diff --git a/Documentation/learning.tely b/Documentation/learning.tely index 2e4c15c..653d0ee 100644 --- a/Documentation/learning.tely +++ b/Documentation/learning.tely @@ -44,7 +44,7 @@ Copyright @copyright{} 1999--2010 by the authors. @menu * Tutorial:: Basics of typesetting with LilyPond. -* Common notation:: Writing very commmon notation. +* Common notation:: Writing very common notation. * Fundamental concepts:: Basic concepts required for reading the rest of the manuals. * Tweaking output:: Introduction to modifying output. diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index 05169ca..10d0d8f 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -667,7 +667,7 @@ separately, like this: @cindex voices, naming @cindex voices crossing brackets @cindex slurs crossing brackets address@hidden ties crossing brackest address@hidden ties crossing brackets This example has just two voices, but the same construct may be used to encode three or more voices by adding more back-slash diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index b50bd41..daeb0d4 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -3178,7 +3178,7 @@ lhMusic = \relative c' { @end lilypond On to bar three and the start of the Moderato section. The tutorial -showed how to add embolded text with the @code{\markup} command, so +showed how to add bold text with the @code{\markup} command, so adding @qq{Moderato} in bold is easy. But how do we merge notes in different voices together? This is where we need to turn again to the Notation Reference for help. A search for @qq{merge} in the diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi index c177f7a..8031024 100644 --- a/Documentation/macros.itexi +++ b/Documentation/macros.itexi @@ -16,7 +16,7 @@ MACRO DEFINITIONS GUIDELINES **************************** -This file should contain macro defintions which are common to all +This file should contain macro definitions which are common to all languages, i.e. all macro definitions which do not contain text that should be translated (namely text visible in the output). diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely index 942ea60..ef649b2 100644 --- a/Documentation/music-glossary.tely +++ b/Documentation/music-glossary.tely @@ -1381,7 +1381,7 @@ FI: vaskisoitin. A family of blown musical instruments made of brass, all using a cup formed mouth piece. The brass instruments commonly used in a symphony -orchestra are trumpet, trombone, french horn, and tuba. In marching bands, +orchestra are trumpet, trombone, French horn, and tuba. In marching bands, sousaphones and contrabass bugles are common. @seealso @@ -2387,7 +2387,7 @@ the player or singer to manage line breaks during performance, which enhances the readability of a score. Custodes were frequently used in music notation until the 16th century. -There were different appearences for different notation styles. Nowadays, +There were different appearances for different notation styles. Nowadays, they have survived only in special forms of musical notation such as the @emph{Editio Vaticana}, dating from the beginning of the 20th century @@ -2563,7 +2563,7 @@ S: diatonisk skala, FI: diatoninen asteikko. A scale consisting of address@hidden }whole tones and address@hidden }semitones (S). Scales -played on the white keys of a piano keybord are diatonic. These scales +played on the white keys of a piano keyboard are diatonic. These scales are sometimes called, somewhat inaccurately, @q{church modes}). These @emph{modes} are used in Gregorian chant and in pre-baroque early music @@ -6088,7 +6088,7 @@ FI: lyömäsoittimet. A family of musical instruments which are played on by striking or shaking. Percussion instruments commonly used in a symphony orchestra are kettledrums (I: @emph{timpani}, D: @emph{Pauken}), snare drum, bass drum, -tambourine, cymbals, chinese gong (tam-tam), triangle, celesta, glockenspiel, +tambourine, cymbals, Chinese gong (tam-tam), triangle, celesta, glockenspiel, and xylophone. @seealso @@ -7206,7 +7206,7 @@ FI: sonaatti. In its present-day meaning a sonata denotes an instrumental composition for piano or for some other instrument with piano -accompaniment, which consists of three or four independant pieces, +accompaniment, which consists of three or four independent pieces, called movements. @seealso diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index bef2c78..a0dfd61 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -2320,7 +2320,7 @@ are collectively called @qq{spanners}, and have special properties to control their appearance and behaviour. Some of these properties are common to all spanners; others are restricted to a sub-set of the spanners. -All spanners support the @code{spanner-interface}. A few, esentially +All spanners support the @code{spanner-interface}. A few, essentially those that draw a straight line between the two objects, support in addition the @code{line-spanner-interface}. @@ -2448,7 +2448,7 @@ a \< a a a a \! a a a @end lilypond This property is not effective for all spanners. For example, -seting it to @code{#t} has no effect on slurs or phrasing slurs +setting it to @code{#t} has no effect on slurs or phrasing slurs or on other spanners for which terminating on the bar line would not be meaningful. diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely index 9ba5934..072aa2e 100644 --- a/Documentation/notation/expressive.itely +++ b/Documentation/notation/expressive.itely @@ -824,7 +824,7 @@ g4\( e c2\) @funindex phrasingSlurDashPattern @cindex phrasing slur, defining dash patterns @cindex slur, phrasing, defining dash patterns address@hidden slur, definind dash patterns for phrasing address@hidden slur, defining dash patterns for phrasing Custom dash patterns for phrasing slurs can be defined: diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index 598acba..2626c0c 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -634,7 +634,7 @@ can be changed in the fret-diagram markup string. >> @end lilypond -The number of strings in a fret diagram can be changed to accomodate +The number of strings in a fret diagram can be changed to accommodate different instruments such as banjos and ukuleles with the fret-diagram markup string. @@ -1154,13 +1154,13 @@ mychords = \chordmode { @cindex chord shapes for fretted instruments @funindex \addChordShape address@hidden add ChordShape address@hidden addChordShape @funindex storePredefinedDiagram @funindex \storePredefinedDiagram In addition to fret diagrams, LilyPond stores an internal list of chord shapes. The chord shapes are fret diagrams that can be shifted along -the neck to different posistions to provide different chords. Chord +the neck to different positions to provide different chords. Chord shapes can be added to the internal list and then used to define predefined fret diagrams. Because they can be moved to various positions on the neck, chord shapes will normally not contain @@ -1535,7 +1535,7 @@ music = \relative c' { >> @end lilypond -Another playing technique (especially used on electic guitars) is +Another playing technique (especially used on electric guitars) is called @notation{palm mute}. The string is hereby partly muted by the palm of the striking hand (hence the name). Lilypond supports the notation of palm mute-style notes by changing the note head to a diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index be06eec..15ad7b4 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -1540,7 +1540,7 @@ with the @code{\tempo} command within the music notation. These are reflected in tempo changes in the MIDI output. This command will normally result in the metronome mark being printed, but this can be suppressed, see @ref{Metronome marks}. An alternative way -of specifying the inital or overall MIDI tempo is described below, +of specifying the initial or overall MIDI tempo is described below, see @ref{MIDI block}. Due to some limitations on Windows, the default extension for diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely index 25f0d7d..b2989fa 100644 --- a/Documentation/notation/keyboards.itely +++ b/Documentation/notation/keyboards.itely @@ -592,7 +592,7 @@ Some common characteristics of harp music are covered elsewhere: @itemize address@hidden The glissando is the most characterisic harp technique, address@hidden The glissando is the most characteristic harp technique, @ref{Glissando}. @item A @notation{bisbigliando} is written as a tremelo @ref{Tremolo @@ -644,7 +644,7 @@ c!1_\markup { \harp-pedal #"^o--|vv-^" } The @code{\harp-pedal} command accepts a string of characters, where @code{^} is the highest pedal position (flattened pitch), @code{-} is -the middle pedal postion (natural pitch), @code{v} is the lowest pedal +the middle pedal position (natural pitch), @code{v} is the lowest pedal position (sharpened pitch), and @code{|} is the divider. A prefixed @code{o} will circle the following pedal symbol. diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely index 7c3a27b..dd26226 100644 --- a/Documentation/notation/percussion.itely +++ b/Documentation/notation/percussion.itely @@ -415,7 +415,7 @@ woodstaff = { % It also defines the positions of the two lines. \override Staff.StaffSymbol #'line-positions = #'(-2 3) - % This is neccessary; if not entered, the barline would be too short! + % This is necessary; if not entered, the barline would be too short! \override Staff.BarLine #'bar-size = #3 } diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index 84c3782..527eaa4 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -100,7 +100,7 @@ Snippets: @cindex relative octave entry @cindex octave entry, relative @cindex relative octave specification address@hidden ocatve specification, relative address@hidden octave specification, relative @funindex relative @funindex \relative diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely index 9248438..7ffba85 100644 --- a/Documentation/notation/repeats.itely +++ b/Documentation/notation/repeats.itely @@ -540,7 +540,7 @@ Internals Reference: This section discusses how to input short repeats. Short repeats can take two forms: slashes or percent signs to represent repeats of a -single note, a single measure or two measures, and tremelos otherwise. +single note, a single measure or two measures, and tremolos otherwise. @menu * Percent repeats:: diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 28c1dd8..5bd9010 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -304,7 +304,7 @@ command to avoid errors. @cindex tempo marks within tuplet brackets When using a tuplet at the beginning of a piece with a @code{\tempo} -mark, the music must be explicitely entered in a @code{\new Voice} +mark, the music must be explicitly entered in a @code{\new Voice} block, as discussed in @rlearning{Voices contain music}. @@ -894,7 +894,7 @@ setting, resulting bar-check warnings may not be displayed. @funindex \textLengthOn @funindex textLengthOn @funindex \textLengthOff address@hidden textLenthOff address@hidden textLengthOff @funindex \fermataMarkup @funindex fermataMarkup @funindex \compressFullBarRests diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely index 211d305..bbe2b7c 100644 --- a/Documentation/notation/simultaneous.itely +++ b/Documentation/notation/simultaneous.itely @@ -344,7 +344,7 @@ required to define the settings of each voice. The @code{<< @address@hidden \\ @address@hidden >>} construct, where the two (or more) expressions are separated by double backslashes, behaves differently to the similar construct without the double backslashes: address@hidden the expressions within this contruct are assigned address@hidden the expressions within this construct are assigned to new @code{Voice} contexts. These new @code{Voice} contexts are created implicitly and are given the fixed names @code{"1"}, @code{"2"}, etc. diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 90d7128..d8b2eb7 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -37,7 +37,7 @@ distance between staff lines accordingly." Actually I found, that the @internalsref{StaffSymbol} at line 481 -sends to an uncomplete +sends to an incomplete documentation. The property staff-space is not explained here. I thought Y-extent might be of help, but it is in turn explained by x-space which again is @@ -1090,7 +1090,7 @@ book parts. @} \paper @{ %% In a part consisting mostly of text, - %% ly:minimal-breaking may be prefered + %% ly:minimal-breaking may be preferred #(define page-breaking ly:minimal-breaking) @} \markup @{ @dots{} @} diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely index c622fb5..cdef0fd 100644 --- a/Documentation/notation/text.itely +++ b/Documentation/notation/text.itely @@ -1077,7 +1077,7 @@ Advanced graphic features include the ability to include external image files converted to the Encapsulated PostScript format (@emph{eps}), or to directly embed graphics into the input file, using native PostScript code. In such a case, it may be useful to -explicitely specify the size of the drawing, as demonstrated below: +explicitly specify the size of the drawing, as demonstrated below: @lilypond[quote,verbatim,relative=1] c1^\markup { diff --git a/Documentation/notation/unfretted-strings.itely b/Documentation/notation/unfretted-strings.itely index a9e6227..92d9173 100644 --- a/Documentation/notation/unfretted-strings.itely +++ b/Documentation/notation/unfretted-strings.itely @@ -168,7 +168,7 @@ A smaller circle may be created, see the snippet list in @address@hidden harmonics}} @cindex artificial harmonics address@hidden harmonics, artifical address@hidden harmonics, artificial Artificial harmonics are notated with two notes, one with a normal note head indicating the stopped position and one with an open diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index 974de3b..86a7111 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -104,7 +104,7 @@ Notation Reference: @unnumberedsubsubsec Spoken music @cindex parlato @cindex Sprechgesang -Such effects as @q{parlato} or @q{Sprechgesang} require perfomers to speak +Such effects as @q{parlato} or @q{Sprechgesang} require performers to speak without pitch but still with rhythm; these are notated by cross note heads, as demonstrated in @ref{Special note heads}. @@ -651,7 +651,7 @@ for every extra note that has to be added to the melisma. @c verbose! --FV @c duplicated: TODO fix -Additionaly, you can make an extender line to be typeset to indicate +Additionally, you can make an extender line to be typeset to indicate the melisma in the score, writing a double underscore next to the first syllable of the melisma. This example shows the three elements that are used for this purpose (all of them surrounded by spaces): diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely index 9603eb4..f7d6b8b 100644 --- a/Documentation/notation/wind.itely +++ b/Documentation/notation/wind.itely @@ -44,7 +44,7 @@ tonguing: @item Breathing can be specified by rests or @ref{Breath marks}. @item Legato playing is indicated by @ref{Slurs}. @item Different types of tonguings, ranging from legato to non-legato to -stacatto are usually shown by articulation marks, sometimes combined +staccato are usually shown by articulation marks, sometimes combined with slurs, see @ref{Articulations and ornamentations} and @ref{List of articulations}. @item Flutter tonguing is usually indicated by placing a tremolo mark @@ -55,7 +55,7 @@ There are also other aspects of musical notation that can apply to wind instruments: @itemize address@hidden Many wind instruments are transposing intruments, see address@hidden Many wind instruments are transposing instruments, see @ref{Instrument transpositions}. @item The slide glissando are characteristic of the trombone, but other winds may perform keyed or valved glissandi. See @ref{Glissando}. diff --git a/Documentation/snippets/README b/Documentation/snippets/README index 5810289..f91aacb 100644 --- a/Documentation/snippets/README +++ b/Documentation/snippets/README @@ -1,5 +1,5 @@ This directory contains examples generated automatically from LSR http://lsr.dsi.unimi.it/ -To update this directory and find addtional information, see +To update this directory and find additional information, see the Contributor's Guide, section "LSR to Git". diff --git a/Documentation/snippets/new/using-the-whiteout-property.ly b/Documentation/snippets/new/using-the-whiteout-property.ly index 46a5d57..ac9ca33 100644 --- a/Documentation/snippets/new/using-the-whiteout-property.ly +++ b/Documentation/snippets/new/using-the-whiteout-property.ly @@ -3,7 +3,7 @@ \header { lsrtags = "expressive-marks, editorial-annotations" texidoc = " -Any graphical object can be printed over a white backgound to +Any graphical object can be printed over a white background to mask parts of objects that lie beneath. This can be useful to improve the appearance of collisions in complex situations when repositioning objects is impractical. It is necessary to explicitly diff --git a/Documentation/usage/latex-lilypond-example.latex b/Documentation/usage/latex-lilypond-example.latex index dbb057d..bd278d3 100644 --- a/Documentation/usage/latex-lilypond-example.latex +++ b/Documentation/usage/latex-lilypond-example.latex @@ -116,7 +116,7 @@ c' e' \end{lilypond} has also the \verb|eps| options, but is not floating because there -are an emptry line before and after the lilypond block. That is +are an empty line before and after the lilypond block. That is correct behaviour because it follows La\TeX{} convention that an empty line signals a new paragraph. The \verb|eps| option is not necessary when you want the music in a paragraph on its own. diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely index eeba9e8..e6d8353 100644 --- a/Documentation/usage/running.itely +++ b/Documentation/usage/running.itely @@ -231,7 +231,7 @@ the output format to use for the back-end. Choices for @code{format} are @item eps address@hidden Postscript, encapulated address@hidden Postscript, encapsulated @cindex EPS (Encapsulated PostScript) for encapsulated PostScript. This dumps every page (system) as a separate diff --git a/Documentation/usage/suggestions.itely b/Documentation/usage/suggestions.itely index 8b79386..74833b6 100644 --- a/Documentation/usage/suggestions.itely +++ b/Documentation/usage/suggestions.itely @@ -284,7 +284,7 @@ The commands to define rules in a makefile differ according to platform; for instance the various forms of Linux and MacOS use @code{bash}, while Windows uses @code{cmd}. Note that on MacOS X, you need to configure the system to use the command-line -intepreter. Here are some example makefiles, with versions for both +interpreter. Here are some example makefiles, with versions for both Linux/MacOS and Windows. The first example is for an orchestral work in four diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi index a9ae0ed..d4772ef 100644 --- a/Documentation/web/community.itexi +++ b/Documentation/web/community.itexi @@ -111,7 +111,7 @@ send to lilypond-user with gmane} The LilyPond Snippet Repository is a large collection of user-submitted examples, which can freely be copied and used -in your owm works. See what other people have written, +in your own works. See what other people have written, and add your own! @example @@ -166,7 +166,7 @@ Spanish mailing list} German forum} @uref{http://groups.google.com/group/lilypond-brasil, -Portugese group} +Portuguese group} @uref{http://lists.gnu.org/mailman/listinfo/lilypond-user-fr, French mailing list} diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi index 07beba5..3dab2a8 100644 --- a/Documentation/web/download.itexi +++ b/Documentation/web/download.itexi @@ -21,7 +21,7 @@ our @ref{Text input}.} @divClass{heading-center} @ifclear web_version - @c yes, we want verisonDevel here, since the online links + @c yes, we want versionDevel here, since the online links @c for @version won't be up yet! @heading Downloads for LilyPond @versionDevel @@ -456,7 +456,7 @@ Locate the LilyPond folder from the @q{Start} menu and click on the has completed. @item -Or from witin the Control Panel,locate and select LilyPond and then +Or from within the Control Panel, locate and select LilyPond and then choose the option to uninstall/remove the software. Click the @q{Finish} button when the uninstaller has completed. @@ -514,9 +514,9 @@ and click @qq{OK} button to close the window. @end enumerate address@hidden Invoking individual excecutable files address@hidden Invoking individual executable files -LilyPond excecutable files +LilyPond executable files -- such as lilypond, lilypond-book, convert-ly, and so on -- can be run from the command-line by invoking them: -- 1.7.2.rc3.47.g996ce