Skip to content

Commit 19e598b

Browse files
committed
Apply to the Library Fundamentals TS Working Paper the Proposed Wording from N3804 any library.
This includes the fixes from cplusplus#12.
1 parent 6daa96e commit 19e598b

File tree

8 files changed

+324
-26
lines changed

8 files changed

+324
-26
lines changed

bower_components/cxx-html-doc-framework/.bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"dependencies": {
1313
"polymer-ajax": "Polymer/polymer-ajax#0.2.0"
1414
},
15-
"_release": "ee6db917ba",
15+
"_release": "7a8c0684ad",
1616
"_resolution": {
1717
"type": "branch",
1818
"branch": "master",
19-
"commit": "ee6db917ba352913ea5c67d462eed71a5a4fd6b7"
19+
"commit": "7a8c0684ad9796ff5da2b83f89cdc8379dcb12fa"
2020
},
2121
"_source": "git://github.com/cplusplus/html-doc-framework.git",
2222
"_target": "*",

bower_components/cxx-html-doc-framework/base.css

-12
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,19 @@ cxx-clause { page-break-before: always; }
5151
cxx-clause, cxx-toc { margin-top: 3em; }
5252
}
5353

54-
/* Rule pairs where the first has a '^' and the second doesn't, are intended
55-
* to work both with and without the Shadow DOM polyfill. TODO(jyasskin):
56-
* Figure out what the Polymer folks recommend instead of this. */
57-
5854
cxx-clause ^ header { font-size: 150%; }
59-
cxx-clause header { font-size: 150%; }
6055
cxx-toc ^ h1 { font-size: 150%; }
61-
cxx-toc h1 { font-size: 150%; }
6256
cxx-clause cxx-section ^ header { font-size: 117%; }
63-
cxx-clause cxx-section header { font-size: 117%; }
6457
cxx-clause cxx-section cxx-section ^ header { font-size: 100%; }
65-
cxx-clause cxx-section cxx-section header { font-size: 100%; }
6658

6759
[data-bookmark-label] { bookmark-label: attr(data-bookmark-label); }
6860
h1 { bookmark-level: 1; }
6961
cxx-toc ^ h1 { bookmark-level: 2; }
70-
cxx-toc h1 { bookmark-level: 2; }
7162
cxx-clause h1 { bookmark-level: 2; }
7263
cxx-clause cxx-section h1 { bookmark-level: 3; }
7364
cxx-clause cxx-section cxx-section h1 { bookmark-level: 4; }
7465

7566
* ^ .section-number { string-set: current-section "§ " content(); }
76-
* .section-number { string-set: current-section "§ " content(); }
7767

7868
p {margin-top: .5em; margin-bottom: .5em}
7969
p:first-child, ul, ol {margin-top: 0}
@@ -93,8 +83,6 @@ pre > code { display: inline-block; }
9383
@media print {
9484
/* Generate page numbers in the table of contents. */
9585
cxx-toc ^ a[href]::after { content: leader(" . ") target-counter(attr(href), page); }
96-
cxx-toc a[href]::after { content: leader(" . ") target-counter(attr(href), page); }
9786

9887
cxx-footnote ^ aside { float: footnote; footnote-policy: line; }
99-
cxx-footnote aside { float: footnote; footnote-policy: line; }
10088
}

bower_components/cxx-html-doc-framework/example.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
<template>
1818
<style>
1919
:host { display: block }
20+
:host(.inline) { display: inline }
21+
.nowrap { white-space: nowrap; }
2022
</style>
21-
<p>[ <em>Example:</em>
23+
<span class="nowrap">[ <em>Example:</em></span>
2224
<content></content>
23-
<p><em>end example</em> ]
25+
<span class="nowrap"><em>end example</em> ]</span>
2426
</template>
2527
</polymer-element>

bower_components/cxx-html-doc-framework/framework.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
limitations under the License.
1414
-->
1515

16-
<link rel="stylesheet" href="base.css"/>
16+
<link rel="stylesheet" href="base.css" shim-shadowdom/>
1717
<script src="promise-0.1.1.min.js"></script>
1818
<!-- "../" selects the bower_components directory if this project was
1919
itself installed through bower. -->

bower_components/cxx-html-doc-framework/function.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
:host > dl { margin: 0; margin-left: 2em; }
2222
:host > pre { margin: 0; }
2323
</style>
24-
<pre><code><content select="cxx-signature"/></code></pre>
24+
<pre><code><content select="cxx-signature"></content></code></pre>
2525

2626
<dl>
27-
<content select="p,cxx-requires,cxx-effects,cxx-synchronization,cxx-postconditions,cxx-returns,cxx-throws,cxx-exception-safety,cxx-remarks,cxx-error-conditions,cxx-notes,table"/>
27+
<content></content>
2828
</dl>
2929
</template>
3030
<script>

bower_components/cxx-html-doc-framework/note.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
limitations under the License.
1414
-->
1515

16-
<polymer-element name="cxx-note">
17-
<template>[ <em>Note:</em> <content></content><em>end note</em> ]</template>
18-
<script>
19-
Polymer('cxx-note', {
20-
applyAuthorStyles: true,
21-
});
22-
</script>
16+
<polymer-element name="cxx-note" noscript>
17+
<template><style>
18+
.nowrap { white-space: nowrap; }
19+
</style><span class="nowrap">[ <em>Note:</em></span>
20+
<content></content>
21+
<span class="nowrap"><em>end note</em> ]</span>
22+
</template>
2323
</polymer-element>

cxx11_index.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"dcl.constexpr": "7.1.5",
33
"library": "17",
4+
"allocator.requirements": "17.6.3.5",
45
"utility.swap": "20.2.2",
6+
"allocator.uses.construction": "20.6.7.2",
57
"unord.hash": "20.8.12",
68
"strings.general": "21.1",
79
"char.traits": "21.2",

0 commit comments

Comments
 (0)