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

allow users to define a variable number of lines in font_config #59

Merged
merged 23 commits into from
Jan 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
78445a9
Parser now correctly breaks at 3 lines
pkmnsnfrn Sep 6, 2023
8c777fb
Change maxLineWidth for RSE fonts
pkmnsnfrn Sep 6, 2023
55ee476
Updated originalMaxLineLength to stop cutoffs https://i.imgur.com/URm…
pkmnsnfrn Oct 2, 2023
024a6ac
Merged in latest poryscript
pkmnsnfrn Dec 4, 2023
2539bc8
Create a modular version that takes a number of lines from
pkmnsnfrn Dec 21, 2023
9296e06
Simplified block to use two statements as suggested in https://github…
pkmnsnfrn Dec 25, 2023
adc1855
renamed isMaxLineOrGreater to shouldUseLineFeed https://github.com/hu…
pkmnsnfrn Dec 25, 2023
9d543a6
renamed lineNumber to curLineNum https://github.com/huderlem/poryscr…
pkmnsnfrn Dec 25, 2023
5d2bde4
zero-indexed curLineNum https://github.com/huderlem/poryscript/pull/5…
pkmnsnfrn Dec 25, 2023
8f4a7a4
Added numLines, maxLineLength, fontId as named parameters
pkmnsnfrn Dec 26, 2023
407bce1
renamed numLines
pkmnsnfrn Dec 26, 2023
5dd965d
Added maxLineLength as unnamed paramter
pkmnsnfrn Dec 26, 2023
9cb78e9
Added cursorOverlapWidth as a named parameter
pkmnsnfrn Dec 26, 2023
e70de91
Fixed typo with cursorOverlapWidth
pkmnsnfrn Dec 26, 2023
58583e9
Reset curLineNum to zero when the user enters their own paragraph bre…
pkmnsnfrn Dec 26, 2023
5e52164
Changed isFirstLine to use bang operator instead of checking for fals…
pkmnsnfrn Dec 26, 2023
3cf189f
Removed redundant parenthesis in shouldUseLineFeed https://github.com…
pkmnsnfrn Dec 26, 2023
667acc2
Created setEmptyParametersToDefault to warn users and handle unset va…
pkmnsnfrn Dec 26, 2023
66a2742
Reworked high-level logic and created isNamedParameter, handleUnnamed…
pkmnsnfrn Dec 26, 2023
b834f9d
Created reportDuplicateParameterError https://github.com/huderlem/por…
pkmnsnfrn Dec 27, 2023
f9ef671
Fixup format() named parameters parsing and tests
huderlem Jan 1, 2024
7d86835
Update README
huderlem Jan 1, 2024
3e872d7
Improve format() error message and disallow duplicated named parameters
huderlem Jan 15, 2024
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
Prev Previous commit
Next Next commit
Added maxLineLength as unnamed paramter
  • Loading branch information
pkmnsnfrn committed Dec 26, 2023
commit 5dd965d0fa77fb785206ffb006d5b15b41ab9b46
8 changes: 8 additions & 0 deletions parser/parser.go
Original file line number Diff line number Diff line change
@@ -1084,6 +1084,14 @@ func (p *Parser) parseFormatStringOperator() (token.Token, string, string, error
}

p.nextToken()

if p.peekTokenIs(token.INT) {
num, _ := strconv.ParseInt(p.peekToken.Literal, 0, 64)
maxTextLength = int(num)
p.nextToken()
continue;
}

paramName := p.peekToken.Literal
p.nextToken()