FONTSAMPLER display glyphs from bitmap font to PDF (retry)

[MattHeffron]

Enable FONTSAMPLER to display glyphs from DISPLAYFONT (bitmap font) on non-DISPLAY stream (e.g., PDF)
Added .LCOM to repository.

Corrected PR.

[MattHeffron]

Converted to Draft per 2025-02-03 discussion on Ascent/Descent per CHARSETINFO vs. whole FONTDESCRIPTOR to modify for this.

[MattHeffron]

I have no idea why git is saying that there are merge conflicts for those two files.
They are the only two files changed in either of the commits in this PR, and they seem to have been untouched on master since this branch was created.
How should this be fixed?

[nbriggs]

Reviewed in meeting Mon Feb 3, 2025

[nbriggs]

It looks as though you or Ron may have merged a branch when (part of?) your FONTSAMPLER changes were present in the other branch? Have a look at the log entry for 86f5aad to 1f317d3 - co-authored by you and Ron.

The branch for this PR diverged from master at db9d879, your PR 1974, and then PR 2010 appears to have your FONTSAMPLER change where the .LCOM was added to the repo - since they're all binary files, it's unable to combine the changes in this branch with the changes that have been made to the same files since the branches diverged (which is a good thing!)

I haven't figured out how PR 2010 got to be the way it is/was.

[nbriggs]

@MattHeffron - have a look at #2010 -- why did this have more than just the rename of the FONTSAMPLE files, and why did @masinter approve it given what was in it?

[MattHeffron]

why did this have more than just the rename of the FONTSAMPLE files

That, I don't know. I thought that I was being pretty careful with only the correct files, but maybe I just missed something.
The important thing is how to fix this...or, should I just close this PR and copy the changes to a new branch from master and make a new PR?

[nbriggs]

I can fix it using direct git commands. I'll do that.

The merge-base changed after approval.

[nbriggs]

Need re-review now.

[nbriggs]

@MattHeffron - I'm not 100% sure that this won't do damage. How about deleting this PR and resubmit it with only the two changed files lispusers/FONTSAMPLER and lispusers/FONTSAMPLER.LCOM

[MattHeffron]

@MattHeffron - I'm not 100% sure that this won't do damage. How about deleting this PR and resubmit it with only the two changed files lispusers/FONTSAMPLER and lispusers/FONTSAMPLER.LCOM

I created new PR #2013. I'm closing this one.
(Hopefully, 3rd time's the charm!)