diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 00:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 00:08:19 +0300 |
| commit | 13aa07d3396762695fe47b0898dd346854b3993c (patch) | |
| tree | 59e0bb92da3c82ae26a0609f24dd991109d2cfde /glfm_specification | |
| parent | d4e22f4ade1ce4dfd54f4d1740f074b2be441705 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'glfm_specification')
8 files changed, 499 insertions, 94 deletions
diff --git a/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml index e986f5309e8..501d06692ea 100644 --- a/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml +++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_example_status.yml @@ -78,3 +78,33 @@ skip_running_conformance_wysiwyg_tests: Example currently fails. See https://gitlab.com/gitlab-org/gitlab/-/issues/383866 skip_running_snapshot_wysiwyg_html_tests: Example currently fails. See https://gitlab.com/gitlab-org/gitlab/-/issues/383866 skip_running_snapshot_prosemirror_json_tests: Example currently fails. See https://gitlab.com/gitlab-org/gitlab/-/issues/383866 +08_05_00__gitlab_internal_extension_markdown__image_attributes__001: + skip_update_example_snapshot_html_wysiwyg: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_update_example_snapshot_prosemirror_json: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_conformance_wysiwyg_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_wysiwyg_html_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_prosemirror_json_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 +08_05_00__gitlab_internal_extension_markdown__image_attributes__002: + skip_update_example_snapshot_html_wysiwyg: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_update_example_snapshot_prosemirror_json: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_conformance_wysiwyg_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_wysiwyg_html_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_prosemirror_json_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 +08_05_00__gitlab_internal_extension_markdown__image_attributes__003: + skip_update_example_snapshot_html_wysiwyg: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_update_example_snapshot_prosemirror_json: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_conformance_wysiwyg_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_wysiwyg_html_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_prosemirror_json_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 +08_05_00__gitlab_internal_extension_markdown__image_attributes__004: + skip_update_example_snapshot_html_wysiwyg: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_update_example_snapshot_prosemirror_json: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_conformance_wysiwyg_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_wysiwyg_html_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_prosemirror_json_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 +08_05_00__gitlab_internal_extension_markdown__image_attributes__005: + skip_update_example_snapshot_html_wysiwyg: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_update_example_snapshot_prosemirror_json: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_conformance_wysiwyg_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_wysiwyg_html_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 + skip_running_snapshot_prosemirror_json_tests: WYSYWIG and prosemirror examples not generated correctly. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106733#note_1206201340 diff --git a/glfm_specification/input/gitlab_flavored_markdown/glfm_internal_extensions.md b/glfm_specification/input/gitlab_flavored_markdown/glfm_internal_extensions.md index 4d5b16b7ec0..63518a93f71 100644 --- a/glfm_specification/input/gitlab_flavored_markdown/glfm_internal_extensions.md +++ b/glfm_specification/input/gitlab_flavored_markdown/glfm_internal_extensions.md @@ -696,4 +696,54 @@ Fernstraßen<wbr>bau<wbr>privat<wbr>finanzierungs<wbr>gesetz . TODO: Write canonical HTML for this example ```````````````````````````````` + +## Image Attributes + +See +[Change the image dimensions](https://docs.gitlab.com/ee/user/markdown.html#change-the-image-dimensions) +in the GitLab Flavored Markdown documentation. + +The `width` and `height` attributes for an image can be specified directly after +the image markdown. + +General syntax conforms to the +[commonmark-hs attribute syntax](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md) +where it makes sense. + +```````````````````````````````` example gitlab +{width="100" height="100"} +. +<p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> +```````````````````````````````` + +`%` and `px` units may also be specified. + +```````````````````````````````` example gitlab +{width="100%"} +. +<p><img src="https://gitlab.com/logo.png" width="100%"></p> +```````````````````````````````` + +```````````````````````````````` example gitlab +{height="100px"} +. +<p><img src="https://gitlab.com/logo.png" height="100px"></p> +```````````````````````````````` + +Whitespace is tolerated around the delimiters: + +```````````````````````````````` example gitlab +{ width="100" height="100" } +. +<p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> +```````````````````````````````` + +Attributes must immediately follow the image markdown. + +```````````````````````````````` example gitlab + {width="100" height="100"} +. +<p><img src="https://gitlab.com/logo.png"> {width="100" height="100"}</p> +```````````````````````````````` + <!-- END TESTS --> diff --git a/glfm_specification/output_example_snapshots/examples_index.yml b/glfm_specification/output_example_snapshots/examples_index.yml index 934be77ebd5..d08f16c7313 100644 --- a/glfm_specification/output_example_snapshots/examples_index.yml +++ b/glfm_specification/output_example_snapshots/examples_index.yml @@ -2240,3 +2240,18 @@ 08_04_52__gitlab_internal_extension_markdown__migrated_golden_master_examples__word_break__001: spec_example_position: 749 source_specification: gitlab +08_05_00__gitlab_internal_extension_markdown__image_attributes__001: + spec_example_position: 750 + source_specification: gitlab +08_05_00__gitlab_internal_extension_markdown__image_attributes__002: + spec_example_position: 751 + source_specification: gitlab +08_05_00__gitlab_internal_extension_markdown__image_attributes__003: + spec_example_position: 752 + source_specification: gitlab +08_05_00__gitlab_internal_extension_markdown__image_attributes__004: + spec_example_position: 753 + source_specification: gitlab +08_05_00__gitlab_internal_extension_markdown__image_attributes__005: + spec_example_position: 754 + source_specification: gitlab diff --git a/glfm_specification/output_example_snapshots/html.yml b/glfm_specification/output_example_snapshots/html.yml index c724f670bb5..06e88ce4b81 100644 --- a/glfm_specification/output_example_snapshots/html.yml +++ b/glfm_specification/output_example_snapshots/html.yml @@ -8625,3 +8625,28 @@ <p data-sourcepos="1:1-1:60" dir="auto">Fernstraßen<wbr>bau<wbr>privat<wbr>finanzierungs<wbr>gesetz</wbr></wbr></wbr></wbr></p> wysiwyg: |- <p>Fernstraßenbauprivatfinanzierungsgesetz</p> +08_05_00__gitlab_internal_extension_markdown__image_attributes__001: + canonical: | + <p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> + static: |- + <p data-sourcepos="1:1-1:58" dir="auto"><a class="no-attachment-icon" href="https://gitlab.com/logo.png" target="_blank" rel="nofollow noreferrer noopener"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="" width="100" height="100" decoding="async" class="lazy" data-src="https://gitlab.com/logo.png"></a></p> +08_05_00__gitlab_internal_extension_markdown__image_attributes__002: + canonical: | + <p><img src="https://gitlab.com/logo.png" width="100%"></p> + static: |- + <p data-sourcepos="1:1-1:46" dir="auto"><a class="no-attachment-icon" href="https://gitlab.com/logo.png" target="_blank" rel="nofollow noreferrer noopener"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="" width="100%" decoding="async" class="lazy" data-src="https://gitlab.com/logo.png"></a></p> +08_05_00__gitlab_internal_extension_markdown__image_attributes__003: + canonical: | + <p><img src="https://gitlab.com/logo.png" height="100px"></p> + static: |- + <p data-sourcepos="1:1-1:48" dir="auto"><a class="no-attachment-icon" href="https://gitlab.com/logo.png" target="_blank" rel="nofollow noreferrer noopener"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="" height="100px" decoding="async" class="lazy" data-src="https://gitlab.com/logo.png"></a></p> +08_05_00__gitlab_internal_extension_markdown__image_attributes__004: + canonical: | + <p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> + static: |- + <p data-sourcepos="1:1-1:60" dir="auto"><a class="no-attachment-icon" href="https://gitlab.com/logo.png" target="_blank" rel="nofollow noreferrer noopener"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="" width="100" height="100" decoding="async" class="lazy" data-src="https://gitlab.com/logo.png"></a></p> +08_05_00__gitlab_internal_extension_markdown__image_attributes__005: + canonical: | + <p><img src="https://gitlab.com/logo.png"> {width="100" height="100"}</p> + static: |- + <p data-sourcepos="1:1-1:59" dir="auto"><a class="no-attachment-icon" href="https://gitlab.com/logo.png" target="_blank" rel="nofollow noreferrer noopener"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="" decoding="async" class="lazy" data-src="https://gitlab.com/logo.png"></a> {width="100" height="100"}</p> diff --git a/glfm_specification/output_example_snapshots/markdown.yml b/glfm_specification/output_example_snapshots/markdown.yml index 29fce0bccfb..c5145803088 100644 --- a/glfm_specification/output_example_snapshots/markdown.yml +++ b/glfm_specification/output_example_snapshots/markdown.yml @@ -2547,3 +2547,13 @@  08_04_52__gitlab_internal_extension_markdown__migrated_golden_master_examples__word_break__001: | Fernstraßen<wbr>bau<wbr>privat<wbr>finanzierungs<wbr>gesetz +08_05_00__gitlab_internal_extension_markdown__image_attributes__001: | + {width="100" height="100"} +08_05_00__gitlab_internal_extension_markdown__image_attributes__002: | + {width="100%"} +08_05_00__gitlab_internal_extension_markdown__image_attributes__003: | + {height="100px"} +08_05_00__gitlab_internal_extension_markdown__image_attributes__004: | + { width="100" height="100" } +08_05_00__gitlab_internal_extension_markdown__image_attributes__005: | +  {width="100" height="100"} diff --git a/glfm_specification/output_example_snapshots/prosemirror_json.yml b/glfm_specification/output_example_snapshots/prosemirror_json.yml index a654cacfca6..f6110185348 100644 --- a/glfm_specification/output_example_snapshots/prosemirror_json.yml +++ b/glfm_specification/output_example_snapshots/prosemirror_json.yml @@ -7,7 +7,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -26,7 +27,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -45,7 +47,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -119,7 +122,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -148,7 +152,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -181,7 +186,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -204,7 +210,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -439,7 +446,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -993,7 +1001,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -1441,7 +1450,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -1706,6 +1716,7 @@ "attrs": { "language": "yaml", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -1762,6 +1773,7 @@ "attrs": { "language": "yaml", "class": "code highlight", + "langParams": null, "isFrontmatter": true } } @@ -1806,7 +1818,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -1977,7 +1990,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2084,7 +2098,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2103,7 +2118,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2122,7 +2138,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2156,7 +2173,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2196,7 +2214,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2221,7 +2240,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2243,7 +2263,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2262,7 +2283,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2281,7 +2303,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2300,7 +2323,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2319,7 +2343,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2358,7 +2383,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2377,7 +2403,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2396,7 +2423,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2415,7 +2443,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2434,7 +2463,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -2447,7 +2477,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2472,7 +2503,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2502,7 +2534,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -2515,7 +2548,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -2528,7 +2562,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2547,7 +2582,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2566,7 +2602,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2585,7 +2622,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2604,7 +2642,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2623,7 +2662,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2642,7 +2682,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2676,7 +2717,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2704,7 +2746,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2744,7 +2787,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2775,7 +2819,8 @@ "type": "codeBlock", "attrs": { "language": "ruby", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2794,7 +2839,8 @@ "type": "codeBlock", "attrs": { "language": "ruby", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2813,7 +2859,8 @@ "type": "codeBlock", "attrs": { "language": ";", - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -2850,7 +2897,8 @@ "type": "codeBlock", "attrs": { "language": "aa", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -2869,7 +2917,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -3641,7 +3690,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -3663,7 +3713,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -3861,7 +3912,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -4583,7 +4635,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -4611,7 +4664,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -5124,7 +5178,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6090,7 +6145,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6257,7 +6313,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6272,7 +6329,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6297,7 +6355,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -6315,7 +6374,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null } } ] @@ -6749,7 +6809,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6796,7 +6857,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6851,7 +6913,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -6987,7 +7050,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7230,7 +7294,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7297,7 +7362,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7455,7 +7521,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7497,7 +7564,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7520,7 +7588,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7542,7 +7611,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7574,7 +7644,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7596,7 +7667,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7632,7 +7704,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7654,7 +7727,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7801,7 +7875,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -7822,7 +7897,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -8120,7 +8196,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -8179,7 +8256,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -8238,7 +8316,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -8278,7 +8357,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -8316,7 +8396,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -9410,7 +9491,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -9705,7 +9787,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -9991,7 +10074,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10195,7 +10279,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10323,7 +10408,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10663,7 +10749,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10682,7 +10769,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10808,7 +10896,8 @@ "type": "codeBlock", "attrs": { "language": "foo+bar", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -10996,7 +11085,8 @@ "type": "codeBlock", "attrs": { "language": "föö", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -11035,7 +11125,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -14577,6 +14668,8 @@ "title": "*", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": false } } @@ -15723,6 +15816,8 @@ "title": null, "uploading": false, "canonicalSrc": "moon.jpg", + "width": null, + "height": null, "isReference": false }, "marks": [ @@ -15851,6 +15946,8 @@ "title": null, "uploading": false, "canonicalSrc": "uri3", + "width": null, + "height": null, "isReference": false } } @@ -16265,6 +16362,8 @@ "title": null, "uploading": false, "canonicalSrc": "moon.jpg", + "width": null, + "height": null, "isReference": false }, "marks": [ @@ -18112,6 +18211,8 @@ "title": "title", "uploading": false, "canonicalSrc": "/url", + "width": null, + "height": null, "isReference": false } } @@ -18134,6 +18235,8 @@ "title": "train & tracks", "uploading": false, "canonicalSrc": "foo *bar*", + "width": null, + "height": null, "isReference": true } } @@ -18170,6 +18273,8 @@ "title": null, "uploading": false, "canonicalSrc": "/url2", + "width": null, + "height": null, "isReference": false } } @@ -18192,6 +18297,8 @@ "title": null, "uploading": false, "canonicalSrc": "/url2", + "width": null, + "height": null, "isReference": false } } @@ -18214,6 +18321,8 @@ "title": "train & tracks", "uploading": false, "canonicalSrc": "foo *bar*", + "width": null, + "height": null, "isReference": true } } @@ -18250,6 +18359,8 @@ "title": "train & tracks", "uploading": false, "canonicalSrc": "foobar", + "width": null, + "height": null, "isReference": true } } @@ -18286,6 +18397,8 @@ "title": null, "uploading": false, "canonicalSrc": "train.jpg", + "width": null, + "height": null, "isReference": false } } @@ -18312,6 +18425,8 @@ "title": "title", "uploading": false, "canonicalSrc": "/path/to/train.jpg", + "width": null, + "height": null, "isReference": false } } @@ -18334,6 +18449,8 @@ "title": null, "uploading": false, "canonicalSrc": "url", + "width": null, + "height": null, "isReference": false } } @@ -18356,6 +18473,8 @@ "title": null, "uploading": false, "canonicalSrc": "/url", + "width": null, + "height": null, "isReference": false } } @@ -18378,6 +18497,8 @@ "title": null, "uploading": false, "canonicalSrc": "bar", + "width": null, + "height": null, "isReference": true } } @@ -18414,6 +18535,8 @@ "title": null, "uploading": false, "canonicalSrc": "bar", + "width": null, + "height": null, "isReference": true } } @@ -18450,6 +18573,8 @@ "title": "title", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": true } } @@ -18486,6 +18611,8 @@ "title": "title", "uploading": false, "canonicalSrc": "*foo* bar", + "width": null, + "height": null, "isReference": true } } @@ -18522,6 +18649,8 @@ "title": "title", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": true } } @@ -18558,6 +18687,8 @@ "title": "title", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": true } }, @@ -18598,6 +18729,8 @@ "title": "title", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": true } } @@ -18634,6 +18767,8 @@ "title": "title", "uploading": false, "canonicalSrc": "*foo* bar", + "width": null, + "height": null, "isReference": true } } @@ -18694,6 +18829,8 @@ "title": "title", "uploading": false, "canonicalSrc": "foo", + "width": null, + "height": null, "isReference": true } } @@ -20676,6 +20813,7 @@ "attrs": { "language": "yaml", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -20696,6 +20834,7 @@ "attrs": { "language": "toml", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -20716,6 +20855,7 @@ "attrs": { "language": "json", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -21025,6 +21165,8 @@ "title": null, "uploading": false, "canonicalSrc": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.png", + "width": null, + "height": null, "isReference": false } } @@ -21047,6 +21189,8 @@ "title": null, "uploading": false, "canonicalSrc": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.png", + "width": null, + "height": null, "isReference": false } } @@ -21069,6 +21213,8 @@ "title": null, "uploading": false, "canonicalSrc": "test-file.png", + "width": null, + "height": null, "isReference": false } } @@ -21635,7 +21781,8 @@ "type": "codeBlock", "attrs": { "language": "javascript", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -21654,7 +21801,8 @@ "type": "codeBlock", "attrs": { "language": null, - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -21673,7 +21821,8 @@ "type": "codeBlock", "attrs": { "language": "foobar", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -21895,7 +22044,8 @@ "type": "codeBlock", "attrs": { "language": "nomnoml", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { @@ -22120,6 +22270,7 @@ "attrs": { "language": "json", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -22140,6 +22291,7 @@ "attrs": { "language": "toml", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -22160,6 +22312,7 @@ "attrs": { "language": "yaml", "class": "code highlight", + "langParams": null, "isFrontmatter": true }, "content": [ @@ -22751,6 +22904,8 @@ "title": null, "uploading": false, "canonicalSrc": "https://gitlab.com/logo.png", + "width": null, + "height": null, "isReference": false } } @@ -22902,7 +23057,8 @@ "type": "codeBlock", "attrs": { "language": "math", - "class": "code highlight" + "class": "code highlight", + "langParams": null }, "content": [ { diff --git a/glfm_specification/output_example_snapshots/snapshot_spec.html b/glfm_specification/output_example_snapshots/snapshot_spec.html index 8e18c768c7d..080712d1b4e 100644 --- a/glfm_specification/output_example_snapshots/snapshot_spec.html +++ b/glfm_specification/output_example_snapshots/snapshot_spec.html @@ -363,6 +363,7 @@ <li><a href="#word_break">word_break</a></li> </ul> </li> +<li><a href="#image-attributes">Image Attributes</a></li> </ul> </li> </ul> @@ -13477,6 +13478,74 @@ also requires an EE license enabling the <code>group_wikis</code> feature:</p> <copy-code></copy-code> </div> </div> +<h2 data-sourcepos="15072:1-15072:19" dir="auto"> +<a id="user-content-image-attributes" class="anchor" href="#image-attributes" aria-hidden="true"></a>Image Attributes</h2> +<p data-sourcepos="15074:1-15076:46" dir="auto">See +<a href="https://docs.gitlab.com/ee/user/markdown.html#change-the-image-dimensions" rel="nofollow noreferrer noopener" target="_blank">Change the image dimensions</a> +in the GitLab Flavored Markdown documentation.</p> +<p data-sourcepos="15078:1-15079:19" dir="auto">The <code>width</code> and <code>height</code> attributes for an image can be specified directly after +the image markdown.</p> +<p data-sourcepos="15081:1-15083:21" dir="auto">General syntax conforms to the +<a href="https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md" rel="nofollow noreferrer noopener" target="_blank">commonmark-hs attribute syntax</a> +where it makes sense.</p> +<div> +<div><a href="#example-750">Example 750</a></div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15088:1-15090:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="example" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">{width="100" height="100"}</span></code></pre> +<copy-code></copy-code> +</div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15092:1-15094:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"><p><img src="https://gitlab.com/logo.png" width="100" height="100"></p></span></code></pre> +<copy-code></copy-code> +</div> +</div> +<p data-sourcepos="15097:1-15097:41" dir="auto"><code>%</code> and <code>px</code> units may also be specified.</p> +<div> +<div><a href="#example-751">Example 751</a></div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15102:1-15104:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="example" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">{width="100%"}</span></code></pre> +<copy-code></copy-code> +</div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15106:1-15108:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"><p><img src="https://gitlab.com/logo.png" width="100%"></p></span></code></pre> +<copy-code></copy-code> +</div> +</div> +<div> +<div><a href="#example-752">Example 752</a></div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15114:1-15116:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="example" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">{height="100px"}</span></code></pre> +<copy-code></copy-code> +</div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15118:1-15120:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"><p><img src="https://gitlab.com/logo.png" height="100px"></p></span></code></pre> +<copy-code></copy-code> +</div> +</div> +<p data-sourcepos="15123:1-15123:46" dir="auto">Whitespace is tolerated around the delimiters:</p> +<div> +<div><a href="#example-753">Example 753</a></div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15128:1-15130:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="example" v-pre="true"><code><span id="LC1" class="line" lang="plaintext">{ width="100" height="100" }</span></code></pre> +<copy-code></copy-code> +</div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15132:1-15134:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"><p><img src="https://gitlab.com/logo.png" width="100" height="100"></p></span></code></pre> +<copy-code></copy-code> +</div> +</div> +<p data-sourcepos="15137:1-15137:54" dir="auto">Attributes must immediately follow the image markdown.</p> +<div> +<div><a href="#example-754">Example 754</a></div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15142:1-15144:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="example" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"> {width="100" height="100"}</span></code></pre> +<copy-code></copy-code> +</div> +<div class="gl-relative markdown-code-block js-markdown-code"> +<pre data-sourcepos="15146:1-15148:32" lang="plaintext" class="code highlight js-syntax-highlight language-plaintext" data-canonical-lang="" v-pre="true"><code><span id="LC1" class="line" lang="plaintext"><p><img src="https://gitlab.com/logo.png"> {width="100" height="100"}</p></span></code></pre> +<copy-code></copy-code> +</div> +</div> </body> </html> diff --git a/glfm_specification/output_example_snapshots/snapshot_spec.md b/glfm_specification/output_example_snapshots/snapshot_spec.md index 8898857ba45..ccee9c1707e 100644 --- a/glfm_specification/output_example_snapshots/snapshot_spec.md +++ b/glfm_specification/output_example_snapshots/snapshot_spec.md @@ -10576,3 +10576,53 @@ Fernstraßen<wbr>bau<wbr>privat<wbr>finanzierungs<wbr>gesetz . TODO: Write canonical HTML for this example ```````````````````````````````` + +## Image Attributes + +See +[Change the image dimensions](https://docs.gitlab.com/ee/user/markdown.html#change-the-image-dimensions) +in the GitLab Flavored Markdown documentation. + +The `width` and `height` attributes for an image can be specified directly after +the image markdown. + +General syntax conforms to the +[commonmark-hs attribute syntax](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md) +where it makes sense. + +```````````````````````````````` example gitlab +{width="100" height="100"} +. +<p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> +```````````````````````````````` + +`%` and `px` units may also be specified. + +```````````````````````````````` example gitlab +{width="100%"} +. +<p><img src="https://gitlab.com/logo.png" width="100%"></p> +```````````````````````````````` + +```````````````````````````````` example gitlab +{height="100px"} +. +<p><img src="https://gitlab.com/logo.png" height="100px"></p> +```````````````````````````````` + +Whitespace is tolerated around the delimiters: + +```````````````````````````````` example gitlab +{ width="100" height="100" } +. +<p><img src="https://gitlab.com/logo.png" width="100" height="100"></p> +```````````````````````````````` + +Attributes must immediately follow the image markdown. + +```````````````````````````````` example gitlab + {width="100" height="100"} +. +<p><img src="https://gitlab.com/logo.png"> {width="100" height="100"}</p> +```````````````````````````````` + |