Skip to content

Fix end-of-line grammar #95

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.

Sign up for GitHub

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

Open
codello wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix end-of-line grammar #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions The UltraStar File Format (Unversioned).md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Whitespace around key and value is ignored.

```abnf
file-header = *( header-line / empty-line )
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP line-break
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP end-of-line
header-key = 1*header-char
header-value = *( header-char / colon )

Expand Down Expand Up @@ -399,7 +399,7 @@ note = note-type
WSP duration
WSP pitch
WSP note-text
line-break
end-of-line

note-type = %x21-22 / %x24-7E ; Visible ASCII-characters except space and #
start-beat = 1*DIGIT
Expand Down Expand Up @@ -464,7 +464,7 @@ End-of-Phrase markers are indicated by a `-` character (hyphen/minus, `%x2D`).
```abnf
end-of-phrase = %x2D ; -
WSP start-beat
*WSP line-break
*WSP end-of-line
```

An end-of-phrase marker carries no musical information but indicates the end of a phrase in the song.
Expand All @@ -482,7 +482,7 @@ A voice change (also referred to as a “player change”) is indicated by a `P`

```abnf
voice-change = p voice-numer
*WSP line-break
*WSP end-of-line
p = %x50 ; P
voice-number = %x31 / %x32 ; 1 / 2
```
Expand Down Expand Up @@ -515,7 +515,7 @@ When relative mode is enabled, the syntax of end-of-phrase markers changes:
end-of-phrase =/ dash
WSP start-beat
WSP rel-offset
*WSP line-break
*WSP end-of-line
rel-offset = 1*DIGIT
```

Expand Down Expand Up @@ -543,3 +543,4 @@ The `rel` value for a voice does not reset when a voice change is encountered.
- 2025-03-07: First revision
- 2025-04-22: Fixed section linking
- 2025-05-23: Fix time unit for `#END` header
- 2025-07-25: Fix usage of `end-of-line` in grammar
9 changes: 5 additions & 4 deletions The UltraStar File Format (v1).md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Whitespace around key and value is ignored.

```abnf
file-header = *( header-line / empty-line )
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP line-break
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP end-of-line
header-key = 1*header-char
header-value = *( header-char / colon )

Expand Down Expand Up @@ -298,7 +298,7 @@ note = note-type
WSP duration
WSP pitch
WSP note-text
line-break
end-of-line

note-type = %x21-22 / %x24-7E ; Visible ASCII-characters except space and #
start-beat = 1*DIGIT
Expand Down Expand Up @@ -384,7 +384,7 @@ End-of-Phrase markers are indicated by a `-` character (hyphen/minus, `%x2D`).
```abnf
end-of-phrase = %x2D ; -
WSP start-beat
*WSP line-break
*WSP end-of-line
```

An end-of-phrase marker carries no musical information but indicates the end of a phrase in the song.
Expand All @@ -402,7 +402,7 @@ A voice change (also referred to as a “player change”) is indicated by a `P`

```abnf
voice-change = p voice-numer
*WSP line-break
*WSP end-of-line
p = %x50 ; P
voice-number = DIGIT
```
Expand Down Expand Up @@ -614,3 +614,4 @@ Examples:
- 2025-04-22: Fixed section linking
- 2025-05-20: Clarify handling of unknown note types
- 2025-05-23: Fix time unit for `#END` header
- 2025-07-25: Fix usage of `end-of-line` in grammar
8 changes: 4 additions & 4 deletions The UltraStar File Format (v2).md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Whitespace around key and value is ignored.

```abnf
file-header = *( header-line / empty-line )
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP line-break
header-line = hash *WSP header-key *WSP colon *WSP header-value *WSP end-of-line
header-key = 1*header-char
header-value = *( header-char / colon )

Expand Down Expand Up @@ -292,7 +292,7 @@ note = note-type
WSP duration
WSP pitch
WSP note-text
line-break
end-of-line

note-type = %x21-22 / %x24-7E ; Visible ASCII-characters except space and #
start-beat = 1*DIGIT
Expand Down Expand Up @@ -378,7 +378,7 @@ End-of-Phrase markers are indicated by a `-` character (hyphen/minus, `%x2D`).
```abnf
end-of-phrase = %x2D ; -
[ WSP start-beat ]
*WSP line-break
*WSP end-of-line
```

An end-of-phrase marker carries no musical information but indicates the end of a phrase in the song.
Expand All @@ -399,7 +399,7 @@ A voice change (also referred to as a “player change”) is indicated by a `P`

```abnf
voice-change = p voice-numer
*WSP line-break
*WSP end-of-line
p = %x50 ; P
voice-number = DIGIT
```
Expand Down