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.

Sign up for GitHub

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

Jump to bottom

Support dfn types short syntax, "for", (no)export #134

Merged
merged 4 commits into from
Sep 15, 2020
Merged

Support dfn types short syntax, "for", (no)export #134

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9accf9d
Support dfn types short syntax, "for", (no)export
sideshowbarker Aug 29, 2020
3141894
Actually replace "data-noexport" with "noexport"
sideshowbarker Sep 7, 2020
cb15645
Fail with an error if export used w/ dfn type
sideshowbarker Sep 7, 2020
385c4e0
Recognize all dfn types (not just a subset)
sideshowbarker Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/wattsi.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,19 @@ TCrossReferences = record
const
CommitSnapshotBaseURL: AnsiString = '/commit-snapshots/';
SourceGitBaseURL: AnsiString = 'https://github.com/whatwg/html/commit/';
kExport = 'export';
kDataExport = 'data-export';
kFor = 'for';
kDataDFNFor = 'data-dfn-for';
kDataDFNType = 'data-dfn-type';
// NOTE: The following array has the subset of dfn types we actually use
// in HTML currently. The full set of ~40 supported dfn types is at
// https://github.com/tabatkins/bikeshed/blob/master/bikeshed/config/dfnTypes.py#L7
// So if we ever start using any types other than the following in HTML,
// then at that time we will also need to update this array.
sideshowbarker marked this conversation as resolved.
Show resolved Hide resolved
kDFNTypes: array[1..9] of UTF8String =
('element', 'element-attr', 'event', 'interface', 'extended-attribute',
'method', 'attribute', 'enum-value', 'http-header');
var
CandidateChild, SelectedForTransfer: TNode;
CurrentHeadingRank: THeadingRank;
Expand All @@ -1104,6 +1117,7 @@ TCrossReferences = record
DFNEntry: TDFNEntry;
ID, HeadingText, ParentHeadingText, SectionNumber, ParentSectionNumber: UTF8String;
ClassValue: String = '';
DFNType: UTF8String = '';
begin
Result := True;
if (Node is TElement) then
Expand Down Expand Up @@ -1399,6 +1413,23 @@ TCrossReferences = record
begin
if (Element.HasAttribute(kLTAttribute)) then
Fail('<dfn> with lt="" found, use data-x="" instead; dfn is ' + Describe(Element));
if (Element.HasAttribute(kFor)) then
begin
ExtractedData := Element.GetAttribute(kFor);
Element.SetAttributeDestructively(kDataDFNFor, ExtractedData);
Element.RemoveAttribute(kFor);
end;
if (Element.HasAttribute(kExport)) then
begin
Element.SetAttribute(kDataExport, '');
Element.RemoveAttribute(kExport);
end;
for DFNType in kDFNTypes do
if (Element.HasAttribute(DFnType)) then
begin
Element.SetAttribute(kDataDFNType, DFNType);
Element.RemoveAttribute(DFnType);
end;
CrossReferenceName := GetTopicIdentifier(Element);
if (Assigned(InDFN)) then
Fail('Nested <dfn>: ' + Describe(Element));
Expand Down