Skip to content

Commit

Permalink
Merge branch 'main' into europe-tour
Browse files Browse the repository at this point in the history
  • Loading branch information
wjakethompson authored Jun 21, 2024
2 parents b4a5e47 + 6cffd8a commit 796c328
Show file tree
Hide file tree
Showing 45 changed files with 648 additions and 117 deletions.
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# taylor (development version)

* Added "us." from Gracie Abrams's *The Secret of Us* to `taylor_all_songs`.

* Added songs for which Taylor has written (but didn't record or feature on) to `taylor_all_songs`. This includes:
* "1 step forward, 3 steps back" and "deja vu" from Olivia Rodrigo's *SOUR*
* "Best Days Of Your Life" from Kellie Pickler's self-titled album
* "Better Man" from Little Big Town's *The Breaker*
* "This is What You Came For" by Calvin Harris (feat. Rihanna)
* "TMZ" from Weird Al Yankovic's *Apocalypse*
* "You'll Always Find Your Way Back Home" from Miley Cyrus on the *Hannah Montana: The Movie* soundtrack

# taylor 3.1.0

## New features
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
59 changes: 59 additions & 0 deletions data-raw/lyrics/98_features/us.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
[Verse 1: Gracie Abrams]
I know you know
It felt just like a joke
I show, you don't
And now we're talkin'
I know your ghost
I see her through the smoke
She'll play her show
And you'll be watchin'

[Pre-Chorus: Gracie Abrams]
And if history's clear, someone always ends up in ruins
And what seemed like fate becomes "What the hell was I doin'?"
Babylon lovers hangin' lifetimes on a vine (Ooh)
Do you miss mine?

[Chorus: Gracie Abrams & Taylor Swift]
Do you miss us, us?
I felt it, you held it, do you miss us, us?
Wonder if you regret the secret of us, us
Us (Us), us (Us), us (Us)

[Verse 2: Gracie Abrams, Gracie Abrams & Taylor Swift]
I know you know
It felt like somethin' old
It felt like somethin' holy, like souls bleedin', so
It fеlt like what I've known
You're twеnty-nine years old
So how can you be cold when I open my home?

[Pre-Chorus: Taylor Swift, Gracie Abrams & Taylor Swift]
And if history's clear, the flames always end up in ashes
And what seemed like fate, give it ten months and you'll be past it (You'll be past it)
Babylon lovers hangin' missed calls on the line
I gave you mine

[Chorus: Gracie Abrams & Taylor Swift]
Did you mind us, us?
I felt it, you held it, do you miss us, us?
Wonder if you regret the secret of us, us
Us (Us), us (Us), us (Us)

[Bridge: Gracie Abrams & Taylor Swift]
That night, you were talkin' false prophets and profits
They make in the margins of poetry sonnets
You never read up on it, shame, could've learned somethin'
Robert Bly on my nightstand, gifts from you, how ironic
The curse or a miracle, hearse or an oracle
You're incomparable, fuck, it was chemical
You (You) plus (Plus) me (Me) was

[Chorus: Gracie Abrams & Taylor Swift, Gracie Abrams]
Us, us, us
I felt it, you held it, do you miss us, us?
Wonder if you regret the secret of us, us
Mistaken for strangers the way it was, was
The pain of, the reign of, the flame of us, us
The outline, well, sometimes, do you miss us, us?
The best kind, well, sometimes, do you miss us?
44 changes: 44 additions & 0 deletions data-raw/lyrics/99_writer/1-step-forward-3-steps-back.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[Verse 1]
Called you on the phone today
Just to ask you how you were
All I did was speak normally
Somehow, I still struck a nerve
You got me fucked up in the head, boy
Never doubted myself so much
Like, am I pretty? Am I fun, boy?
I hate that I give you power over that kinda stuff

[Chorus]
'Cause it's always one step forward and three steps back
I'm the love of your life until I make you mad
It's always one step forward and three steps back
Do you love me, want me, hate me?
Boy, I don't understand
No, I don't understand

[Verse 2]
And maybe in some masochistic way
I kind of find it all exciting
Like, which lover will I get today?
Will you walk me to the door or send me home crying?

[Chorus]
It's one step forward and three steps back
I'm the love of your life until I make you mad
It's always one step forward and three steps back
Do you love me, want me, hate me?
Boy, I don't understand

[Bridge]
No, it's back and forth, did I say something wrong?
It's back and forth, going over everything I said
It's back and forth, did I do something wrong?
It's back and forth, maybe this is all your fault instead

[Chorus]
It's one step forward and three steps back
And I'd leave you, but the rollercoaster's all I've ever had
Yeah, it's one step forward and three steps back
Do you love me, want me, hate me?
Boy, I don't understand
No, I don't understand
64 changes: 64 additions & 0 deletions data-raw/lyrics/99_writer/best-days-of-your-life.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[Chorus 1]
'Cause I'll be there in the back of your mind
From the day we met 'til you were making me cry
And it's just too bad you already had the best days
The best days of your life

[Verse 1]
Ain't it a shame?
A shame that every time you hear my name
Brought up in a casual conversation
You can't think straight?
And ain't it sad
You can't forget about what we had?
Take a look at her and do you like what you see
Or do you wish it was me?

[Chorus 2]
'Cause I'll be there in the back of your mind
From the day we met to the very last night
And it's just too bad you already had the best days
The best days of your life

[Verse 2]
And does she know
Know about the times you used to hold me
Wrapped me in your arms and how you told me
I'd be the only one?
I heard about
Yeah, someone told me once when you were out
She went a little crazy, ran her mouth about me
Ain't jealousy funny?

