Autodesk: Text - Add the schema for MarkupText
Description of Change(s)
A new geometry schema MarkupText and its associated property schema ColumnLayout and ParagraphLayout were defined in pxr/usd/usdText/schema.usda. MarkupText also uses property schema TextStyle which is defined by SimpleText.
Several schemas boilerplate files were generated by calling usdGenSchema on schema.usda. Comment "Script generated file" is added to each usdGenSchema generated file to help the reviewer identify and ignore them.
Details of MarkupText and its style and layout schema were defined in the Text proposal. PR of the Text proposal can be accessed here. Feedback on the proposal is also appreciated.
There is no unit tests created in this PR since tests for MarkupText would require the implementation of SimpleText (which is in another PR). We will add the unit tests in this PR after the SimpleText is merged in dev: https://github.com/PixarAnimationStudios/OpenUSD/pull/3258
This supersedes prior https://github.com/PixarAnimationStudios/OpenUSD/pull/3002.
Fixes Issue(s)
- N/A
- [X] I have verified that all unit tests pass with the proposed changes
- [X] I have submitted a signed Contributor License Agreement
Hello! Please do not modify any generatedSchema.usda files, as it will cause some of our internal test automation to fail. I think reviewers will know to skip them.
Thank you!
On Thu, Aug 29, 2024 at 6:09 PM Erika Harrison @.***> wrote:
Description of Change(s)
A new geometry schema MarkupText and its associated property schema ColumnLayout and ParagraphLayout were defined in pxr/usd/usdText/schema.usda. MarkupText also uses property schema TextStyle which is defined by SimpleText.
Several schemas boilerplate files were generated by calling usdGenSchema on schema.usda. Comment "Script generated file" is added to each usdGenSchema generated file to help the reviewer identify and ignore them.
Details of MarkupText and its style and layout schema were defined in the Text proposal https://github.com/PixarAnimationStudios/OpenUSD-proposals/blob/main/proposals/text/README.md . PR of the Text proposal can be accessed here https://github.com/PixarAnimationStudios/OpenUSD-proposals/pull/24. Feedback on the proposal is also appreciated.
There is no unit tests created in this PR since tests for MarkupText would require the implementation of SimpleText (which is in another PR). We will add the unit tests in this PR after the SimpleText is merged in dev: #3258 https://github.com/PixarAnimationStudios/OpenUSD/pull/3258
This supersedes prior #3002 https://github.com/PixarAnimationStudios/OpenUSD/pull/3002. Fixes Issue(s)
N/A
I have verified that all unit tests pass with the proposed changes
I have submitted a signed Contributor License Agreement
You can view, comment on, or merge this pull request online at:
https://github.com/PixarAnimationStudios/OpenUSD/pull/3259 Commit Summary
- 18f133d https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/commits/18f133db1bad4045566c25e59067622b47c2ebca Add the schema for MarkupText
File Changes
(31 files https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files)
- M pxr/usd/CMakeLists.txt https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-608d12e25b51003a9c1c79710630ffe4b9dc33a76c7afd6c60a797ea342f5780 (1)
- A pxr/usd/usdText/CMakeLists.txt https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a19fafa050001dd5757e7ac61960cd4da789af8515fe7b34fcf36f8e5fb2e931 (46)
- A pxr/usd/usdText/init.py https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-c293804e392e59fa34307a95ff84b9995aff8a23f82ee11696a71138e548b9d0 (26)
- A pxr/usd/usdText/api.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-33547d3eb3a3eb383deca69455aa19f6d21da023c69893d7a7fe1a29208addc9 (30)
- A pxr/usd/usdText/columnStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dcee45601e2952269f77c4f7d751f8e0a785dc2bc877da2585a6dca9132a34f4 (217)
- A pxr/usd/usdText/columnStyle.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-cdaf98a7588ef02dbdf1229fbff849198d6456ea7becb207c6e79cf41b2a1350 (279)
- A pxr/usd/usdText/columnStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dd309814987cb89b96216e3936e745c3414b4fffaab2aa2316b568897044e3ca (190)
- A pxr/usd/usdText/columnStyleAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-f1230744b1989dc06dd198b15eb612a9d512c5ee95e917f503d35c6426211110 (251)
- A pxr/usd/usdText/generatedSchema.usda https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-50f86c38e0970f85a63dac0eca13722224ac8c467aab5cada65812cc5aaf8f0a (286)
- A pxr/usd/usdText/markupText.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-207740fe179bcf26fd040db8e7251cd84b3384f9029ea832fc555ea37fdc391e (235)
- A pxr/usd/usdText/markupText.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-69cf0cf962e426a7bdad449be1c59d957834baa2744012b6289250a6854d16ff (307)
- A pxr/usd/usdText/module.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-705d4f34b80248421b4b0e583d35ca6bd0e9794f456c0a1c077d46fd4d7af6eb (38)
- A pxr/usd/usdText/moduleDeps.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-54927bf1dece27f7c5a59cc5fc76b7a9c6188aaf495bfede109fddd132d15952 (48)
- A pxr/usd/usdText/paragraphStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a09a51ef2045710cb2b215cc22c8a6eb9fb145f91c66d59f0fc3be5cee013843 (289)
- A pxr/usd/usdText/paragraphStyle.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-e671575557601a7d33d2c97283fdceeab593419303f71c247e28a53a4a023d67 (401)
- A pxr/usd/usdText/paragraphStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-4b76fc569350f762ce0fbdd195c486bbef319f56d752de4cf0daebc112dc1974 (188)
- A pxr/usd/usdText/paragraphStyleAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-04420ce68d34926fe480405ee0219af8972fb947e1bf3be8234b9865872e4817 (252)
- A pxr/usd/usdText/pch.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-17c84f07bc3cc5b8f8b72b2922240e6bdeb186b705d906c0c481d036be39e852 (107)
- A pxr/usd/usdText/plugInfo.json https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-4ab4b4639bd8c1d223b5f48f7eae1dfebc3cb8bb66f62916f45976666661991d (79)
- A pxr/usd/usdText/schema.usda https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-9f115a8f8bfd467c6acbb1bd48ff067d2b3401c1ad56583a6ffb10ddc4ad9fd3 (269)
- A pxr/usd/usdText/textLayoutAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-59a0a72ea4111f085006a3ce79ba48037e366f40e0d46eb3c23aae7913449db3 (162)
- A pxr/usd/usdText/textLayoutAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-cc9238cbb7d2ebf97f0d8fd48bb2c7c27a5f2d399e5c654dc2ebf0fe02cda99e (223)
- A pxr/usd/usdText/tokens.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-3838ff9fe60b9f9a9d1cc79e4598ef87e6fd6d241e3b27a8e4072d90e146b140 (127)
- A pxr/usd/usdText/tokens.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a7e6892df0362c15a512d2a49ae67cae2d5df8ce7296b90d786dbef2c96448c8 (276)
- A pxr/usd/usdText/wrapColumnStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-2272a652a2838f42efc352ac7347be882af2b4a5b63b0c4f9bd370dc87dac87f (177)
- A pxr/usd/usdText/wrapColumnStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-e69f00d019591e28f7fbcbb39cffd4b0f789945296b3c993e079f6ee3c60801a (139)
- A pxr/usd/usdText/wrapMarkupText.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-25e151cb8e39c5e970ea97eebefef04804116d3e9d9c096bd0696ac6cf661b13 (191)
- A pxr/usd/usdText/wrapParagraphStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dec138fc23d6f02dc60f49c7a863b8090a4f1d7bae1c00828e58c2c3c8c9407a (233)
- A pxr/usd/usdText/wrapParagraphStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-16b3159a109ce19fbb539918cc4355bd897200d316ab534245726a994f6b3a29 (139)
- A pxr/usd/usdText/wrapTextLayoutAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-b6f31eb99eb4d5d2dc6a3123464888c534e45ba8e96c76862a8007f04c793316 (157)
- A pxr/usd/usdText/wrapTokens.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-8364bceec0db01c35e95dad1519503f52f3dd320b23e05fc7dd654f58bb95fe3 (74)
Patch Links:
- https://github.com/PixarAnimationStudios/OpenUSD/pull/3259.patch
- https://github.com/PixarAnimationStudios/OpenUSD/pull/3259.diff
— Reply to this email directly, view it on GitHub https://github.com/PixarAnimationStudios/OpenUSD/pull/3259, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABPOU2BS7ZGCWSWLHTN6OPTZT7A5TAVCNFSM6AAAAABNLP5UTSVHI2DSMVQWIX3LMV43ASLTON2WKOZSGQ4TKOJSGQ3DCMY . You are receiving this because you are subscribed to this thread.Message ID: @.***>
That goes for all generated files, actually, except inside the “Custom” sections.
On Thu, Aug 29, 2024 at 6:09 PM Erika Harrison @.***> wrote:
Description of Change(s)
A new geometry schema MarkupText and its associated property schema ColumnLayout and ParagraphLayout were defined in pxr/usd/usdText/schema.usda. MarkupText also uses property schema TextStyle which is defined by SimpleText.
Several schemas boilerplate files were generated by calling usdGenSchema on schema.usda. Comment "Script generated file" is added to each usdGenSchema generated file to help the reviewer identify and ignore them.
Details of MarkupText and its style and layout schema were defined in the Text proposal https://github.com/PixarAnimationStudios/OpenUSD-proposals/blob/main/proposals/text/README.md . PR of the Text proposal can be accessed here https://github.com/PixarAnimationStudios/OpenUSD-proposals/pull/24. Feedback on the proposal is also appreciated.
There is no unit tests created in this PR since tests for MarkupText would require the implementation of SimpleText (which is in another PR). We will add the unit tests in this PR after the SimpleText is merged in dev: #3258 https://github.com/PixarAnimationStudios/OpenUSD/pull/3258
This supersedes prior #3002 https://github.com/PixarAnimationStudios/OpenUSD/pull/3002. Fixes Issue(s)
N/A
I have verified that all unit tests pass with the proposed changes
I have submitted a signed Contributor License Agreement
You can view, comment on, or merge this pull request online at:
https://github.com/PixarAnimationStudios/OpenUSD/pull/3259 Commit Summary
- 18f133d https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/commits/18f133db1bad4045566c25e59067622b47c2ebca Add the schema for MarkupText
File Changes
(31 files https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files)
- M pxr/usd/CMakeLists.txt https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-608d12e25b51003a9c1c79710630ffe4b9dc33a76c7afd6c60a797ea342f5780 (1)
- A pxr/usd/usdText/CMakeLists.txt https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a19fafa050001dd5757e7ac61960cd4da789af8515fe7b34fcf36f8e5fb2e931 (46)
- A pxr/usd/usdText/init.py https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-c293804e392e59fa34307a95ff84b9995aff8a23f82ee11696a71138e548b9d0 (26)
- A pxr/usd/usdText/api.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-33547d3eb3a3eb383deca69455aa19f6d21da023c69893d7a7fe1a29208addc9 (30)
- A pxr/usd/usdText/columnStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dcee45601e2952269f77c4f7d751f8e0a785dc2bc877da2585a6dca9132a34f4 (217)
- A pxr/usd/usdText/columnStyle.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-cdaf98a7588ef02dbdf1229fbff849198d6456ea7becb207c6e79cf41b2a1350 (279)
- A pxr/usd/usdText/columnStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dd309814987cb89b96216e3936e745c3414b4fffaab2aa2316b568897044e3ca (190)
- A pxr/usd/usdText/columnStyleAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-f1230744b1989dc06dd198b15eb612a9d512c5ee95e917f503d35c6426211110 (251)
- A pxr/usd/usdText/generatedSchema.usda https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-50f86c38e0970f85a63dac0eca13722224ac8c467aab5cada65812cc5aaf8f0a (286)
- A pxr/usd/usdText/markupText.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-207740fe179bcf26fd040db8e7251cd84b3384f9029ea832fc555ea37fdc391e (235)
- A pxr/usd/usdText/markupText.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-69cf0cf962e426a7bdad449be1c59d957834baa2744012b6289250a6854d16ff (307)
- A pxr/usd/usdText/module.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-705d4f34b80248421b4b0e583d35ca6bd0e9794f456c0a1c077d46fd4d7af6eb (38)
- A pxr/usd/usdText/moduleDeps.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-54927bf1dece27f7c5a59cc5fc76b7a9c6188aaf495bfede109fddd132d15952 (48)
- A pxr/usd/usdText/paragraphStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a09a51ef2045710cb2b215cc22c8a6eb9fb145f91c66d59f0fc3be5cee013843 (289)
- A pxr/usd/usdText/paragraphStyle.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-e671575557601a7d33d2c97283fdceeab593419303f71c247e28a53a4a023d67 (401)
- A pxr/usd/usdText/paragraphStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-4b76fc569350f762ce0fbdd195c486bbef319f56d752de4cf0daebc112dc1974 (188)
- A pxr/usd/usdText/paragraphStyleAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-04420ce68d34926fe480405ee0219af8972fb947e1bf3be8234b9865872e4817 (252)
- A pxr/usd/usdText/pch.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-17c84f07bc3cc5b8f8b72b2922240e6bdeb186b705d906c0c481d036be39e852 (107)
- A pxr/usd/usdText/plugInfo.json https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-4ab4b4639bd8c1d223b5f48f7eae1dfebc3cb8bb66f62916f45976666661991d (79)
- A pxr/usd/usdText/schema.usda https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-9f115a8f8bfd467c6acbb1bd48ff067d2b3401c1ad56583a6ffb10ddc4ad9fd3 (269)
- A pxr/usd/usdText/textLayoutAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-59a0a72ea4111f085006a3ce79ba48037e366f40e0d46eb3c23aae7913449db3 (162)
- A pxr/usd/usdText/textLayoutAPI.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-cc9238cbb7d2ebf97f0d8fd48bb2c7c27a5f2d399e5c654dc2ebf0fe02cda99e (223)
- A pxr/usd/usdText/tokens.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-3838ff9fe60b9f9a9d1cc79e4598ef87e6fd6d241e3b27a8e4072d90e146b140 (127)
- A pxr/usd/usdText/tokens.h https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-a7e6892df0362c15a512d2a49ae67cae2d5df8ce7296b90d786dbef2c96448c8 (276)
- A pxr/usd/usdText/wrapColumnStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-2272a652a2838f42efc352ac7347be882af2b4a5b63b0c4f9bd370dc87dac87f (177)
- A pxr/usd/usdText/wrapColumnStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-e69f00d019591e28f7fbcbb39cffd4b0f789945296b3c993e079f6ee3c60801a (139)
- A pxr/usd/usdText/wrapMarkupText.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-25e151cb8e39c5e970ea97eebefef04804116d3e9d9c096bd0696ac6cf661b13 (191)
- A pxr/usd/usdText/wrapParagraphStyle.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-dec138fc23d6f02dc60f49c7a863b8090a4f1d7bae1c00828e58c2c3c8c9407a (233)
- A pxr/usd/usdText/wrapParagraphStyleAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-16b3159a109ce19fbb539918cc4355bd897200d316ab534245726a994f6b3a29 (139)
- A pxr/usd/usdText/wrapTextLayoutAPI.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-b6f31eb99eb4d5d2dc6a3123464888c534e45ba8e96c76862a8007f04c793316 (157)
- A pxr/usd/usdText/wrapTokens.cpp https://github.com/PixarAnimationStudios/OpenUSD/pull/3259/files#diff-8364bceec0db01c35e95dad1519503f52f3dd320b23e05fc7dd654f58bb95fe3 (74)
Patch Links:
- https://github.com/PixarAnimationStudios/OpenUSD/pull/3259.patch
- https://github.com/PixarAnimationStudios/OpenUSD/pull/3259.diff
— Reply to this email directly, view it on GitHub https://github.com/PixarAnimationStudios/OpenUSD/pull/3259, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABPOU2BS7ZGCWSWLHTN6OPTZT7A5TAVCNFSM6AAAAABNLP5UTSVHI2DSMVQWIX3LMV43ASLTON2WKOZSGQ4TKOJSGQ3DCMY . You are receiving this because you are subscribed to this thread.Message ID: @.***>
And finally realized “comment” meant GitHub comment, not source file comment. Sorry for the noise!
Filed as internal issue #USD-10050
/AzurePipelines run
Azure Pipelines successfully started running 1 pipeline(s).