Wrong mode assigned: a \\major should have been a \\mixolydian

This commit is contained in:
Eric Teunis de Boone 2019-03-23 06:49:37 +01:00
parent 081caa3cbb
commit c9aef893ab
125 changed files with 318 additions and 155 deletions

View File

@ -4,7 +4,7 @@
composerPipes = "Trad."
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 3/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90

View File

@ -67,6 +67,5 @@
\column {
\verseCblock
}
}
}
}

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "F.J. de Boone, 2009"
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg c8 [ \grG c8 ] \grg c4. a8 |

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 3/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 78

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "Arr. G. Rooney/Seaforths of Holland"
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ b16 ] \grip c4 \grg e4 |

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipesSecnd = ""
pipessecndglobal = {
\key a \major
\key a \mixolydian
}
pipessecndA = {
\grg c8. [ d16 ] \dble e4 \grg A4 |

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipesThrd = ""
pipesthrdglobal = {
\key a \major
\key a \mixolydian
}
pipesthrdA = {
\grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] |

View File

@ -4,7 +4,7 @@
composerPipes = "John MacLellan"
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ b16 ] \grip c4 \dblc c4 |

View File

@ -4,7 +4,7 @@
composerPipes = "PM J. MacLeod"
arrangerPipes = "1936"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -4,7 +4,7 @@
composerPipes = "R. Watt"
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -4,7 +4,7 @@
composerPipes = "N. MacLean"
arrangerPipes = "1936"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -6,7 +6,7 @@ rodin = { \bgrip }
composerPipes = "Gavin Stoddart / Alan Brydon"
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] |

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = " PM A. M. Cairns, MMM, CD"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] |

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] |

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = "1936"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 4/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesAAA = {
\dble e8. [ c16 ] |

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 4/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "Trad."
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
e4 |

View File

@ -0,0 +1,30 @@
\version "2.18.2"
\include "bagpipe.ly"
\include "./config.ily"
\include "./notes.pipes.ily"
\score {
\transpose a d {
\new Staff {
\global
\pipeglobal
\repeat volta 2 {
\partial 4
\pipesA s4
}
\break
\repeat volta 2 {
\partial 4
\pipesB s4
}
}
}
\header {
title = \title
meter = \meter
instrument = \instrumentPipes
composer = \composerPipes
}
}

View File

@ -1,7 +1,7 @@
\version "2.19.0"
%% Globals
global = {
\key a \major
\key a \mixolydian
\time 4/4
}
confTempo = {

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -1,7 +1,7 @@
\version "2.19.0"
%% Globals
global = {
\key a \major
\key a \mixolydian
\time 4/4
}
confTempo = {

View File

@ -6,7 +6,7 @@ titleAgira = "Cabar Feidh (Agira Version)"
meterAgira = "March"
instrumentPipesAgira = "Pipes"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAgiraA = {

View File

@ -6,7 +6,7 @@ meterCharge = "The Charge"
titleCharge = "Cabar Feidh"
instrumentPipesCharge = "Pipes"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesChargeA = {

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 4 s4 }
measure = { \grace { s4 } s1 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "Trad., arr. PM T.F.J. de Boone"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipeAlines = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipessecnd = "Trad., arr. PM T.F.J. de Boone"
pipessecndglobal = {
\key a \major
\key a \mixolydian
}
pipessecndAA = {
\grg c8 [ d8 ] |

View File

@ -1,7 +1,7 @@
\version "2.19.0"
%% Globals
global = {
\key a \major
\key a \mixolydian
\time 4/4
}
confTempo = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "PM Donald MacLeod"
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg f8. [ e16 ] |

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 4 \grace { s4 } s4 }
measure = { \grace { s4 } s1 | }

View File

@ -4,7 +4,7 @@
composerPipes = "G. McIntyre"
arrangerPipes = "S. Cassells"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -2,11 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}
}
%% Format
part = { \grace{s1} \partial 4 s4 }
measure = { \grace { s4 } s1 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 4 s4 }
measure = { \grace {s1} s1 | }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 4/4
\key a \mixolydian
}
confTempo = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 4 \grace{s4} s4 }
measure = { \grace { s4 } s1 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesA = {
\grg a8. [ b16 ] |

View File

@ -2,8 +2,8 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
%% Format
part = { \partial 4 s4 }
measure = { \grace { s4 } s1 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
pipesAA = {
\grg a8. [ b16 ]

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 4/4
\key d \major
}
confTempo = {
\tempo 4 = 90

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace { s4 } s1 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,8 +2,8 @@
%% Globals
global = {
\time 4/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 4/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}
}
%% Format
part = { \partial 4 s4 }
measure = { \grace { s4 } s1 | }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 5/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}
}
%% Format
part = {\partial 8 s8 }
measure = { \grace { s4 } s2 s2. | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "I. Duncan"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 2. = 90
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace { s4 } s1. | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 80
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace {s1} s2. | }

View File

@ -4,7 +4,7 @@
composerPipes = "PM J. Robertson"
arrangerPipes = "Seaforths of Holland"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 80
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace {s1} s2. | }

View File

@ -4,7 +4,7 @@
composerPipes = "PM A. Fettes"
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 90
}
}
%% Format
part = { \partial 8 \grace{ s4 } s8 }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 90
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace { s4 } s1. | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
mbreak = \break
% Music

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace { s4 } s1. | }