[Chorus 2]
'Cause I'll be there in the back of your mind
From the day we met to the very last night
And it's just too bad you already had the best days
The best days of your life

[Verse 3]
Life with me was a fairytale love
I was head over heels 'til you threw away us
And it's just too bad you already had the best days
The best days of your life

[Bridge]
I heard you're gonna get married, have a nice little family
Live out my dreams with someone new
But I've been told that a cheater is always a cheater
So I've got my pride and she's got you

[Chorus 2]
'Cause I'll be there in the back of your mind
From the day we met 'til you were making me cry
And it's just too bad you already had the best days
The best days of your life

[Outro]
Of your life, oh, oh yeah
You're gonna think of me
You're gonna think of me in your life
Oh, oh, yeah
It's a shame
It's a shame
It's a shame, it's a shame, it's a shame
65 changes: 65 additions & 0 deletions data-raw/lyrics/99_writer/better-man.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[Verse 1]
I know I’m probably better off on my own
Than lovin' a man who didn’t know what he had when he had it
And I see the permanent damage you did to me
Never again, I just wish I could forget when it was magic

[Pre-Chorus]
I wish it wasn't 4 AM, standing in the mirror
Saying to myself, you know you had to do it
I know the bravest thing I ever did was run

[Chorus]
Sometimes, in the middle of the night, I can feel you again
But I just miss you, and I just wish you were a better man
And I know why we had to say goodbye like the back of my hand
And I just miss you, and I just wish you were a better man
A better man

[Verse 2]
I know I’m probably better off all alone
Than needing a man who could change his mind
At any given minute
And it’s always on your terms
I’m hanging on every careless word
Hoping it might turn sweet again
Like it was in the beginning

[Pre-Chorus 2]
But your jealousy, I can hear it now
You’re talking down to me like I'll always be around
You push my love away like it's some kind of loaded gun
Boy, you never thought I’d run

[Chorus]
Sometimes, in the middle of the night, I can feel you again
But I just miss you, and I just wish you were a better man
And I know why we had to say goodbye like the back of my hand
And I just miss you, and I just wish you were a better man
A better man
Better man

[Bridge]
I hold onto this pride because these days, it's all I have
And I gave you my best and we both know you can't say that
You can't say that
I wish you were a better man
I wonder what we would’ve become
If you were a better man
We might still be in love
If you were a better man
You would've been the one
If you were a better man
Yeah, yeah

[Chorus]
Sometimes, in the middle of the night, I can feel you again
But I just miss you, and I just wish you were a better man
And I know why we had to say goodbye like the back of my hand
And I just miss you and I just wish you were a better man

[Outro]
We might still be in love, if you were a better man
Could've been the one, if you were a better man
We might still be in love, if you were a better man
Better man
52 changes: 52 additions & 0 deletions data-raw/lyrics/99_writer/deja-vu.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[Verse 1]
Car rides to Malibu
Strawberry ice cream, one spoon for two
And tradin' jackets
Laughin’ 'bout how small it looks on you
(Ha-ha-ha-ha, ha-ha-ha-ha-ha, ha-ha-ha-ha)
Watching reruns of Glee
Bein' annoying, singin’ in harmony
I bet she's braggin' to all her friends, sayin' you're so unique, hmm

[Chorus]
So when you gonna tell her that we did that, too?
She thinks it's special, but it's all reused
That was our place, I found it first
I made the jokes you tell to her when she's with you
Do you get déjà vu when she’s with you?
Do you get déjà vu? (Ah) Hmm
Do you get déjà vu, huh?

[Verse 2]
Do you call her, almost say my name?
’Cause let's be honest, we kinda do sound the same
Another actress
I hate to think that I was just your type
And I bet that she knows Billy Joel
’Cause you played her "Uptown Girl"
You're singin' it together
Now I bet you even tell her how you love her
In between the chorus and the verse (Ooh; I love you)

[Chorus]
So when you gonna tell her that we did that, too?
She thinks it's special, but it’s all reused
That was the show we talked about
Played you the songs she's singing now when she's with you
Do you get déjà vu when she's with you?
Do you get déjà vu? (Oh-oh)
Do you get déjà vu?

[Bridge]
Strawberry ice cream in Malibu
Don't act like we didn't do that shit, too
You're tradin' jackets like we used to do
(Yeah, everything is all reused)
Play her piano, but she doesn't know (Oh, oh)
That I was the one who taught you Billy Joel (Oh)
A different girl now, but there's nothing new

[Outro]
I know you get déjà vu
I know you get déjà vu
I know you get déjà vu
53 changes: 53 additions & 0 deletions data-raw/lyrics/99_writer/this-is-what-you-came-for.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[Chorus]
Baby, this is what you came for
Lightning strikes every time she moves
And everybody's watchin' her
But she's lookin' at
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh
Baby, this is what you came for
Lightning strikes every time she moves
And everybody's watchin' her
But she's lookin' at
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh

[Verse]
We go fast with the game we play
Who knows why it's gotta be this way
We say nothin' more than we need
I say, "Your place" when we leave

[Chorus]
Baby, this is what you came for
Lightning strikes every time she moves
And everybody's watchin' her
But she's lookin' at
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh

[Bridge]
Baby, this is what you came for
Lightning strikes every time she moves
Yeah

[Chorus]
Baby, this is what you came for
Lightning strikes every time she moves
And everybody's watchin' her
But she's lookin' at
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh-ooh
You, ooh-ooh, you, ooh, ooh, ooh
Loading

0 comments on commit 796c328

Please sign in to comment.