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

Move map specific reader code to map module #4302

Merged
merged 11 commits into from Oct 20, 2023

Conversation

jelovirt
Copy link
Member

@jelovirt jelovirt commented Oct 13, 2023

Description

Refactor subject scheme code for preprocess2 to support all features of subject scheme that preprocess supports. This changes how preprocess2 does filtering. Before preprocess2 map filtering was lazy, meaning it happened at the end of preprocess2 map step. This changes the map filtering to be early, after initial map parsing and mapref merge. It's not as early as in preprocess2 topic processing, because filtering requires reading subject schemes and those are part of the map.

Motivation and Context

Support all subject scheme features in preprocess2 that are supported by preprocess.

How Has This Been Tested?

Existing and new tests.

Type of Changes

  • New feature (non-breaking change which adds functionality)

Documentation and Compatibility

https://www.dita-ot.org/dev/reference/map-first-preprocessing could mention that since DITA-OT 4.2 preprocess2 supports more subject scheme features.

@jelovirt jelovirt added preprocess enhancement Changes to an existing feature preprocess2 internal Internal refactoring of unreleased code or tests (no docs required) labels Oct 13, 2023
@jelovirt jelovirt force-pushed the feature/refactor-subject-scheme-reader-3 branch from cc47dc8 to 0337f5f Compare October 13, 2023 18:35
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt force-pushed the feature/refactor-subject-scheme-reader-3 branch from 0337f5f to 7b3383d Compare October 15, 2023 16:04
Filtering will take place right after reading, but not during like in topics.

Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt marked this pull request as ready for review October 19, 2023 18:08
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt force-pushed the feature/refactor-subject-scheme-reader-3 branch from ade71f4 to 42d3747 Compare October 20, 2023 12:07
@jelovirt jelovirt removed the internal Internal refactoring of unreleased code or tests (no docs required) label Oct 20, 2023
@jelovirt jelovirt force-pushed the feature/refactor-subject-scheme-reader-3 branch 2 times, most recently from d746cf3 to 87fc02d Compare October 20, 2023 12:19
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt force-pushed the feature/refactor-subject-scheme-reader-3 branch from 87fc02d to 53aa7aa Compare October 20, 2023 12:22
@jelovirt jelovirt self-assigned this Oct 20, 2023
@jelovirt jelovirt merged commit 9e14039 into develop Oct 20, 2023
4 checks passed
@jelovirt jelovirt deleted the feature/refactor-subject-scheme-reader-3 branch October 20, 2023 12:31
@jelovirt jelovirt added this to the Next milestone Oct 20, 2023
@infotexture
Copy link
Member

https://www.dita-ot.org/dev/reference/map-first-preprocessing could mention that since DITA-OT 4.2 preprocess2 supports more subject scheme features.

@jelovirt While it's fresh in your mind: could you provide details on which features?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Changes to an existing feature preprocess preprocess2
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants