From 18d03fa6a724b0102ccc47d194209802cea02f2e Mon Sep 17 00:00:00 2001 From: James Lowe Date: Sun, 5 Mar 2017 16:34:39 +0000 Subject: [PATCH] Doc - NR + CG: Clarify Emmentaler is the 'font' and Feta/Parmesan are glyphs Issue 4966 Distinguish between Emmentaler the 'font' and Feta/Parmesan glyphs that make up the Emmentaler font family. --- Documentation/ca/notation/rhythms.itely | 7 +-- Documentation/contributor.texi | 2 +- Documentation/contributor/feta-font.itexi | 43 +++++++++++-------- Documentation/de/notation/ancient.itely | 4 +- .../de/notation/changing-defaults.itely | 6 +-- Documentation/de/notation/input.itely | 6 +-- .../de/notation/notation-appendices.itely | 30 ++++++++++--- Documentation/de/notation/rhythms.itely | 4 +- Documentation/de/notation/spacing.itely | 2 +- Documentation/de/notation/text.itely | 10 ++--- Documentation/es/notation/ancient.itely | 4 +- .../es/notation/changing-defaults.itely | 6 +-- Documentation/es/notation/input.itely | 6 +-- .../es/notation/notation-appendices.itely | 36 +++++++++++----- Documentation/es/notation/rhythms.itely | 4 +- Documentation/es/notation/spacing.itely | 5 ++- Documentation/es/notation/text.itely | 8 ++-- Documentation/fr/notation/ancient.itely | 5 ++- .../fr/notation/changing-defaults.itely | 6 +-- Documentation/fr/notation/input.itely | 7 +-- .../fr/notation/notation-appendices.itely | 20 +++++---- Documentation/fr/notation/rhythms.itely | 4 +- Documentation/fr/notation/spacing.itely | 5 ++- Documentation/fr/notation/text.itely | 10 ++--- .../it/notation/changing-defaults.itely | 4 +- Documentation/it/notation/input.itely | 4 +- .../it/notation/notation-appendices.itely | 33 ++++++++++---- Documentation/it/notation/rhythms.itely | 4 +- Documentation/it/notation/spacing.itely | 3 +- Documentation/it/notation/text.itely | 8 ++-- .../ja/notation/changing-defaults.itely | 6 +-- Documentation/ja/notation/input.itely | 9 ++-- Documentation/ja/notation/rhythms.itely | 4 +- Documentation/ja/notation/spacing.itely | 5 ++- Documentation/ja/notation/text.itely | 8 ++-- Documentation/notation/ancient.itely | 6 ++- .../notation/changing-defaults.itely | 7 +-- Documentation/notation/input.itely | 12 ++++-- .../notation/notation-appendices.itely | 37 ++++++++++++---- Documentation/notation/rhythms.itely | 4 +- Documentation/notation/spacing.itely | 12 +++--- Documentation/notation/text.itely | 13 +++--- 42 files changed, 257 insertions(+), 162 deletions(-) diff --git a/Documentation/ca/notation/rhythms.itely b/Documentation/ca/notation/rhythms.itely index 9383da63d4..ca6ae390aa 100644 --- a/Documentation/ca/notation/rhythms.itely +++ b/Documentation/ca/notation/rhythms.itely @@ -3453,8 +3453,9 @@ element @code{\mark} @end lilypond @noindent -Consulteu @rusernamed{The Feta font,El tipus de lletra Feta} per veure -una llista dels símbols que es poden imprimir amb @code{\musicglyph}. +Consulteu @rusernamed{The Emmentaler font,El tipus de lletra Emmentaler} +per veure una llista dels símbols que es poden imprimir amb +@code{\musicglyph}. Per veure formes comuns d'ajustar la col·locació de les lletres d'assaig, consulteu @rusernamed{Formatting text,Donar format al @@ -3469,7 +3470,7 @@ per escriure altres funcions per donar format. @seealso Referència de la notació: -@rusernamed{The Feta font,El tipus de lletra Feta}, +@rusernamed{The Emmentaler font,El tipus de lletra Emmentaler}, @rusernamed{Formatting text,Donar format al text}, @rusernamed{Aligning objects,Alineació d'objectes}. diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi index ed1a1df7f1..77b562ee5a 100644 --- a/Documentation/contributor.texi +++ b/Documentation/contributor.texi @@ -66,7 +66,7 @@ Copyright @copyright{} 2007--2015 by the authors. * Programming work:: * Release work:: * Build system notes:: -* Modifying the feta font:: +* Modifying the Emmentaler font:: * Administrative policies:: Appendices diff --git a/Documentation/contributor/feta-font.itexi b/Documentation/contributor/feta-font.itexi index 002aa895a4..2181150545 100644 --- a/Documentation/contributor/feta-font.itexi +++ b/Documentation/contributor/feta-font.itexi @@ -1,9 +1,9 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@node Modifying the feta font -@chapter Modifying the feta font +@node Modifying the Emmentaler font +@chapter Modifying the Emmentaler font @menu -* Overview of the feta font:: +* Overview of the Emmentaler font:: * Font creation tools:: * Adding a new font section:: * Adding a new glyph:: @@ -11,33 +11,35 @@ * METAFONT formatting rules:: @end menu -@node Overview of the feta font -@section Overview of the feta font +@node Overview of the Emmentaler font +@section Overview of the Emmentaler font -The feta font is a font that was created specifically for use in -LilyPond. The sources for the font are found in mf/*.mf. +Emmentaler was created specifically for use in LilyPond. The font +consists of two @emph{sub-sets} of glyphs. @qq{Feta}, used for clasical +notation and @qq{Parmesan}, used for Ancient notation. The sources of +which are all found in mf/*.mf. -The feta font is merged from a number of subfonts. Each subfont -can contain at most 224 glyphs. This is because each subfont is -limited to a one-byte address space (256 glyphs maximum) and we -avoid the first 32 points in that address space, since they are -non-printing control characters in ASCII. +The ont is merged from a number of subfonts. Each subfont can contain +at most 224 glyphs. This is because each subfont is limited to a +one-byte address space (256 glyphs maximum) and we avoid the first 32 +points in that address space, since they are non-printing control +characters in ASCII. -In LilyPond, glyphs are accessed by glyph name, rather than by code point. -Therefore, the naming of glyphs is significant. +In LilyPond, glyphs are accessed by a @q{glyph name}, rather than by +code point. Therefore, the name of a glyph is significant. Information about correctly creating glyphs is found in @file{mf/README}. Please make sure you read and understand this file. -TODO -- we should get mf/README automatically generated from texinfo source -and include it here. +TODO -- we should get mf/README automatically generated from texinfo +source and include it here. @node Font creation tools @section Font creation tools -The sources for the feta font are written in metafont. The definitive -reference for metafont is "The METAFONT book". Source for the book is +The sources for Emmentaler are written in metafont. The definitive +reference for metafont is "The METAFONT book" -- the source of which is available at CTAN. mf2pt1 is used to create type 1 fonts from the metafont sources. @@ -46,6 +48,7 @@ FontForge is used to postprocess the output of mf2pt1 and clean up details of the font. It can also be used by a developer to display the resulting glyph shapes. + @node Adding a new font section @section Adding a new font section @@ -74,6 +77,7 @@ An entry in @file{scripts/build/gen-emmentaler-scripts.py} See the examples in @code{mf/} for more information. + @node Adding a new glyph @section Adding a new glyph @@ -101,6 +105,7 @@ entry. The glyph is finished with: fet_endchar; @end example + @node Building the changed font @section Building the changed font @@ -113,6 +118,7 @@ rm mf/out/* make @end example + @node METAFONT formatting rules @section METAFONT formatting rules @@ -137,4 +143,3 @@ def draw_something (test) = ------->fi; enddef; @end example - diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely index 44990fd0f5..d9ae6c8247 100644 --- a/Documentation/de/notation/ancient.itely +++ b/Documentation/de/notation/ancient.itely @@ -2663,7 +2663,7 @@ Glossar: Notationsreferenz: @ref{Versetzungszeichen}, @ref{Automatische Versetzungszeichen}, -@ref{Die Feta-Schriftart} +@ref{Die Emmentaler-Schriftart}. @node Kiever Taktstriche @unnumberedsubsubsec Kiever Taktstriche @@ -2681,7 +2681,7 @@ Schlussstrich bezeichnen kann. Es wird gesetzt mit @code{\bar "k"}. @seealso @ref{Takte}, -@ref{Die Feta-Schriftart} +@ref{Die Emmentaler-Schriftart} @c Working with ancient music: scenarios and solutions:: {{{1 @node Musiksatz Alter Musik in der Praxis -- Szenarien und Lösungen diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely index 70950526ff..61959ce946 100644 --- a/Documentation/de/notation/changing-defaults.itely +++ b/Documentation/de/notation/changing-defaults.itely @@ -4060,16 +4060,16 @@ XinO = { } @end lilypond -Alle Schriftzeichen in der feta-Schriftart können +Alle Schriftzeichen in der Feta-Glyphe können mit dem @code{\musicglyph}-Befehl erreicht werden. -Siehe auch @ref{Die Feta-Schriftart}. +Siehe auch @ref{Die Emmentaler-Schriftart}. @seealso Notationsreferenz: @ref{Graphische Notation innerhalb einer Textbeschriftung}, @ref{Text formatieren}, @ref{Textbeschriftungsbefehle}, -@ref{Die Feta-Schriftart}. +@ref{Die Emmentaler-Schriftart}. diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely index 7721d3019a..84abdec71e 100644 --- a/Documentation/de/notation/input.itely +++ b/Documentation/de/notation/input.itely @@ -2473,8 +2473,8 @@ Kommandozeile. Siehe @rprogram{Grundlegende Optionen auf der Kommandozeile für @subsection Die Notationsschriftart verändern @translationof Replacing the notation font -Gonville ist eine Alternative zu der Feta-Schriftart, die in LilyPond -eingesetzt wird und kann unter der Adresse +Gonville ist eine Alternative zu der Emmentaler-Schriftart, die in +LilyPond eingesetzt wird und kann unter der Adresse @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @end example @@ -2486,7 +2486,7 @@ heruntergeladen werden. Hier einige Takte Noten mit der Gonville-Schriftart: @c for the font comparison. -gp @sourceimage{Gonville_after,,,} -Und hier einige Beispieltakte in der Feta-Schriftart: +Und hier einige Beispieltakte in der Feta-Glyphe: @sourceimage{Gonville_before,,,} diff --git a/Documentation/de/notation/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely index a0e4c30173..a218f519d5 100644 --- a/Documentation/de/notation/notation-appendices.itely +++ b/Documentation/de/notation/notation-appendices.itely @@ -24,7 +24,7 @@ * Vordefinierte Papierformate:: * MIDI-Instrumente:: * Liste der Farben:: -* Die Feta-Schriftart:: +* Die Emmentaler-Schriftart:: * Notenkopfstile:: * Textbeschriftungsbefehle:: * Textbeschriftungslistenbefehle:: @@ -868,18 +868,34 @@ greyN erstellt werden, wobei N eine Zahl von 0--100 darstellt. -@node Die Feta-Schriftart -@appendixsec Die Feta-Schriftart -@translationof The Feta font +@node Die Emmentaler-Schriftart +@appendixsec Die Emmentaler-Schriftart +@translationof The Emmentaler font +@cindex Emmentaler font +@cindex Font, Emmentaler @cindex Feta font @cindex Font, Feta +@cindex Parmesan font +@cindex Font, Parmesan Die folgenden Symbole sind als Emmentaler-Schriftart verfügbar; auf sie kann direkt zugegriffen werden, indem man die übliche Textbeschriftung benutzt. @code{\musicglyph} greift direkt auf die Notationsschriftart -zu (bspw. @code{g^\markup @{ -\musicglyph #"scripts.segno" @}}). Siehe auch @ref{Text formatieren}. +zu + +@example +g^\markup @{\musicglyph #"scripts.segno" @} +@end example + +@noindent +or + +@example +\markup @{\musicglyph #"five"@}. +@end example + +Siehe auch @ref{Text formatieren}. @menu * Notenschlüssel-Glyphen:: @@ -1273,7 +1289,7 @@ Lesbarkeit eingefügt. @cindex Semicirculus @cindex signum congruentiae -Die Skripte unten sind in der Feta-Schriftart definiert und können +Die Skripte unten sind in der Feta-Glyphe definiert und können an Noten angehängt werden (etwa @samp{c\accent}). @menu diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 0e63af4282..dbbac4d75a 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -3272,7 +3272,7 @@ Musikbuchstaben (wie etwa das Segno-Zeichen) können mit dem Befehl @end lilypond @noindent -Siehe @ref{Die Feta-Schriftart}, wo alle Symbole gezeigt sind, die +Siehe @ref{Die Emmentaler-Schriftart}, wo alle Symbole gezeigt sind, die mit dem Befehl @code{\musicglyph} ausgegeben werden können. Übliche Veränderungen der Positionierung von Übungszeichen finden @@ -3285,7 +3285,7 @@ können als Anregung für andere Formatierungsfunktionen genommen werden. @seealso Notationsreferenz: -@ref{Die Feta-Schriftart}, +@ref{Die Emmentaler-Schriftart}, @ref{Text formatieren}, @ref{Objekte ausrichten}. diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely index 67f8b0ab7d..ec59eaa6eb 100644 --- a/Documentation/de/notation/spacing.itely +++ b/Documentation/de/notation/spacing.itely @@ -1258,7 +1258,7 @@ muss @noindent eingesetzt werden. -Die Feta-Schriftart stellt die Noten- und Musiksymbole +Die Feta-Glyphe stellt die Noten- und Musiksymbole für acht verschiedene Größen zur Verfügung. Jede Schriftgröße ist einer bestimmten Systemgröße angepasst: für kleinere Schriftgrößen werden die Zeichen etwas diff --git a/Documentation/de/notation/text.itely b/Documentation/de/notation/text.itely index ef12e4bb0d..ba1860457a 100644 --- a/Documentation/de/notation/text.itely +++ b/Documentation/de/notation/text.itely @@ -323,7 +323,7 @@ Notationsreferenz: @ref{Übungszeichen}, @ref{Text formatieren}, @ref{Musikalische Notation innerhalb einer Textbeschriftung}, -@ref{Die Feta-Schriftart}. +@ref{Die Emmentaler-Schriftart}. Schnipsel: @rlsr{Text}. @@ -1275,7 +1275,7 @@ d-\markup { Allgemeiner gesagt kann jedes verfügbare Notationssymbol unabhängig von der Notation als ein Textbeschriftungsobjekt eingefügt werden, wie unten gezeigt. Eine vollständige Liste der verfügbaren Symbole findet -sich in @ref{Die Feta-Schriftart}. +sich in @ref{Die Emmentaler-Schriftart}. @lilypond[quote,verbatim] \relative { @@ -1348,7 +1348,7 @@ Eine vollständige Liste der Musiksymbol-Befehle findet sich in @ref{Music}. @seealso Notationsreferenz: @ref{Music}, -@ref{Die Feta-Schriftart}, +@ref{Die Emmentaler-Schriftart}, @ref{Was sind Schriftarten}. Installierte Dateien: @@ -1465,7 +1465,7 @@ Notationsschriftarten können als eine Ansammlung von besonderen Zeichen erklärt werden, wobei die Sonderzeichen in verschiedene Familien klassifiziert werden. Die Syntax des folgenden Beispiels ermöglicht es, direkt auf verschiedene nicht textuelle Sonderzeichen der -@code{feta}-Schriftart zuzugreifen. Das ist die Standardschriftart +@code{feta}-Glyphe zuzugreifen. Das ist die Standardschriftart für Notationselemente in LilyPond. @lilypond[quote,verbatim,fragment] @@ -1559,7 +1559,7 @@ in folgenden Abschnitten: @ref{Schriftarten für einen Eintrag} und @seealso Notationsreferenz: -@ref{Die Feta-Schriftart}, +@ref{Die Emmentaler-Schriftart}, @ref{Drehen von Objekten}, @ref{Musikalische Notation innerhalb einer Textbeschriftung}, @ref{Überblick über die wichtigsten Textbeschriftungsbefehle}, diff --git a/Documentation/es/notation/ancient.itely b/Documentation/es/notation/ancient.itely index f1f10c14e5..a07ffd8447 100644 --- a/Documentation/es/notation/ancient.itely +++ b/Documentation/es/notation/ancient.itely @@ -2620,7 +2620,7 @@ Glosario musical: Referencia de la notación: @ref{Alteraciones accidentales}, @ref{Alteraciones accidentales automáticas}, -@ref{La tipografía Feta}. +@ref{La tipografía Emmentaler}. @node Líneas divisorias del canto kievano @unnumberedsubsubsec Líneas divisorias del canto kievano @@ -2638,7 +2638,7 @@ del canto kievano». Se puede invocar como @code{\bar "k"}. @seealso @ref{Barras de compás}, -@ref{La tipografía Feta}. +@ref{La tipografía Emmentaler}. @node Melismas del canto kievano @unnumberedsubsubsec Melismas del canto kievano diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely index 62aaf8785f..ecb23133a6 100644 --- a/Documentation/es/notation/changing-defaults.itely +++ b/Documentation/es/notation/changing-defaults.itely @@ -4411,9 +4411,9 @@ XinO = { } @end lilypond -Cualquiera de los glifos de la fuente tipográfica Feta se puede +Cualquiera de los glifos de la fuente tipográfica Emmentaler se puede pasar a la instrucción de marcado @code{\musicglyph}: véase -@ref{La tipografía Feta}. +@ref{La tipografía Emmentaler}. Se pueden insertar en línea tanto imágenes en formato @file{EPS} como instrucciones de Postscript usando las instrucciones de @@ -4426,7 +4426,7 @@ Referencia de la notación: @ref{Notación gráfica dentro de elementos de marcado}, @ref{Formatear el texto}, @ref{Text markup commands}, -@ref{La tipografía Feta}, +@ref{La tipografía Emmentaler}, @ref{Graphic}. diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely index 88e9d7600f..8a7b551dda 100644 --- a/Documentation/es/notation/input.itely +++ b/Documentation/es/notation/input.itely @@ -2992,7 +2992,7 @@ también están disponibles a través de opciones de la línea de @subsection Sustituir la tipografía de la notación @translationof Replacing the notation font -Gonville es una alternativa a la tipografía Feta que se utiliza +Gonville es una alternativa a la tipografía Emmentaler que se utiliza en LilyPond y se puede descargar de: @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @@ -3005,7 +3005,7 @@ fuente Gonville: @c for the font comparison. -gp @sourceimage{Gonville_after,15cm,,} -Aquí hay unos compases de muestra tipografiados en la fuente Feta +Aquí hay unos compases de muestra tipografiados en el glifos Feta de LilyPond: @sourceimage{Gonville_before,15cm,,} @@ -3017,7 +3017,7 @@ Descargue y extraiga el archivo zip. Copie la carpeta más información, consulte @rlearning{Otras fuentes de información}. Renombre la carpeta @code{fonts} existente a @code{fonts_orig} y la carpeta @code{lilyfonts} a @code{fonts}. -Para volver a la fuente Feta, invierta el proceso. +Para volver a la fuente Emmentaler, invierta el proceso. @seealso Manual de aprendizaje: diff --git a/Documentation/es/notation/notation-appendices.itely b/Documentation/es/notation/notation-appendices.itely index cd96f25151..cc095bc2c4 100644 --- a/Documentation/es/notation/notation-appendices.itely +++ b/Documentation/es/notation/notation-appendices.itely @@ -22,7 +22,7 @@ * Tamaños de página predefinidos:: * Instrumentos MIDI:: * Lista de colores:: -* La tipografía Feta:: +* La tipografía Emmentaler:: * Estilos de cabezas de nota:: * Estilos de clave:: * Instrucciones de marcado de texto:: @@ -952,20 +952,34 @@ greyN donde N es un número entre 0 y 100. -@node La tipografía Feta -@appendixsec La tipografía Feta -@translationof The Feta font +@node La tipografía Emmentaler +@appendixsec La tipografía Emmentaler +@translationof The Emmentaler font -@cindex Feta, tipografía -@cindex tipografía Feta +@cindex Emmentaler tipografía +@cindex tipografía, Emmentaler +@cindex Feta tipografía +@cindex tipografía, Feta +@cindex Parmesan tipografía +@cindex tipografía, Parmesan Los símbolos siguientes están disponibles en la tipografía Emmentaler y es posible acceder a ellos directamente utilizando elementos de marcado textual con el nombre del glifo tal y como se -muestra en las tablas de abajo, por ejemplo @code{g^\markup -@{\musicglyph #"scripts.segno" @}} ó @code{\markup @{\musicglyph -#"five"@}}. Para ver más información, consulte @ref{Formatear el -texto}. +muestra en las tablas de abajo, por ejemplo; + +@example +g^\markup @{\musicglyph #"scripts.segno" @} +@end example + +@noindent +or + +@example +\markup @{\musicglyph #"five"@}. +@end example + +Para ver más información, consulte @ref{Formatear el texto}. @menu * Glifos de clave:: @@ -1561,7 +1575,7 @@ legibilidad. Las listas siguientes relacionan todos los símbolos de la -tipografía Feta que se pueden adjuntar a las notas +tipografía Emmentaler que se pueden adjuntar a las notas (p. ej. @samp{f\accent} o @samp{f->}). Cada ejemplo muestra el símbolo en las posiciones @emph{superior}, @emph{inferior} y @emph{neutra}, respectivamente. diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index 4bcf40ae9a..ee753a64a6 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -3479,7 +3479,7 @@ un elemento @code{\mark} @end lilypond @noindent -Consulte @ref{La tipografía Feta} para ver una lista de los +Consulte @ref{La tipografía Emmentaler} para ver una lista de los símbolos que se pueden imprimir con @code{\musicglyph}. Para ver formas comunes de trucar la colocación de las letras de @@ -3494,7 +3494,7 @@ para escribir otras funciones de formateo. @seealso Referencia de la notación: -@ref{La tipografía Feta}, +@ref{La tipografía Emmentaler}, @ref{Formatear el texto}, @ref{Alineación de objetos}. diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely index cb44a81ee6..c5012d31a3 100644 --- a/Documentation/es/notation/spacing.itely +++ b/Documentation/es/notation/spacing.itely @@ -1485,7 +1485,7 @@ evitar reducir el grosor de las líneas del pentagrama. @subheading Peso automático de la tipografía a distintos tamaños -La fuente tipográfica Feta ofrece símbolos musicales a ocho +La fuente tipográfica Emmentaler ofrece símbolos musicales a ocho tamaños distintos. Cada fuente tipográfica está afinada para un tamaño de pentagrama distinto: a un tamaño menor la tipografía se vuelve más pesada, para que coincida con las líneas de pentagrama @@ -1507,7 +1507,8 @@ están relacionados en la tabla siguiente: @seealso Referencia de la notación: -@ref{Seleccionar el tamaño de la tipografía para la notación}. +@ref{Seleccionar el tamaño de la tipografía para la notación}, +@ref{La tipografía Emmentaler}. Fragmentos de código: @rlsr{Spacing}. diff --git a/Documentation/es/notation/text.itely b/Documentation/es/notation/text.itely index 20b95b4cb0..700cb4d963 100644 --- a/Documentation/es/notation/text.itely +++ b/Documentation/es/notation/text.itely @@ -321,7 +321,7 @@ Referencia de la notación: @ref{Llamadas de ensayo}, @ref{Formatear el texto}, @ref{Notación musical dentro de elementos de marcado}, -@ref{La tipografía Feta}. +@ref{La tipografía Emmentaler}. Fragmentos de código: @rlsr{Text}. @@ -1229,7 +1229,7 @@ marcado: De forma más general, cualquier símbolo musical disponible se puede incluir por separado dentro de un objeto de marcado, como se ejemplifica a continuación; hay una lista exhaustiva de estos -símbolos y sus nombres en @ref{La tipografía Feta}. +símbolos y sus nombres en @ref{La tipografía Emmentaler}. @lilypond[quote,verbatim] \relative { @@ -1300,7 +1300,7 @@ notación musical en @ref{Music}. @seealso Referencia de la notación: @ref{Music}, -@ref{La tipografía Feta}, +@ref{La tipografía Emmentaler}, @ref{Explicación de las fuentes tipográficas}. Archivos de inicio: @@ -1517,7 +1517,7 @@ explica en las siguientes secciones: @seealso Referencia de la notación: -@ref{La tipografía Feta}, +@ref{La tipografía Emmentaler}, @ref{Notación musical dentro de elementos de marcado}, @ref{Rotación de objetos}, @ref{Seleccionar la tipografía y su tamaño}, diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely index a21092a714..b8ff2928e1 100644 --- a/Documentation/fr/notation/ancient.itely +++ b/Documentation/fr/notation/ancient.itely @@ -2594,7 +2594,7 @@ Glossaire musicologique : Manuel de notation : @ref{Altérations}, @ref{Altérations accidentelles automatiques}, -@ref{La fonte Feta} +@ref{La fonte Emmentaler}. @node Barre de mesure kiévienne @@ -2612,8 +2612,9 @@ d'un @code{\bar "k"}. @end lilypond @seealso +Manuel de notation : @ref{Barres de mesure}, -@ref{La fonte Feta} +@ref{La fonte Emmentaler}. @node Mélismes kiéviens @unnumberedsubsubsec Mélismes kiéviens diff --git a/Documentation/fr/notation/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely index 9e42db3b0c..cf4c2292dc 100644 --- a/Documentation/fr/notation/changing-defaults.itely +++ b/Documentation/fr/notation/changing-defaults.itely @@ -4856,9 +4856,9 @@ XinO = { } @end lilypond -Tous les glyphes de la fonte Feta sont accessibles à l'aide de la +Tous les glyphes de la fonte Emmentaler sont accessibles à l'aide de la commande de @emph{markup} @code{\musicglyph} -- voir -@ref{La fonte Feta}. +@ref{La fonte Emmentaler}. L'insertion de fichier @file{EPS} ou d'instructions Postscript sont accessibles par les commandes de @emph{markup} @code{\epsfile} et @@ -4870,7 +4870,7 @@ Manuel de notation : @ref{Commandes pour markup}, @ref{Éléments graphiques dans du texte formaté}, @rusernamed{Graphic, Graphisme}, -@ref{La fonte Feta}, +@ref{La fonte Emmentaler}, @ref{Mise en forme du texte}. diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely index 50d2d72ccc..4789c89a31 100644 --- a/Documentation/fr/notation/input.itely +++ b/Documentation/fr/notation/input.itely @@ -2949,8 +2949,8 @@ commande avec l'option @i{ad hoc} -- voir @subsection Changement des fontes musicales @translationof Replacing the notation font -Gonville est une alternative à la fonte Feta que LilyPond utilise par -défaut. Vous pouvez la télécharger à partir de +Gonville est une alternative à la fonte Emmentaler que LilyPond utilise +par défaut. Vous pouvez la télécharger à partir de @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @end example @@ -2974,7 +2974,8 @@ Téléchargez puis décompressez l'archive zip. Recopiez le répertoire @rlearning{Autres sources de documentation} à ce sujet. Renommez le répertoire @code{fonts} qui s'y trouve en @code{fonts_orig}, puis le répertoire @code{lilyfonts} en @code{fonts}. Il vous suffira, pour -retrouver la fonte Feta, de renommer @code{fonts_orig} en @code{fonts}. +retrouver la fonte Emmentaler, de renommer @code{fonts_orig} en +@code{fonts}. @seealso Manuel d'initiation : diff --git a/Documentation/fr/notation/notation-appendices.itely b/Documentation/fr/notation/notation-appendices.itely index c0b513a25a..baf8dca026 100644 --- a/Documentation/fr/notation/notation-appendices.itely +++ b/Documentation/fr/notation/notation-appendices.itely @@ -24,7 +24,7 @@ * Formats de papier prédéfinis:: * Instruments MIDI:: * Liste des couleurs:: -* La fonte Feta:: +* La fonte Emmentaler:: * Styles de tête de note:: * Styles de clef:: * Commandes pour markup:: @@ -962,12 +962,16 @@ greyN où @var{N} est compris entre 0 et 100. -@node La fonte Feta -@appendixsec La fonte Feta -@translationof The Feta font +@node La fonte Emmentaler +@appendixsec La fonte Emmentaler +@translationof The Emmentaler font -@cindex Feta, fonte -@cindex fonte Feta +@cindex Emmentaler fonte +@cindex Fonte, Emmentaler +@cindex Feta fonte +@cindex Fonte, Feta +@cindex Parmesan font +@cindex Fonte, Parmesan Voici, regroupés par type, les différents symboles de la fonte Emmentaler qui peuvent s'inclure directement dans un objet @@ -1569,8 +1573,8 @@ décoller de l'encadrement. @appendixsec Liste des signes d'articulation @translationof List of articulations -Les listes qui suivent recensent les symboles prédéfinis dans la -fonte Feta que vous pouvez attacher à une note (par ex. @code{f\accent} +Les listes qui suivent recensent les symboles prédéfinis dans le +glyphe Feta que vous pouvez attacher à une note (par ex. @code{f\accent} ou @code{f->}). Chaque exemple illustre les trois positionnements : en surplomb (@emph{up}), en dessous (@emph{down}) et à l'appréciation de LilyPond (@emph{neutral}). diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index ee91782d39..5dd568a142 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -3411,7 +3411,7 @@ Un @code{\mark} peut contenir un glyphe musical tel que le signe @noindent Pour connaître les différents symboles accessibles par -@code{\musicglyph}, consultez @ref{La fonte Feta}. +@code{\musicglyph}, consultez @ref{La fonte Emmentaler}. Pour affiner le positionnement des repères, veuillez vous référer à @ref{Mise en forme du texte}, et tout particulièrement ce qui concerne @@ -3426,7 +3426,7 @@ formatage. @seealso Manuel de notation : @ref{Alignement des objets}, -@ref{La fonte Feta}, +@ref{La fonte Emmentaler}, @ref{Mise en forme du texte}. Fichiers d'initialisation : diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely index 210be80f32..6ac23b5f43 100644 --- a/Documentation/fr/notation/spacing.itely +++ b/Documentation/fr/notation/spacing.itely @@ -1467,7 +1467,7 @@ traditionnelle. @subheading Relation automatique entre fonte et taille @c VO Automatic font weight at different sizes -La fonte Feta fournit les symboles musicaux dans huit tailles +Le glyphe Feta fournit les symboles musicaux dans huit tailles différentes. Chaque fonte correspond à une hauteur particulière de portée ; les petites tailles comportent des symboles plus épais pour être cohérent avec l'épaisseur relativement plus importante des @@ -1490,7 +1490,8 @@ tailles de police. @seealso Manuel de notation : -@ref{Indication de la taille de fonte musicale}. +@ref{Indication de la taille de fonte musicale}, +@ref{La fonte Emmentaler}. Morceaux choisis : @rlsrnamed{Spacing,Espacements}. diff --git a/Documentation/fr/notation/text.itely b/Documentation/fr/notation/text.itely index 87bb956de3..624d5bd486 100644 --- a/Documentation/fr/notation/text.itely +++ b/Documentation/fr/notation/text.itely @@ -318,7 +318,7 @@ de la ligne suivante. @seealso Manuel de notation : @ref{Indications de repère}, -@ref{La fonte Feta}, +@ref{La fonte Emmentaler}, @ref{Mise en forme du texte}, @ref{Notation musicale dans du texte formaté}. @@ -1229,7 +1229,7 @@ notation : En règle générale, tout symbole musical peut être inclus dans un @emph{markup}, comme le montre l'exemple qui suit. Ces différents -symboles sont répertoriés dans l'annexe @ref{La fonte Feta}. +symboles sont répertoriés dans l'annexe @ref{La fonte Emmentaler}. @lilypond[quote,verbatim] \relative { @@ -1299,7 +1299,7 @@ sont répertoriées à l'annexe @ref{Music}. @seealso Manuel de notation : -@ref{La fonte Feta}, +@ref{La fonte Emmentaler}, @rusernamed{Music,Musique}, @ref{Tout savoir sur les fontes}. @@ -1419,7 +1419,7 @@ particulièrement de leur rendu. Les fontes musicales peuvent se décrire comme un jeu de glyphes spécifiques regroupés dans plusieurs familles. L'exemple qui suit montre la syntaxe à utiliser pour accéder, en mode @emph{markup}, aux -différentes fontes @code{feta} non textuelles de LilyPond. +différentes glyphes @code{feta} non textuelles de LilyPond. @lilypond[quote,verbatim,fragment] a'1^\markup { @@ -1515,7 +1515,7 @@ et @ref{Choix des fontes par défaut}. @seealso Manuel de notation : -@ref{La fonte Feta}, +@ref{La fonte Emmentaler}, @ref{Notation musicale dans du texte formaté}, @ref{Rotation des objets}, @ref{Sélection de la fonte et de la taille}, diff --git a/Documentation/it/notation/changing-defaults.itely b/Documentation/it/notation/changing-defaults.itely index deaba969cc..a58ec7cd52 100644 --- a/Documentation/it/notation/changing-defaults.itely +++ b/Documentation/it/notation/changing-defaults.itely @@ -3989,7 +3989,7 @@ XinO = { @end lilypond Qualsiasi glifo del tipo di carattere Feta può essere passato al comando -markup @code{\musicglyph} -- vedi @ref{The Feta font}. +markup @code{\musicglyph} -- vedi @ref{The Emmentaler font}. I file @file{EPS} e i comandi Postscript possono essere inseriti entrambi nel @c traduzione libera di "inline" @@ -4002,7 +4002,7 @@ Guida alla notazione: @ref{Graphic notation inside markup}, @ref{Formatting text}, @ref{Text markup commands}, -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Graphic}. diff --git a/Documentation/it/notation/input.itely b/Documentation/it/notation/input.itely index 1728bdaef0..97a9cb2cb4 100644 --- a/Documentation/it/notation/input.itely +++ b/Documentation/it/notation/input.itely @@ -2858,8 +2858,8 @@ vedi @rprogram{Opzioni di base della linea di comando per LilyPond}. @subsection Cambiare il tipo di carattere della notazione @translationof Replacing the notation font -Gonville è un'alternativa al tipo di carattere Feta usato da LilyPond e può -essere scaricato da: +Gonville è un'alternativa al tipo di carattere Emmentaler usato da +LilyPond e può essere scaricato da: @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @end example diff --git a/Documentation/it/notation/notation-appendices.itely b/Documentation/it/notation/notation-appendices.itely index 87aaf65244..1d18680783 100644 --- a/Documentation/it/notation/notation-appendices.itely +++ b/Documentation/it/notation/notation-appendices.itely @@ -22,7 +22,7 @@ * Formati carta predefiniti:: * Strumenti MIDI:: * Elenco dei colori:: -* Il tipo di carattere Feta:: +* Il tipo di carattere Emmentaler:: * Stili delle teste di nota:: * Stili della chiave:: * Comandi per markup:: @@ -950,19 +950,36 @@ greyN dove N è un numero compreso tra 0 e 100. -@node Il tipo di carattere Feta -@appendixsec Il tipo di carattere Feta -@translationof The Feta font +@node Il tipo di carattere Emmentaler +@appendixsec Il tipo di carattere Emmentaler +@translationof The Emmentaler font + +@cindex Emmentaler tipo di carattere +@cindex tipo di carattere, Emmentaler +@cindex Feta tipo di carattere +@cindex tipo di carattere, Feta +@cindex Parmesan tipo di carattere +@cindex tipo di carattere, Parmesan @cindex tipo di carattere Feta @cindex Feta, tipo di carattere I simboli seguenti sono disponibili nel tipo di carattere Emmentaler e si possono utilizzare all'interno di un comando @code{\markup} specificando -il nome del glifo, come mostrato nelle seguenti tabelle, per esempio -@code{g^\markup @{\musicglyph #"scripts.segno" @}} o -@code{\markup @{\musicglyph #"five"@}}. Maggiori informazioni in -@ref{Formatting text}. +il nome del glifo, come mostrato nelle seguenti tabelle, per esempio; + +@example +g^\markup @{\musicglyph #"scripts.segno" @} +@end example + +@noindent +or + +@example +\markup @{\musicglyph #"five"@}. +@end example + +Maggiori informazioni in @ref{Formatting text}. @menu diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely index 0efe7b4a69..4632210584 100644 --- a/Documentation/it/notation/rhythms.itely +++ b/Documentation/it/notation/rhythms.itely @@ -3347,7 +3347,7 @@ comando @code{\mark} @noindent L'elenco dei simboli che possono essere prodotti con @code{\musicglyph} si -trova in @ref{The Feta font}. +trova in @ref{The Emmentaler font}. Per le più comuni modifiche relative al posizionamento dei segni di chiamata, si veda @ref{Formatting text}. Per ottenere un controllo più preciso si consiglia @@ -3361,7 +3361,7 @@ ispirazione per creare altre funzioni di formattazione. @seealso Guida alla notazione: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Formatting text}, @ref{Aligning objects}. diff --git a/Documentation/it/notation/spacing.itely b/Documentation/it/notation/spacing.itely index 05ff414c58..d34ff282cd 100644 --- a/Documentation/it/notation/spacing.itely +++ b/Documentation/it/notation/spacing.itely @@ -1419,7 +1419,8 @@ seguente tabella: @seealso Guida alla notazione: -@ref{Selecting notation font size}. +@ref{Selecting notation font size}, +@ref{The Emmentaler font}. Frammenti: @rlsr{Spacing}. diff --git a/Documentation/it/notation/text.itely b/Documentation/it/notation/text.itely index cd7da2ffa3..1dceed2510 100644 --- a/Documentation/it/notation/text.itely +++ b/Documentation/it/notation/text.itely @@ -308,7 +308,7 @@ Guida alla notazione: @ref{Rehearsal marks}, @ref{Formatting text}, @ref{Music notation inside markup}, -@ref{The Feta font}. +@ref{The Emmentaler font}. Frammenti: @rlsr{Text}. @@ -1192,7 +1192,7 @@ modalità markup: Più in generale, qualsiasi simbolo musicale disponibile può essere incluso separatamente in un oggetto markup, come è illustrato sotto. Una lista completa di questi simboli e dei loro nomi si trova in -@ref{The Feta font}. +@ref{The Emmentaler font}. @lilypond[quote,verbatim] \relative { @@ -1261,7 +1261,7 @@ in @ref{Music}. @seealso Guida alla notazione: @ref{Music}, -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Fonts explained}. File installati: @@ -1464,7 +1464,7 @@ possibile usare altri tipi, come viene spiegato nelle sezioni successive: @seealso Guida alla notazione: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Music notation inside markup}, @ref{Rotating objects}, @ref{Selecting font and font size}, diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely index 537877abae..ad5d5affcb 100644 --- a/Documentation/ja/notation/changing-defaults.itely +++ b/Documentation/ja/notation/changing-defaults.itely @@ -4214,8 +4214,8 @@ XinO = { @end lilypond @code{\musicglyph} マークアップ コマンドには、@c -Feta フォントに含まれる任意の図柄を提供することができます。@c -@ref{The Feta font} を参照してください。 +Emmentaler フォントに含まれる任意の図柄を提供することができます。@c +@ref{The Emmentaler font} を参照してください。 @c TODO Add inserting eps files or ref to later @@ -4226,7 +4226,7 @@ Feta フォントに含まれる任意の図柄を提供することができま @ref{マークアップ内部でのグラフィック記譜法}, @ref{テキストをフォーマットする}, @ref{Text markup commands}, -@ref{The Feta font} +@ref{The Emmentaler font}. @node 形状を変更する diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely index 42f6efcab1..46003a4226 100644 --- a/Documentation/ja/notation/input.itely +++ b/Documentation/ja/notation/input.itely @@ -2486,7 +2486,7 @@ Portable Network Graphics (PNG) 出力フォーマットが利用可能です。 @subsection 記譜フォントを置換する @translationof Replacing the notation font -LilyPond で使用される Feta フォントの代わりに Gonville に使うことができます。@c +LilyPond で使用される Emmentaler フォントの代わりに Gonville に使うことができます。@c Gonville は以下からダウンロードできます: @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @@ -2498,7 +2498,7 @@ Gonville のサンプル小節です: @c for the font comparison. -gp @sourceimage{Gonville_after,,,} -LilyPond の Feta フォントのサンプル小節です: +LilyPond の Emmentaler フォントのサンプル小節です: @sourceimage{Gonville_before,,,} @@ -2510,12 +2510,15 @@ ZIP ファイルをダウンロードして、伸張します。@c -- 更なる情報は、@rlearning{Other sources of information} を参照してください。@c 既存の @code{fonts} ディレクトリを @code{fonts_orig} にリネームして、@c @code{lilyfonts} ディレクトリを @code{fonts} にリネームします。@c -Feta フォントに戻すには、@code{fonts_orig} を @code{fonts} に戻します。 +Emmentaler フォントに戻すには、@code{fonts_orig} を @code{fonts} に戻します。 @seealso 学習マニュアル: @rlearning{Other sources of information} +記譜法リファレンス: +@ref{The Emmentaler font}. + @knownissues Gonville では @q{古代の音楽} を記譜することはできません。@c Gonville フォント ファミリーでは、@c diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 4193aa328b..c04874f13c 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -3137,7 +3137,7 @@ c1 | c | c | c @noindent @code{\musicglyph} を使用して譜刻できる記号のリストは、@c -@ref{The Feta font} を参照してください。 +@ref{The Emmentaler font} を参照してください。 リハーサル記号の配置の一般的な調整については、@c @ref{Formatting text} を参照してください。@c @@ -3151,7 +3151,7 @@ c1 | c | c | c @seealso 記譜法リファレンス: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Formatting text}, @ref{Aligning objects} diff --git a/Documentation/ja/notation/spacing.itely b/Documentation/ja/notation/spacing.itely index dad396f717..95a1bb821c 100644 --- a/Documentation/ja/notation/spacing.itely +++ b/Documentation/ja/notation/spacing.itely @@ -1260,7 +1260,7 @@ layoutVariable = \layout @{ @} @end example -Feta フォントは 8 つのサイズの音楽シンボルを提供します。 +Emmentaler フォントは 8 つのサイズの音楽シンボルを提供します。 各フォントは譜サイズに合わせて調整されます: 小さなサイズになるにつれて、@c 相対的に太くなる譜線に対して釣り合いをとるために、@c @@ -1329,7 +1329,8 @@ Feta フォントは 8 つのサイズの音楽シンボルを提供します。 @seealso 記譜法リファレンス: -@ref{記譜フォント サイズを選択する} +@ref{記譜フォント サイズを選択する}, +@ref{The Emmentaler font}. コード断片集: @rlsr{Spacing} diff --git a/Documentation/ja/notation/text.itely b/Documentation/ja/notation/text.itely index 5af7134be3..605484fc7b 100644 --- a/Documentation/ja/notation/text.itely +++ b/Documentation/ja/notation/text.itely @@ -318,7 +318,7 @@ LilyPond が処理できるテキスト スパナは 1 ボイスにつき、1 @ref{リハーサル記号}, @ref{テキストをフォーマットする}, @ref{マークアップ内部での音楽記譜法}, -@ref{The Feta font} +@ref{The Emmentaler font}. コード断片集: @rlsr{Text} @@ -1217,7 +1217,7 @@ a'1_\markup { より一般的には、以下で示すように、@c 使用可能な音楽シンボルはすべてマークアップ オブジェクトに@c 含めることができます。@c -@ref{The Feta font} に、@c +@ref{The Emmentaler font} に、@c 音楽シンボルと音楽シンボル名の徹底したリストがあります。 @lilypond[quote,verbatim] @@ -1288,7 +1288,7 @@ a'1_\markup { @seealso 記譜法リファレンス: @ref{Music}, -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{フォントの説明} インストールされているファイル: @@ -1497,7 +1497,7 @@ c''4^smaller @seealso 記譜法リファレンス: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{マークアップ内部での音楽記譜法}, @ref{Rotating objects}, @ref{フォントとフォント サイズを選択する}, diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 7e44224426..cb36029405 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -2535,7 +2535,7 @@ Music Glossary: Notation Reference: @ref{Accidentals}, @ref{Automatic accidentals}, -@ref{The Feta font} +@ref{The Emmentaler font} @node Kievan bar line @unnumberedsubsubsec Kievan bar line @@ -2551,8 +2551,10 @@ It can be invoked as @code{\bar "k"}. @end lilypond @seealso +Notation Reference: @ref{Bars}, -@ref{The Feta font} +@ref{The Emmentaler font} + @node Kievan melismata @unnumberedsubsubsec Kievan melismata diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index e72137aedd..7fad344bb6 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -4544,8 +4544,9 @@ XinO = { } @end lilypond -Any of the glyphs in the Feta Font can be supplied to the -@code{\musicglyph} markup command -- see @ref{The Feta font}. +Any of the @emph{Feta} glyphs used in the Emmentaler font can be +supplied to the @code{\musicglyph} markup command -- see +@ref{The Emmentaler font}. @file{EPS} files and Postscript commands can both be inserted inline using the @code{\epsfile} and @code{\postscript} markup commands @@ -4557,7 +4558,7 @@ Notation Reference: @ref{Graphic notation inside markup}, @ref{Formatting text}, @ref{Text markup commands}, -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Graphic}. diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 2c8df57890..5ff220e88b 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -2786,8 +2786,10 @@ see @rprogram{Basic command line options for LilyPond}. @node Replacing the notation font @subsection Replacing the notation font -Gonville is an alternative to the Feta font used in LilyPond and can -be downloaded from: +Gonville is an alternative set of glyphs to @emph{Feta} +-- part of the Emmentaler font -- and used in LilyPond. They can be +downloaded from: + @example @uref{http://www.chiark.greenend.org.uk/~sgtatham/gonville/ ,http://www.chiark.greenend.org.uk/~sgtatham/gonville/} @end example @@ -2798,7 +2800,7 @@ Here are a few sample bars of music set in Gonville: @c for the font comparison. -gp @sourceimage{Gonville_after,15cm,,} -Here are a few sample bars of music set in LilyPond's Feta font: +Here are a few sample bars of music set in LilyPond's Feta glyphs: @sourceimage{Gonville_before,15cm,,} @@ -2815,6 +2817,10 @@ reverse the process. Learning Manual: @rlearning{Other sources of information}. +@seealso +Notation Reference: +@ref{The Emmentaler font}. + @knownissues Gonville cannot be used to typeset @q{Ancient Music} notation and it is likely newer glyphs in later releases of LilyPond may not exist in the diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely index 388c8bc388..ab7547b5f9 100644 --- a/Documentation/notation/notation-appendices.itely +++ b/Documentation/notation/notation-appendices.itely @@ -21,7 +21,7 @@ * Predefined paper sizes:: * MIDI instruments:: * List of colors:: -* The Feta font:: +* The Emmentaler font:: * Note head styles:: * Clef styles:: * Text markup commands:: @@ -937,18 +937,37 @@ greyN Where N is in the range 0-100. -@node The Feta font -@appendixsec The Feta font +@node The Emmentaler font +@appendixsec The Emmentaler font + +@cindex Emmentaler font +@cindex Font, Emmentaler @cindex Feta font @cindex Font, Feta +@cindex Parmesan font +@cindex Font, Parmesan + +The Emmentaler font consists of two @emph{sub-sets} of glyphs. +@qq{Feta}, used for clasical notation and @qq{Parmesan}, sed for Ancient +notation. + +Any glyph within the Emmentaler font can be accessed directly by using +text markup along with the name of the glyph (as shown in the tables +below). For example; + +@example +g^\markup @{\musicglyph #"scripts.segno" @} +@end example + +@noindent +or + +@example +\markup @{\musicglyph #"five"@}. +@end example -The following symbols are available in the Emmentaler font and may be -accessed directly using text markup with the name of the glyph -as shown in the tables below, -such as @code{g^\markup @{\musicglyph #"scripts.segno" @}} or -@code{\markup @{\musicglyph #"five"@}}. For more information, -see @ref{Formatting text}. +For more information see @ref{Formatting text}. @menu diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 35a85e9214..a393f1346c 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -3342,7 +3342,7 @@ Music glyphs (such as the segno sign) may be printed inside a @end lilypond @noindent -See @ref{The Feta font}, for a list of symbols which may be +See @ref{The Emmentaler font}, for a list of symbols which may be printed with @code{\musicglyph}. For common tweaks to the positioning of rehearsal marks, see @@ -3356,7 +3356,7 @@ other formatting functions. @seealso Notation Reference: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Formatting text}, @ref{Aligning objects}. diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 9a4e91d49b..fb455c1fdd 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -1353,10 +1353,11 @@ reducing the thickness of the staff lines. @subheading Automatic font weight at different sizes -The Feta font provides musical symbols at eight different -sizes. Each font is tuned for a different staff size: at a smaller size -the font becomes heavier, to match the relatively heavier staff lines. -The recommended font sizes are listed in the following table: +The Emmentaler font provides the set of @emph{Feta} musical glyphs in +eight different sizes; each one tuned for a different staff size. The +smaller the glyph size, the @qq{heavier} it becomes, so as to match the +relatively thicker staff lines. Recommended glyphs sizes are listed in +the following table: @multitable @columnfractions .15 .2 .22 .2 @item @b{font name} @tab @b{staff height (pt)} @tab @b{staff height (mm)} @tab @b{use} @@ -1372,7 +1373,8 @@ The recommended font sizes are listed in the following table: @seealso Notation Reference: -@ref{Selecting notation font size}. +@ref{Selecting notation font size}, +@ref{The Emmentaler font}. Snippets: @rlsr{Spacing}. diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely index 4d1f44a4e4..8d9c8fcc89 100644 --- a/Documentation/notation/text.itely +++ b/Documentation/notation/text.itely @@ -300,7 +300,7 @@ Notation Reference: @ref{Rehearsal marks}, @ref{Formatting text}, @ref{Music notation inside markup}, -@ref{The Feta font}. +@ref{The Emmentaler font}. Snippets: @rlsr{Text}. @@ -1178,7 +1178,7 @@ in markup mode: More generally, any available musical symbol may be included separately in a markup object, as demonstrated below; an exhaustive list of these symbols and their names can be found in -@ref{The Feta font}. +@ref{The Emmentaler font}. @lilypond[quote,verbatim] \relative { @@ -1248,7 +1248,7 @@ An exhaustive list of music notation related commands can be found in @seealso Notation Reference: @ref{Music}, -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Fonts explained}. Installed Files: @@ -1357,9 +1357,8 @@ detect available fonts on the system; the selected fonts are rendered using Pango. Music notation fonts can be described as a set of specific glyphs, -ordered in several families. The following syntax allows various -LilyPond @code{feta} non-text fonts to be used directly in markup -mode: +ordered in several families. The following syntax allows LilyPond's +various @emph{Feta} glyphs to be used directly in markup mode: @lilypond[quote,verbatim,fragment] a'1^\markup { @@ -1448,7 +1447,7 @@ possible to use other fonts, as explained in the following sections: @seealso Notation Reference: -@ref{The Feta font}, +@ref{The Emmentaler font}, @ref{Music notation inside markup}, @ref{Rotating objects}, @ref{Selecting font and font size}, -- 2.39.2