Skip to content

Corrections to english manual of NBASIC. - #18

Merged
Konamiman merged 218 commits into
Konamiman:masterfrom
ATroubleshooter:master
Nov 28, 2021
Merged

Corrections to english manual of NBASIC.#18
Konamiman merged 218 commits into
Konamiman:masterfrom
ATroubleshooter:master

Conversation

@ATroubleshooter

@ATroubleshooter ATroubleshooter commented Aug 18, 2021

Copy link
Copy Markdown
Contributor

Edits, targeting "reproductor - replayer" translation issues.

This is my first commit on Github, so don't beat me :)

  • Corrections to english translation of manual.
    - Translation into Russian created.

Edits, targeting "reprodictor - replayer" translation issues.
Edits, targeting "reproductor - replayer" translation issues.
Just a beginning...
Translation of nbas111e.txt into russian.
Just a beginning.
Slight refinement.
keep on moving
keep on moving
keep on moving
keep on moving
keep on moving
"vector hook"!
keep on moving
keep on moving
keep on moving
@ATroubleshooter
ATroubleshooter marked this pull request as draft September 5, 2021 09:53
@Konamiman

Konamiman commented Nov 24, 2021

Copy link
Copy Markdown
Owner

Regarding the Russian translation, I'd rather prefer that you do the following:

  1. Remove the file from this pull request.
  2. Create a new pull request to add the file.

This way you can create the new pull request in draft state (since it's WIP as you mention in msx.org), and once you have finished it, request review from someone (if necessary) and finally I can merge it; and all of this would happen independently of the fixes to the English manual.

@ATroubleshooter

ATroubleshooter commented Nov 24, 2021

Copy link
Copy Markdown
Contributor Author

That's because this one is an intermediate file containing only the assembled NBASIC.ASC. It needs to be concatenated with NBASIC.DAT and the result is the final usable NBASIC.BIN (yeah, it's confusing).

Well, I did exactly that, Nestor. The binary, generated by COMPASS 1.2, is 17K and after concatenating with NBASIC.DAT I get 58K binary.
NBASIC BIN
.

I was using just unix cat command for concatenation.

Is it possible at all to get 17K file assembled from NBASIC.ASM ?

Restoring original file with original encoding.
@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

Replace your local file with the version in the repository (download it from https://github.com/Konamiman/MSX/blob/master/SRC/NBASIC/nbas111s.txt), then push a commit with that change.

Done.
I think it's done, you better take a look whether it's fine or it isn't. :)))

Just to arrange it as separate branch.
@ATroubleshooter ATroubleshooter changed the title Corrections to english manual of NBASIC, russian translation. Corrections to english manual of NBASIC. Nov 24, 2021
@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

Regarding the Russian translation, I'd rather prefer that you do the following:

1. Remove the file from this pull request.

2. Create a new pull request to add the file.

This way you can create the new pull request in draft state (since it's WIP as you mention in msx.org), and once you have finished it, request review from someone (if necessary) and finally I can merge it; and all of this would happen independently of the fixes to the English manual.

Alright, let's go that way. Done.

@Konamiman

Copy link
Copy Markdown
Owner

The binary, generated by COMPASS 1.2, is 17K and after concatenating with NBASIC.DAT I get 58K binary.

That's true, any old copy of NBASIC.BIN I have around is 58K or a bit less (for older versions), so I don't understand where that 92K one came from. I must have done something terribly wrong when I released the last version.

About the revert of the changes in the Spanish manual: the file disappeared from the list of changed files in this pull request, this means that the file is now identical to the one in master, so yes, it's ok now.

@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

So, this is the completely legit NestorBASIC 1.10 binary?
https://github.com/Konamiman/MSX/blob/master/SRC/NBASIC/NBASIC.BIN

@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

I'm not sure if it's worth releasing a new version just to fix this, it's not a critical feature. Documenting it should be enough.
Well, I've just replaced that terrifying WARNING notice with a simpler explanation :)))

@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

Yet another important one is that - ATroubleshooter@af3dcbd#diff-b352aaa23c09b5d67479d017df8d56a60f7b7c5d99c8824afb6dc3a2526b671e

concerning P(10) instead of P(0). Perhaps just a typo, but it's coming from spanish doc, and it's still there.

@Konamiman

Copy link
Copy Markdown
Owner

So, this is the completely legit NestorBASIC 1.10 binary?

Yes, so it seems that I didn't follow my own rule of not including release binaries in the repository. 🤷‍♂️

Anyway, the one for v1.11 you generated is good. I'll add it to my web site together with the fixed manual once this pull request is merged; and feel free to include it as part of the pull request again, but this time name it just NBASIC.BIN, so that it replaces the old one.

@Konamiman

Copy link
Copy Markdown
Owner

@ATroubleshooter Cool. Only a few gotchas remaining (see the comments I haven't resolved yet) and I think this will be ready for merge.

@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

@ATroubleshooter Cool. Only a few gotchas remaining (see the comments I haven't resolved yet) and I think this will be ready for merge.

Well, I think that's it?

@Konamiman
Konamiman merged commit 9d4e56f into Konamiman:master Nov 28, 2021
@ATroubleshooter

Copy link
Copy Markdown
Contributor Author

Thank you.

@Konamiman

Copy link
Copy Markdown
Owner

👍🏻 Thanks for your work. I have updated the manual (also the Spanish one) and the binary in my web site.

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.

2 participants