Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lilypond 2.24 #151

Merged
merged 7 commits into from
Jan 3, 2023
Merged

Lilypond 2.24 #151

merged 7 commits into from
Jan 3, 2023

Conversation

fedelibre
Copy link
Member

No description provided.

@fedelibre
Copy link
Member Author

I'm away from home and I forgot the charger of my laptop. I might reply to any feedback from 3rd of January.

Copy link
Member

@jeanas jeanas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't complete, is it? There is stuff to update in ly/data/ (importantly, this includes lists of properties).

ly/words.py Show resolved Hide resolved
ly/words.py Show resolved Hide resolved
@fedelibre
Copy link
Member Author

fedelibre commented Dec 31, 2022 via email

@PeterBjuhr PeterBjuhr marked this pull request as draft December 31, 2022 23:27
@PeterBjuhr
Copy link
Collaborator

Yes, I should have set it to draft. I'll continue when I'm back at home.

I've set it to draft now!

@fedelibre
Copy link
Member Author

This isn't complete, is it? There is stuff to update in ly/data/ (importantly, this includes lists of properties).

I've updated _lilypond_data.py using the Makefile. But there's also makeschemedata.py, which needs some corrections. Can you have a look at it? You know Scheme, while I'm totally ignorant.

@fedelibre fedelibre linked an issue Jan 2, 2023 that may be closed by this pull request
@fedelibre fedelibre marked this pull request as ready for review January 3, 2023 14:51
@fedelibre
Copy link
Member Author

I made a try with makeschemedata.py, but there are a few issues to be solved:

  1. We lost almost all the scheme_keywords. See how guileWords is populated in makeschemedata.py.
  2. I had to comment lyVars.remove('parser') to avoid an error, but I don't understand what I'm doing. Maybe parser was removed in Guile 2?

@jeanas
Copy link
Member

jeanas commented Jan 3, 2023

I had to comment lyVars.remove('parser') to avoid an error, but I don't understand what I'm doing. Maybe parser was removed in Guile 2?

In older days, all music functions had a required parser argument (and a location argument), but this isn't the case anymore. My guess is that it is related to this.

@jeanas
Copy link
Member

jeanas commented Jan 3, 2023

@fedelibre I have fixed the problem with Scheme keywords and the two others I noticed. I pushed the commit to your branch, I hope that's OK with you.

To be honest, the way makeschemedata.py works is pretty terrible. But I'm not asking you to change it in this PR; we can do that later, and one of the projects on my packed LilyPond TODO list is to add the ability to output its keywords to LilyPond itself so that every editor project doesn't have to reimplement it.

ly/data/_scheme_data.py Show resolved Hide resolved
ly/data/_scheme_data.py Show resolved Hide resolved
@fedelibre
Copy link
Member Author

I had to comment lyVars.remove('parser') to avoid an error, but I don't understand what I'm doing. Maybe parser was removed in Guile 2?

In older days, all music functions had a required parser argument (and a location argument), but this isn't the case anymore. My guess is that it is related to this.

Ok, then we'd better delete that commented line?

Go ahead and feel free to add more commits on my branch. When you've finished I think we can merge it.
Thanks!

Copy link
Member

@jeanas jeanas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're good to go now. I went through the diff again, and with the latest fixes, I don't see any oddities anymore. All changes look expected to me.

@jeanas jeanas merged commit 12dff92 into frescobaldi:master Jan 3, 2023
@jeanas
Copy link
Member

jeanas commented Jan 3, 2023

Removed the commented line and merged. Thanks @fedelibre for initiating this!

@fedelibre fedelibre deleted the lilypond-2.24 branch January 3, 2023 22:12
@fedelibre
Copy link
Member Author

Wait, what about this HTML entities?

diff --git a/ly/data/_scheme_data.py b/ly/data/_scheme_data.py
index 7fb635e..95d68cd 100644
--- a/ly/data/_scheme_data.py
+++ b/ly/data/_scheme_data.py
@@ -1,8 +1,36 @@
 #generated by makeschemedata.py
 
-version="2.18"
+version="2.24"
 
 scheme_keywords = [
+    '&assertion',
+    '&condition',
+    '&error',
+    '&i/o',
+    '&i/o-decoding',
+    '&i/o-encoding',
+    '&i/o-file-already-exists',
+    '&i/o-file-does-not-exist',
+    '&i/o-file-is-read-only',
+    '&i/o-file-protection',
+    '&i/o-filename',
+    '&i/o-invalid-position',
+    '&i/o-port',
+    '&i/o-read',
+    '&i/o-write',
+    '&implementation-restriction',
+    '&irritants',
+    '&lexical',
+    '&message',
+    '&no-infinities',
+    '&no-nans',
+    '&non-continuable',
+    '&serious',
+    '&syntax',
+    '&undefined',
+    '&violation',
+    '&warning',
+    '&who',

@jeanas
Copy link
Member

jeanas commented Jan 3, 2023

Oops 😳

I knew these things started with an & in Guile and didn't pay attention to the amp; while scrolling...

I'll fix it in a follow-up PR.

@jeanas
Copy link
Member

jeanas commented Jan 3, 2023

#152

ksnortum pushed a commit to ksnortum/python-ly that referenced this pull request Jul 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants