Skip to content

Commit 7656471

Browse files
committed
Follow changes in WD-css-content-3-20160602
See also: https://www.w3.org/TR/2016/WD-css-content-3-20160602/
1 parent ac036ac commit 7656471

File tree

6 files changed

+26
-35
lines changed

6 files changed

+26
-35
lines changed

after/syntax/css/css-content-3.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
syn match cssGeneratedContentProp contained "\<string-set\>"
2+
syn match cssGeneratedContentProp contained "\<bookmark-\(label\|level\|state\)\>"
3+
syn keyword cssGeneratedContentAttr contained open closed
4+
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(leader\|string\|target-\(counter\|counters\|text\)\)\s*(" end=")" oneline keepend

after/syntax/css/css-gcpm-3.vim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
syn keyword cssGeneratedContentProp contained running
2-
syn match cssGeneratedContentProp contained "\<string-set\>"
32
syn match cssGeneratedContentProp contained "\<footnote-\(display\|policy\)\>"
4-
syn match cssGeneratedContentProp contained "\<bookmark-\(label\|level\|state\)\>"
5-
syn keyword cssGeneratedContentAttr contained footnote line open closed
6-
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(string\|running\|element\|leader\|target-\(counter\|counters\|text\)\)\s*(" end=")" oneline keepend
3+
syn keyword cssGeneratedContentAttr contained footnote line
4+
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(element\|running\)\s*(" end=")" oneline keepend
75
syn match cssPseudoClassId contained "\<footnote-\(call\|marker\)\>"

after/syntax/css/css3-content.vim

Lines changed: 0 additions & 3 deletions
This file was deleted.

after/syntax/html.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ syn include @htmlCss syntax/css/css-backgrounds-4.vim
44
syn include @htmlCss syntax/css/css-break-3.vim
55
syn include @htmlCss syntax/css/css-cascade-3.vim
66
syn include @htmlCss syntax/css/css-cascade-4.vim
7+
syn include @htmlCss syntax/css/css-content-3.vim
78
syn include @htmlCss syntax/css/css-counter-styles-3.vim
89
syn include @htmlCss syntax/css/css-device-adapt-1.vim
910
syn include @htmlCss syntax/css/css-display-3.vim
@@ -39,7 +40,6 @@ syn include @htmlCss syntax/css/css3-background.vim
3940
syn include @htmlCss syntax/css/css3-box.vim
4041
syn include @htmlCss syntax/css/css3-colors.vim
4142
syn include @htmlCss syntax/css/css3-conditional.vim
42-
syn include @htmlCss syntax/css/css3-content.vim
4343
syn include @htmlCss syntax/css/css3-exclusions.vim
4444
syn include @htmlCss syntax/css/css3-fonts.vim
4545
syn include @htmlCss syntax/css/css3-images.vim

test/test.css

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,13 @@
119119
}
120120

121121
.content {
122-
move-to: inhibit;
123-
page-policy: here;
124-
display: first;
125-
display: last;
122+
string-set: open;
123+
bookmark-level: closed;
124+
bookmark-label: leader('.');
125+
bookmark-state: string(heading, first);
126+
display: target-counter(attr(href url), page);
127+
display: target-counters(lack-of-example);
128+
display: target-text(attr(href url));
126129
}
127130

128131
@counter-style counter-style {
@@ -268,17 +271,10 @@
268271

269272
.gcpm::footnote-call,
270273
.gcpm::footnote-marker {
271-
string-set: string(heading, first);
272274
running: running(heading);
273275
footnote-display: element(header);
274276
footnote-policy: footnote;
275-
bookmark-label: line;
276-
bookmark-level: leader('.');
277-
bookmark-state: target-counter(attr(href url), page);
278-
display: target-counters(lack-of-example);
279-
display: target-text(attr(href url));
280-
display: open;
281-
display: closed;
277+
display: line;
282278
}
283279

284280
.geometry-1 {

test/test.html

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,13 @@
140140
</style>
141141
<style>
142142
.content {
143-
move-to: inhibit;
144-
page-policy: here;
145-
display: first;
146-
display: last;
143+
string-set: open;
144+
bookmark-level: closed;
145+
bookmark-label: leader('.');
146+
bookmark-state: string(heading, first);
147+
display: target-counter(attr(href url), page);
148+
display: target-counters(lack-of-example);
149+
display: target-text(attr(href url));
147150
}
148151
</style>
149152
<style>
@@ -300,17 +303,10 @@
300303
<style>
301304
.gcpm::footnote-call,
302305
.gcpm::footnote-marker {
303-
string-set: string(heading, first);
304-
running: running(heading);
305-
footnote-display: element(header);
306-
footnote-policy: footnote;
307-
bookmark-label: line;
308-
bookmark-level: leader('.');
309-
bookmark-state: target-counter(attr(href url), page);
310-
display: target-counters(lack-of-example);
311-
display: target-text(attr(href url));
312-
display: open;
313-
display: closed;
306+
running: footnote;
307+
footnote-display: line;
308+
footnote-policy: element(header);
309+
display: running(heading);
314310
}
315311
</style>
316312
<style>

0 commit comments

Comments
 (0)