View File

@ -4,7 +4,7 @@
composerPipes = "Trad., 1936"
composerPipesAdd = ", pts 3 & 4 by R. Petre" %Ruaraith Petre
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 9/8
}
\key a \mixolydian
}
confTempo = {
\tempo 2. = 80
}
}
%% Format
measure = { \grace {s1} s4.*3 | }
halfline = { \repeat unfold 4 \measure }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "PM F.J. de Boone"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 9/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 80
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace {s1} s4.*3 | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "J. Wallace"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,6 +2,7 @@
%% Globals
global = {
\time 4/4
\key a \mixolydian
}
confTempo = {
\tempo 4 = 60

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "J.J. van Ommen Kloeke"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipes = {

View File

@ -2,7 +2,8 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 60
}

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipessecnd = ""
pipessecndglobal = {
\key a \major
\key a \mixolydian
}
pipessecndA = {
\grg c16. [ f32 ] |

View File

@ -2,8 +2,8 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 46
}

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipesSecnd = ""
pipessecndglobal = {
\key a \major
\key a \mixolydian
}
pipessecndA = {
e8 |

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 2. = 45
}
}
%% Format
part = { \partial 8 s8 }
measure = { \grace {s1} s2. | }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "N. Mathieson"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 12/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 40
}
}
%% Format
part = { \partial 4. \grace{s4.} s4. }
measure = { \grace {s1} s1. | }

View File

@ -4,7 +4,7 @@
composerPipes = "PM J.M. Banks"
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -4,7 +4,7 @@
composerPipesSecnd = "PM J.M. Banks"
arrangerPipesSecnd = ""
pipessecndglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipessecndAA = { % Same as pipesA

View File

@ -0,0 +1,59 @@
\version "2.19.0"
\include "bagpipe.ly"
\include "./config.ily"
\include "./notes.pipes.ily"
\include "./notes.pipes.seconds.ily"
%\include "./notes.pipes.thirds.ily"
mbreak = \break
pipes = {\pipeglobal \pipesA \pipesB }
pipesII = {
\pipessecndglobal
\pipessecndAA \pipessecndAB
\pipessecndBA \pipessecndBB
}
\score {
\new StaffGroup <<
\new Staff = "pipes" \with{
instrumentName = \markup{ \instrumentPipes }
shortInstrumentName = \markup{ \shortInstrumentPipes }
} {
\global
<<
\new NullVoice = "format" {
\part \halfline \mbreak \halfline \bar "||"
\break
\halfline \mbreak \halfline \bar "|."
}%Format
\set Staff.printPartCombineTexts = ##f
\partcombine \pipes \pipesII
>>
}
% \new Staff = "thirds" \with {
% instrumentName = \markup{ \instrumentPipes \instrumentThrd }
% shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
% } {
% \pipesthrdglobal
%
% }
>>
\header {
title = \title
meter = \meter
composer = \markup \large {
\column \right-align {
$(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} )
$(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \composerPipessecnd ":" }} #} )
$(if (not (string=? "" composerPipesthrd)) #{ \markup {\line { \composerPipesthrd ":" }} #} )
}
\column \right-align {
$(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} )
$(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} )
$(if (not (string=? "" composerPipesthrd)) #{ \markup {\line { \instrumentPipesthrd }}#} )
}
}
}
}

