- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 29 Aug 2009 01:43:08 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv24077
Modified Files:
Makefile
Added Files:
html.css
Log Message:
checked in static copies of some dependencies, in order to make building easier
--- NEW FILE: html.css ---
/*
* The default style sheet used to render HTML.
*
* Copyright (C) 2000 Lars Knoll (knoll@kde.org)
* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
@namespace "http://www.w3.org/1999/xhtml";
html {
display: block
}
/* children of the <head> element all have display:none */
head {
display: none
}
meta {
display: none
}
title {
display: none
}
link {
display: none
}
style {
display: none
}
script {
display: none
}
/* generic block-level elements */
body {
display: block;
margin: 8px
}
p {
display: block;
margin: 1.0__qem 0px
}
div {
display: block
}
layer {
display: block
}
nav {
display: block
}
marquee {
display: inline-block;
overflow: -webkit-marquee
}
address {
display: block
}
blockquote {
display: block;
margin: 1__qem 40px 1em 40px
}
q {
display: inline
}
q:before {
content: '"'
/* FIXME: content: open-quote; */
}
q:after {
content: '"'
/* FIXME: content: close-quote; */
}
center {
display: block;
/* special centering to be able to emulate the html4/netscape behaviour */
text-align: -webkit-center
}
hr {
display: block;
margin: 0.5em auto;
border-style: inset;
border-width: 1px
}
map {
display: inline
}
/* heading elements */
h1 {
display: block;
font-size: 2em;
margin: .67__qem 0 .67em 0;
font-weight: bold
}
h2 {
display: block;
font-size: 1.5em;
margin: .83__qem 0 .83em 0;
font-weight: bold
}
h3 {
display: block;
font-size: 1.17em;
margin: 1__qem 0 1em 0;
font-weight: bold
}
h4 {
display: block;
margin: 1.33__qem 0 1.33em 0;
font-weight: bold
}
h5 {
display: block;
font-size: .83em;
margin: 1.67__qem 0 1.67em 0;
font-weight: bold
}
h6 {
display: block;
font-size: .67em;
margin: 2.33__qem 0 2.33em 0;
font-weight: bold
}
/* tables */
table {
display: table;
border-collapse: separate;
border-spacing: 2px;
border-color: gray
}
thead {
display: table-header-group;
vertical-align: middle;
border-color: inherit
}
tbody {
display: table-row-group;
vertical-align: middle;
border-color: inherit
}
tfoot {
display: table-footer-group;
vertical-align: middle;
border-color: inherit
}
/* for tables without table section elements (can happen with XHTML or dynamically created tables) */
table > tr {
vertical-align: middle;
}
col {
display: table-column
}
colgroup {
display: table-column-group
}
tr {
display: table-row;
vertical-align: inherit;
border-color: inherit
}
td, th {
display: table-cell;
vertical-align: inherit
}
th {
font-weight: bold
}
caption {
display: table-caption;
text-align: -webkit-center
}
/* lists */
ul, menu, dir {
display: block;
list-style-type: disc;
margin: 1__qem 0 1em 0;
-webkit-padding-start: 40px
}
ol {
display: block;
list-style-type: decimal;
margin: 1__qem 0 1em 0;
-webkit-padding-start: 40px
}
li {
display: list-item
}
ul ul, ol ul {
list-style-type: circle
}
ol ol ul, ol ul ul, ul ol ul, ul ul ul {
list-style-type: square
}
dd {
display: block;
-webkit-margin-start: 40px
}
dl {
display: block;
margin: 1__qem 0 1em 0
}
dt {
display: block
}
ol ul, ul ol, ul ul, ol ol {
margin-top: 0;
margin-bottom: 0
}
/* form elements */
form {
display: block;
margin-top: 0__qem
}
label {
cursor: default;
}
legend {
display: block;
padding-left: 2px;
padding-right: 2px;
border: none
}
fieldset {
display: block;
margin-left: 2px;
margin-right: 2px;
padding: 0.35em 0.75em 0.625em;
border: 2px groove ThreeDFace
}
button {
-webkit-appearance: button;
}
input, textarea, keygen, select, button, isindex, datagrid {
margin: 0__qem;
font: -webkit-small-control;
color: initial;
letter-spacing: normal;
word-spacing: normal;
line-height: normal;
text-transform: none;
text-indent: 0;
text-shadow: none;
display: inline-block;
text-align: -webkit-auto;
}
input[type="hidden"] {
display: none
}
input, input[type="password"], input[type="search"], isindex {
-webkit-appearance: textfield;
padding: 1px;
background-color: white;
border: 2px inset;
-webkit-rtl-ordering: logical;
-webkit-user-select: text;
cursor: auto;
}
input[type="search"] {
-webkit-appearance: searchfield;
-webkit-box-sizing: border-box;
}
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: searchfield-cancel-button;
display: inline-block;
}
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: searchfield-decoration;
display: inline-block;
}
input[type="search"]::-webkit-search-results-decoration {
-webkit-appearance: searchfield-results-decoration;
display: inline-block;
}
input[type="search"]::-webkit-search-results-button {
-webkit-appearance: searchfield-results-button;
display: inline-block;
}
textarea {
-webkit-appearance: textarea;
background-color: white;
border: 1px solid;
-webkit-rtl-ordering: logical;
-webkit-user-select: text;
-webkit-box-orient: vertical;
resize: auto;
cursor: auto;
padding: 2px;
white-space: pre-wrap;
word-wrap: break-word;
}
input::-webkit-input-placeholder, isindex::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
color: darkGray;
}
input[type="password"] {
-webkit-text-security: disc !important;
}
input[type="hidden"], input[type="image"], input[type="file"] {
-webkit-appearance: initial;
padding: initial;
background-color: initial;
border: initial;
}
input[type="file"] {
-webkit-box-align: baseline;
text-align: start !important;
}
input:-webkit-autofill {
background-color: #FAFFBD !important;
background-image:none !important;
}
input[type="radio"], input[type="checkbox"] {
margin: 3px 0.5ex;
padding: initial;
background-color: initial;
border: initial;
}
input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]::-webkit-file-upload-button {
-webkit-appearance: push-button;
white-space: pre
}
input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]::-webkit-file-upload-button, button {
-webkit-box-align: center;
text-align: center;
cursor: default;
color: ButtonText;
padding: 2px 6px 3px 6px;
border: 2px outset ButtonFace;
background-color: ButtonFace;
-webkit-box-sizing: border-box
}
input[type="range"] {
-webkit-appearance: slider-horizontal;
padding: initial;
border: initial;
margin: 2px;
}
input[type="range"]::-webkit-slider-thumb {
-webkit-appearance: sliderthumb-horizontal;
}
input[type="button"]:disabled, input[type="submit"]:disabled, input[type="reset"]:disabled,
input[type="file"]:disabled::-webkit-file-upload-button, button:disabled,
select:disabled, keygen:disabled, optgroup:disabled, option:disabled, datagrid:disabled {
color: GrayText
}
input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active {
border-style: inset
}
input[type="button"]:active:disabled, input[type="submit"]:active:disabled, input[type="reset"]:active:disabled, input[type="file"]:active:disabled::-webkit-file-upload-button, button:active:disabled {
border-style: outset
}
area, param {
display: none
}
input[type="checkbox"] {
-webkit-appearance: checkbox;
-webkit-box-sizing: border-box;
}
input[type="radio"] {
-webkit-appearance: radio;
-webkit-box-sizing: border-box;
}
keygen, select {
-webkit-appearance: menulist;
-webkit-box-sizing: border-box;
-webkit-box-align: center;
border: 1px solid;
-webkit-border-radius: 5px;
white-space: pre;
-webkit-rtl-ordering: logical;
color: black;
background-color: white;
cursor: default;
}
select[size],
select[multiple],
select[size][multiple] {
-webkit-appearance: listbox;
-webkit-box-align: start;
border: 1px inset gray;
-webkit-border-radius: initial;
white-space: initial;
}
select[size="0"],
select[size="1"] {
-webkit-appearance: menulist;
-webkit-box-align: center;
border: 1px solid;
-webkit-border-radius: 5px;
white-space: pre;
}
datalist {
display: none;
}
optgroup {
font-weight: bolder;
}
option {
font-weight: normal;
}
/* datagrid */
datagrid {
height: 150px; /* We don't use width:300px in CSS, since we want width:intrinsic and width:min-intrinsic to reset to 300 properly. */
-webkit-appearance: datagrid;
-webkit-box-sizing: border-box;
-webkit-rtl-ordering: logical;
color: black;
background-color: white;
cursor: default;
border: 1px inset gray;
white-space: initial;
}
/* inline elements */
u, ins {
text-decoration: underline
}
strong, b {
font-weight: bolder
}
i, cite, em, var, address {
font-style: italic
}
tt, code, kbd, samp {
font-family: monospace
}
pre, xmp, plaintext, listing {
display: block;
font-family: monospace;
white-space: pre;
margin: 1__qem 0
}
big {
font-size: larger
}
small {
font-size: smaller
}
s, strike, del {
text-decoration: line-through
}
sub {
vertical-align: sub;
font-size: smaller
}
sup {
vertical-align: super;
font-size: smaller
}
nobr {
white-space: nowrap
}
/* states */
:focus {
outline: auto 5px -webkit-focus-ring-color
}
/* Read-only text fields do not show a focus ring but do still receive focus */
html:focus, body:focus, input[readonly]:focus {
outline: none
}
input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus {
outline-offset: -2px
}
input[type="button"]:focus,
input[type="checkbox"]:focus,
input[type="file"]:focus,
input[type="hidden"]:focus,
input[type="image"]:focus,
input[type="radio"]:focus,
input[type="reset"]:focus,
input[type="search"]:focus,
input[type="submit"]:focus,
input[type="file"]:focus::-webkit-file-upload-button {
outline-offset: 0
}
a:-webkit-any-link {
color: -webkit-link;
text-decoration: underline;
cursor: auto;
}
a:-webkit-any-link:active {
color: -webkit-activelink
}
/* other elements */
noframes {
display: none
}
frameset, frame {
display: block
}
frameset {
border-color: inherit
}
iframe {
border: 2px inset
}
/* noscript is handled internally, as it depends on settings */
Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile 20 Aug 2009 09:22:35 -0000 1.78
+++ Makefile 29 Aug 2009 01:43:06 -0000 1.79
@@ -17,6 +17,8 @@
PERLFLAGS=
PATCH=patch
PATCHFLAGS=-N -p0
+JAVA=java
+JAVAFLAGS=
#INCELIM_BASE_URL=http://ftp.davidashen.net/incelim/
#INCELIM_BASE_URL=http://dev.w3.org/buildtools/rng/deps/
@@ -24,7 +26,7 @@
WHATTF_BASE_URL=http://svn.versiondude.net/whattf/syntax/trunk/relaxng/
OTHER_RNG=$(foreach rnc,$(wildcard schema/*.rnc),$(basename $(notdir $(rnc))).rng)
ARIA_OTHER_RNG=$(foreach rnc,$(wildcard schema/*.rnc),aria/$(basename $(notdir $(rnc))).rng)
-COMBINE_XSL_URL=http://dev.w3.org/buildtools/rng/combine/combine.xsl
+SCHEMA_FILES=$(wildcard schema/*.rnc) schema/assertions.sch schema/LICENSE
ELEMENTS=$(wildcard elements/*.html)
@@ -37,15 +39,7 @@
all: Overview.html spec.html
-schema: patch-schema
-ifeq ($(WHATTF_SCHEMA),)
- $(SVN) $(SVNFLAGS) checkout --depth=files $(WHATTF_BASE_URL) $@
-else
- cp -pR $(WHATTF_SCHEMA) schema
-endif
- -$(PATCH) $(PATCHFLAGS) < $<
-
-html.rng: schema
+html.rng: $(SCHEMA_FILES) patch-schema
$(TRANG) $(TRANGFLAGS) html.rnc $@
html-compiled.rng: html.rng
@@ -56,7 +50,8 @@
| $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl - > $@
html.rnc.spec.html: html-compiled.rng.combined
- $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@
+ $(JAVA) $(JAVAFLAGS) -jar tools/trang.jar -I rng -O rnc $< $@
+# $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@
$(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<a[^<]+<\/a> notAllowed//g' $@
LICENSE.xml: schema/LICENSE
@@ -64,11 +59,6 @@
$(PERL) $(PERLFLAGS) -p -e "s/&/&/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</</g" >> $@
echo "</license>" >> $@
-schema/assertions.sch: schema
-
-html.css:
- $(CURL) $(CURLFLAGS) -o $@ http://svn.webkit.org/repository/webkit/trunk/WebCore/css/html.css
-
html.css.LICENSE.xml: html.css
echo "<license>" > $@
head -n20 $< | tail -n17 | cut -c4- >> $@
@@ -179,10 +169,8 @@
# $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@
clean:
- $(RM) -r schema
$(RM) html.rng
$(RM) html.rnc.spec.html
- $(RM) html.css
$(RM) LICENSE.xml
$(RM) html.css.LICENSE.xml
$(RM) html.css.xml
@@ -201,3 +189,15 @@
endif
$(RM) aria/html-compiled.rng
$(RM) aria/html-compiled.rng.combined
+
+distclean: clean
+ifneq ($(WHATTF_SCHEMA),)
+ $(RM) -r schema/*.rnc
+ $(RM) -r schema/*.sch
+ $(RM) -r schema/LICENSE
+ cp -pR $(WHATTF_SCHEMA)/*.rnc schema
+ cp -pR $(WHATTF_SCHEMA)/*.sch schema
+ cp -pR $(WHATTF_SCHEMA)/LICENSE schema
+ -$(PATCH) $(PATCHFLAGS) < patch-schema
+endif
+ $(CURL) $(CURLFLAGS) -o html.css http://svn.webkit.org/repository/webkit/trunk/WebCore/css/html.css
Received on Saturday, 29 August 2009 01:43:18 UTC