resolve merge

[lilypond.git] / input / lsr / using-beatlength-and-beatgrouping.ly

diff --git a/input/lsr/using-beatlength-and-beatgrouping.ly b/input/lsr/using-beatlength-and-beatgrouping.ly
deleted file mode 100644 (file)
index c148611..0000000
--- a/input/lsr/using-beatlength-and-beatgrouping.ly
+++ /dev/null
@@ -1,65 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "rhythms, tweaks-and-overrides"
-
-  texidoces = "
-La propiedad @code{measureLength} determina dónde se deben insertar
-líneas divisorias y, con @code{beatLength} y @code{beatGrouping}, cómo
-se deben generar las barras autoomáticas para las duraciones de barra
-y compases para los que no hay ninguna regla definida para los finales
-de barra. Este ejemplo muestra distintas dormas de controlar el
-barrado mediante el establecimiento de estas propiedades. Las
-explicaciones están en forma de comentarios dentro del código.
-
-"
-  doctitlees = "Utilización de beatLength y beatGrouping"
-
-  texidoc = "
-The property @code{measureLength} determines where bar lines should be
-inserted and, with @code{beatLength} and @code{beatGrouping}, how
-automatic beams should be generated for beam durations and time
-signatures for which no beam-ending rules are defined.  This example
-shows several ways of controlling beaming by setting these properties. 
-The explanations are shown as comments in the code.
-
-"
-  doctitle = "Using beatLength and beatGrouping"
-} % begin verbatim
-
-\relative c'' {
-  \time 3/4
-  % The default in 3/4 time is to beam in three groups
-  % each of a quarter note length
-  a16 a a a a a a a a a a a
-
-  \time 12/16
-  % No auto-beaming is defined for 12/16
-  a16 a a a a a a a a a a a
-
-  \time 3/4
-  % Change time signature symbol, but retain underlying 3/4 beaming
-  \set Score.timeSignatureFraction = #'(12 . 16)
-  a16 a a a a a a a a a a a
-
-  % The 3/4 time default grouping of (1 1 1) and beatLength of 1/8
-  % are not consistent with a measureLength of 3/4, so the beams
-  % are grouped at beatLength intervals
-  \set Score.beatLength = #(ly:make-moment 1 8)
-  a16 a a a a a a a a a a a
-
-  % Specify beams in groups of (3 3 2 3) 1/16th notes
-  % 3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,
-  % and beams are grouped at beatLength (1/16) intervals
-  \set Score.beatLength = #(ly:make-moment 1 16)
-  \set Score.beatGrouping = #'(3 3 2 3)
-  a16 a a a a a a a a a a a
-
-  % Specify beams in groups of (3 4 2 3) 1/16th notes
-  % 3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies
-  \set Score.beatLength = #(ly:make-moment 1 16)
-  \set Score.beatGrouping = #'(3 4 2 3)
-  a16 a a a a a a a a a a a
-}