View File

@ -2,8 +2,8 @@
%% Globals
global = {
\time 6/8
}
\key b \minor
}
confTempo = {
\tempo 2. = 40
}

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 2/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 16 \grace{s1} s16}
measure = { \grace {s1} s2 | }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = "Paul Ward"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 2/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
part = { \partial 8 \grace {s1} s8 }
measure = { \grace {s1} s2 | }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = ""
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -2,7 +2,8 @@
%% Globals
global = {
\time 2/4
}
\key a \mixolydian
}
%% Format
part = { \partial 8 \grace { s4 } s8 }
measure = { \grace { s4 } s2 | }

View File

@ -1,9 +1,9 @@
% <<TimeSig>> <<Title>>
% 2/4 The Walrus
% Pipes
\version "2.18.2"
composerPipes = "R. Mathieson"
pipeglobal = {
\key a \major
\key a \mixolydian
\set Staff.midiInstrument = #"bagpipe"
}
pipesA = {

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 130
}
}
%% Format
part = { \partial 8 \grace{s1} s8 }
measure = { \grace {s1} s2. | }

View File

@ -4,7 +4,7 @@
composerPipes = ""
arrangerPipes = "D. Johnstone"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesAA = {

View File

@ -1,12 +1,12 @@
\version "2.19.0"
%% Globals
global = {
\key d \major
\time 6/8
}
\key a \mixolydian
}
confTempo = {
\tempo 4. = 120
}
}
%% Format
part = { \partial 8 \grace{s4.} s8 }
measure = { \grace {s1} s2. | }

View File

@ -4,8 +4,8 @@
composerPipes = "R. Mathieson"
arrangerPipes = ""
pipeglobal = {
\key a \major
}
\key a \mixolydian
}
% Music
pipesAA = {
\grg c8 [ a8 \grd a8 ] \grg d8 [ a8 \grd a8 ] |

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 2/4
}
\key a \mixolydian
}
confTempo = {
\tempo 4 = 80
}
}
%% Format
measure = { \grace {s1} s2 | }
halfline = { \repeat unfold 4 \measure }

View File

@ -3,7 +3,7 @@
\version "2.18.2"
composerPipes = "Calixa Lavallée"
pipeglobal = {
\key a \major
\key a \mixolydian
}
% Music
pipesA = {

View File

@ -0,0 +1,32 @@
\version "2.18.2"
\include "bagpipe.ly"
\include "./config.ily"
\include "./notes.pipes.ily"
\score {
\transpose f d \new Staff {
\global
\pipeglobal
<<
\new NullVoice = "format" {
\repeat unfold 7 {
\repeat unfold 4 \measure
\break
}
\bar "|."
}%Format
\new Voice = "pipes" {
\pipesA
}
>>
}
\header {
title = \title
meter = \meter
instrument = \instrumentPipes
composer = \composerPipes
}
}

View File

@ -2,10 +2,11 @@
%% Globals
global = {
\time 2/2
}
\key a \mixolydian
}
confTempo = {
\tempo 2 = 80
}
}
%% Format
part = { \partial 16 \grace{s1} s16 }
measure = { \grace {s1} s1 | }

Some files were not shown because too many files have changed in this diff Show More