Skip to content

Commit 5fedf4a

Browse files
committed
Integrated WHAT WG and HTML WG Issue Tracker annotations by James Graham.
1 parent ae4702d commit 5fedf4a

File tree

5 files changed

+30
-8
lines changed

5 files changed

+30
-8
lines changed

Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ DIST_DIR := dist
99
SOURCE_FILES := $(wildcard build/*)
1010
CONFIGS := $(wildcard ${CONFIG_DIR}/*.conf)
1111
SPEC_SPLIT_STAMP := ${BUILD_DIR}/spec-split.stamp
12+
ISSUE_ANNOTATIONS := @ISSUE_ANNOTATIONS@
1213
SPECS := $(patsubst ${CONFIG_DIR}/%.conf, ${DIST_DIR}/%.html, $(CONFIGS))
1314

1415
help:
@@ -24,7 +25,7 @@ html5-hixie/source:
2425
${BUILD_DIR} ${DIST_DIR}:
2526
@mkdir -p $@
2627

27-
$(SPECS): ${SPEC_SPLIT_STAMP} ${BUILD_DIR} ${DIST_DIR}
28+
$(SPECS): ${SPEC_SPLIT_STAMP} ${BUILD_DIR} ${ISSUE_ANNOTATIONS} ${DIST_DIR}
2829
@echo "Building $(@F) specification..."
2930
@echo "Joining microsections into $(@F) specification..."
3031
@./bin/microjoin.py -d ${BUILD_DIR} -o tempspec-$(@F) ${CONFIG_DIR}/$(subst .html,.conf,$(@F))
@@ -42,6 +43,10 @@ ${SPEC_SPLIT_STAMP}: html5-hixie/source
4243
@cat ${BUILD_DIR}/source-html5.conf >> ${CONFIG_DIR}/html5-hixie.conf
4344
@touch ${SPEC_SPLIT_STAMP}
4445

46+
${ISSUE_ANNOTATIONS}:
47+
@echo "Generating ${ISSUE_ANNOTATIONS} (this can take 15-90 seconds)..."
48+
@wget -O ${ISSUE_ANNOTATIONS} "http://pimpmyspec.net/aquarium.py/annotations/output?spec_status=WD&annotations_url=http%3A%2F%2Fwww.whatwg.org%2Fspecs%2Fweb-apps%2Fcurrent-work%2Fstatus.cgi%3Faction%3Dget-all-annotations&tracker_url=http%3A%2F%2Fwww.w3.org%2Fhtml%2Fwg%2Ftracker%2F"
49+
4550
clean:
4651
@echo "Cleaning all build files and directories..."
4752
@rm -rf html5-hixie

configure.ac

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ AC_CONFIG_AUX_DIR(setup)
99
# Check for the existence of Anolis and Subversion
1010
ANOLIS=`pwd`/utils/anolis
1111
AC_CHECK_PROGS(SVN, svn /usr/bin/svn /usr/local/bin/svn, [not found], $PATH)
12+
AC_CHECK_PROGS(WGET, wget /usr/bin/wget /usr/local/bin/wget, [not found], $PATH)
13+
14+
ISSUE_ANNOTATIONS=build/issue-annotations.xml
1215

1316
# Setup the flags needed for Anolis
14-
ANOLIS_FLAGS="--w3c-compat-xref-a-placement --parser=lxml.html --output-encoding=us-ascii --allow-duplicate-dfns"
17+
ANOLIS_FLAGS="--w3c-compat-xref-a-placement --parser=lxml.html --output-encoding=us-ascii --allow-duplicate-dfns --annotations=$ISSUE_ANNOTATIONS --annotate-w3c-issues"
1518
AC_SUBST(ANOLIS_FLAGS)
1619

1720
# Generate the printable date string
@@ -29,14 +32,13 @@ AC_SUBST(YEAR)
2932
AC_SUBST(DATE_STRING)
3033
AC_SUBST(CONDENSED_DATE_STRING)
3134
AC_SUBST(ANOLIS)
35+
AC_SUBST(WGET)
36+
AC_SUBST(ISSUE_ANNOTATIONS)
3237

3338
# Ensure that Anolis and Subversion were found
34-
if test "x$ANOLIS" == "xnot found"; then
35-
echo "The configuration process was unable to find the anolis program on"
36-
echo "your system. Anolis is required to build the HTML5 Specification."
37-
echo "More information can be found on the Anolis website:"
38-
echo ""
39-
echo " http://anolis.gsnedders.com/"
39+
if test "x$WGET" == "xnot found"; then
40+
echo "The configuration process was unable to find the wget program on"
41+
echo "your system. Wget is required to build the HTML5 Specification."
4042
exit 0
4143
fi
4244

headers/header-w3c-html5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
.XXX { color: #E50000; background: white; border: solid red; padding: 0.5em; margin: 1em 0; }
9696
.XXX > :first-child { margin-top: 0; }
9797
p .XXX { line-height: 3em; }
98+
.annotation { border: solid thin black; background: #0C479D; color: white; position: relative; margin: 8px 0 20px 0; }
99+
.annotation:before { position: absolute; left: 0; top: 0; width: 100%; height: 100%; margin: 6px -6px -6px 6px; background: #333333; z-index: -1; content: ''; }
100+
.annotation :link, .annotation :visited { color: inherit; }
101+
.annotation :link:hover, .annotation :visited:hover { background: transparent; }
102+
.annotation span { border: none ! important; }
98103
.note { color: green; background: transparent; font-family: sans-serif; }
99104
.warning { color: red; background: transparent; }
100105
.note, .warning { font-weight: bolder; font-style: italic; }

headers/header-w3c-microdata.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
.XXX { color: #E50000; background: white; border: solid red; padding: 0.5em; margin: 1em 0; }
9696
.XXX > :first-child { margin-top: 0; }
9797
p .XXX { line-height: 3em; }
98+
.annotation { border: solid thin black; background: #0C479D; color: white; position: relative; margin: 8px 0 20px 0; }
99+
.annotation:before { position: absolute; left: 0; top: 0; width: 100%; height: 100%; margin: 6px -6px -6px 6px; background: #333333; z-index: -1; content: ''; }
100+
.annotation :link, .annotation :visited { color: inherit; }
101+
.annotation :link:hover, .annotation :visited:hover { background: transparent; }
102+
.annotation span { border: none ! important; }
98103
.note { color: green; background: transparent; font-family: sans-serif; }
99104
.warning { color: red; background: transparent; }
100105
.note, .warning { font-weight: bolder; font-style: italic; }

headers/header-w3c-msporny.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
.XXX { color: #E50000; background: white; border: solid red; padding: 0.5em; margin: 1em 0; }
9696
.XXX > :first-child { margin-top: 0; }
9797
p .XXX { line-height: 3em; }
98+
.annotation { border: solid thin black; background: #0C479D; color: white; position: relative; margin: 8px 0 20px 0; }
99+
.annotation:before { position: absolute; left: 0; top: 0; width: 100%; height: 100%; margin: 6px -6px -6px 6px; background: #333333; z-index: -1; content: ''; }
100+
.annotation :link, .annotation :visited { color: inherit; }
101+
.annotation :link:hover, .annotation :visited:hover { background: transparent; }
102+
.annotation span { border: none ! important; }
98103
.note { color: green; background: transparent; font-family: sans-serif; }
99104
.warning { color: red; background: transparent; }
100105
.note, .warning { font-weight: bolder; font-style: italic; }

0 commit comments

Comments
 (0)