mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-16 06:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup nimdoc for the CSS filter change

Browse Source
This commit is contained in:
zetashift
2021-02-01 02:12:21 +01:00
parent cdf9b28515
commit 99ec00a4bd
6 changed files with 63 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nimdoc/test_out_index_dot_html/expected/index.html
View File

@@ -56,12 +56,10 @@ function main() {
} }
} }
} }
window.addEventListener('DOMContentLoaded', main);
</script> </script>
</head> </head>
<body> <body onload="main()">
<div class="document" id="documentId"> <div class="document" id="documentId">
<div class="container"> <div class="container">
<h1 class="title">foo</h1> <h1 class="title">foo</h1>
@@ -98,7 +96,7 @@ window.addEventListener('DOMContentLoaded', main);
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<ul class="simple nested-toc-section">foo <ul class="simple nested-toc-section">foo
<li><a class="reference" href="#foo" <li><a class="reference" href="#foo"
title="foo()">foo()</a></li> title="foo()">foo</a></li>
</ul> </ul>
@@ -108,7 +106,6 @@ window.addEventListener('DOMContentLoaded', main);
</ul> </ul>
</div> </div>
<div class="nine columns" id="content"> <div class="nine columns" id="content">
<div id="tocRoot"></div> <div id="tocRoot"></div>

4
nimdoc/test_out_index_dot_html/expected/theindex.html
View File

@@ -56,12 +56,10 @@ function main() {
} }
} }
} }
window.addEventListener('DOMContentLoaded', main);
</script> </script>
</head> </head>
<body> <body onload="main()">
<div class="document" id="documentId"> <div class="document" id="documentId">
<div class="container"> <div class="container">
<h1 class="title">Index</h1> <h1 class="title">Index</h1>

34
nimdoc/testproject/expected/nimdoc.out.css
View File

@@ -14,9 +14,6 @@ Modified by Boyd Greenfield and narimiran
--primary-background: #fff; --primary-background: #fff;
--secondary-background: ghostwhite; --secondary-background: ghostwhite;
--third-background: #e8e8e8; --third-background: #e8e8e8;
--info-background: #50c050;
--warning-background: #c0a000;
--error-background: #e04040;
--border: #dde; --border: #dde;
--text: #222; --text: #222;
--anchor: #07b; --anchor: #07b;
@@ -42,9 +39,6 @@ Modified by Boyd Greenfield and narimiran
--primary-background: #171921; --primary-background: #171921;
--secondary-background: #1e202a; --secondary-background: #1e202a;
--third-background: #2b2e3b; --third-background: #2b2e3b;
--info-background: #008000;
--warning-background: #807000;
--error-background: #c03000;
--border: #0e1014; --border: #0e1014;
--text: #fff; --text: #fff;
--anchor: #8be9fd; --anchor: #8be9fd;
@@ -615,34 +609,6 @@ table.borderless td, table.borderless th {
The right padding separates the table cells. */ The right padding separates the table cells. */
padding: 0 0.5em 0 0 !important; } padding: 0 0.5em 0 0 !important; }
.admonition {
padding: 0.3em;
background-color: var(--secondary-background);
border-left: 0.4em solid #7f7f84;
margin-bottom: 0.5em;
-webkit-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
-moz-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
}
.admonition-info {
border-color: var(--info-background);
}
.admonition-info-text {
color: var(--info-background);
}
.admonition-warning {
border-color: var(--warning-background);
}
.admonition-warning-text {
color: var(--warning-background);
}
.admonition-error {
border-color: var(--error-background);
}
.admonition-error-text {
color: var(--error-background);
}
.first { .first {
/* Override more specific margin styles with "! important". */ /* Override more specific margin styles with "! important". */
margin-top: 0 !important; } margin-top: 0 !important; }

7
nimdoc/testproject/expected/subdir/subdir_b/utils.html
View File

@@ -56,12 +56,10 @@ function main() {
} }
} }
} }
window.addEventListener('DOMContentLoaded', main);
</script> </script>
</head> </head>
<body> <body onload="main()">
<div class="document" id="documentId"> <div class="document" id="documentId">
<div class="container"> <div class="container">
<h1 class="title">subdir/subdir_b/utils</h1> <h1 class="title">subdir/subdir_b/utils</h1>
@@ -112,7 +110,7 @@ window.addEventListener('DOMContentLoaded', main);
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<ul class="simple nested-toc-section">someType <ul class="simple nested-toc-section">someType
<li><a class="reference" href="#someType_2" <li><a class="reference" href="#someType_2"
title="someType(): SomeType">someType(): SomeType</a></li> title="someType(): SomeType">someType_2</a></li>
</ul> </ul>
@@ -134,7 +132,6 @@ window.addEventListener('DOMContentLoaded', main);
</ul> </ul>
</div> </div>
<div class="nine columns" id="content"> <div class="nine columns" id="content">
<div id="tocRoot"></div> <div id="tocRoot"></div>

105
nimdoc/testproject/expected/testproject.html
View File

@@ -56,12 +56,10 @@ function main() {
} }
} }
} }
window.addEventListener('DOMContentLoaded', main);
</script> </script>
</head> </head>
<body> <body onload="main()">
<div class="document" id="documentId"> <div class="document" id="documentId">
<div class="container"> <div class="container">
<h1 class="title">testproject</h1> <h1 class="title">testproject</h1>
@@ -148,159 +146,165 @@ window.addEventListener('DOMContentLoaded', main);
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<ul class="simple nested-toc-section">z10 <ul class="simple nested-toc-section">z10
<li><a class="reference" href="#z10" <li><a class="reference" href="#z10"
title="z10()">z10()</a></li> title="z10()">z10</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">tripleStrLitTest <ul class="simple nested-toc-section">tripleStrLitTest
<li><a class="reference" href="#tripleStrLitTest" <li><a class="reference" href="#tripleStrLitTest"
title="tripleStrLitTest()">tripleStrLitTest()</a></li> title="tripleStrLitTest()">tripleStrLitTest</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z17 <ul class="simple nested-toc-section">z17
<li><a class="reference" href="#z17" <li><a class="reference" href="#z17"
title="z17()">z17()</a></li> title="z17()">z17</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">asyncFun3 <ul class="simple nested-toc-section">asyncFun3
<li><a class="reference" href="#asyncFun3" <li><a class="reference" href="#asyncFun3"
title="asyncFun3(): owned(Future[void])">asyncFun3(): owned(Future[void])</a></li> title="asyncFun3(): owned(Future[void])">asyncFun3</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z2 <ul class="simple nested-toc-section">z2
<li><a class="reference" href="#z2" <li><a class="reference" href="#z2"
title="z2()">z2()</a></li> title="z2()">z2</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">bar <ul class="simple nested-toc-section">bar
<li><a class="reference" href="#bar%2CT%2CT" <li><a class="reference" href="#bar%2CT%2CT"
title="bar[T](a, b: T): T">bar[T](a, b: T): T</a></li> title="bar[T](a, b: T): T">bar,<wbr>T,<wbr>T</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">fromUtils3 <ul class="simple nested-toc-section">fromUtils3
<li><a class="reference" href="#fromUtils3" <li><a class="reference" href="#fromUtils3"
title="fromUtils3()">fromUtils3()</a></li> title="fromUtils3()">fromUtils3</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">isValid <ul class="simple nested-toc-section">isValid
<li><a class="reference" href="#isValid%2CT" <li><a class="reference" href="#isValid%2CT"
title="isValid[T](x: T): bool">isValid[T](x: T): bool</a></li> title="isValid[T](x: T): bool">isValid,<wbr>T</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z6 <ul class="simple nested-toc-section">z6
<li><a class="reference" href="#z6" <li><a class="reference" href="#z6"
title="z6(): int">z6(): int</a></li> title="z6(): int">z6</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">anything <ul class="simple nested-toc-section">anything
<li><a class="reference" href="#anything" <li><a class="reference" href="#anything"
title="anything()">anything()</a></li> title="anything()">anything</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">low <ul class="simple nested-toc-section">low
<li><a class="reference" href="#low%2CT" <li><a class="reference" href="#low%2CT"
title="low[T: Ordinal | enum | range](x: T): T">low[T: Ordinal | enum | range](x: T): T</a></li> title="low[T: Ordinal | enum | range](x: T): T">low,<wbr>T</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">p1 <ul class="simple nested-toc-section">p1
<li><a class="reference" href="#p1" <li><a class="reference" href="#p1"
title="p1()">p1()</a></li> title="p1()">p1</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z11 <ul class="simple nested-toc-section">z11
<li><a class="reference" href="#z11" <li><a class="reference" href="#z11"
title="z11()">z11()</a></li> title="z11()">z11</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">buzz <ul class="simple nested-toc-section">buzz
<li><a class="reference" href="#buzz%2CT%2CT" <li><a class="reference" href="#buzz%2CT%2CT"
title="buzz[T](a, b: T): T">buzz[T](a, b: T): T</a></li> title="buzz[T](a, b: T): T">buzz,<wbr>T,<wbr>T</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">low2 <ul class="simple nested-toc-section">low2
<li><a class="reference" href="#low2%2CT" <li><a class="reference" href="#low2%2CT"
title="low2[T: Ordinal | enum | range](x: T): T">low2[T: Ordinal | enum | range](x: T): T</a></li> title="low2[T: Ordinal | enum | range](x: T): T">low2,<wbr>T</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z7 <ul class="simple nested-toc-section">z7
<li><a class="reference" href="#z7" <li><a class="reference" href="#z7"
title="z7(): int">z7(): int</a></li> title="z7(): int">z7</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z13 <ul class="simple nested-toc-section">z13
<li><a class="reference" href="#z13" <li><a class="reference" href="#z13"
title="z13()">z13()</a></li> title="z13()">z13</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">baz <ul class="simple nested-toc-section">baz
<li><a class="reference" href="#baz%2CT%2CT" <li><a class="reference" href="#baz%2CT%2CT"
title="baz[T](a, b: T): T">baz[T](a, b: T): T</a></li> title="baz[T](a, b: T): T">baz,<wbr>T,<wbr>T</a></li>
<li><a class="reference" href="#baz" <li><a class="reference" href="#baz"
title="baz()">baz()</a></li> title="baz()">baz</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">addfBug14485 <ul class="simple nested-toc-section">addfBug14485
<li><a class="reference" href="#addfBug14485" <li><a class="reference" href="#addfBug14485"
title="addfBug14485()">addfBug14485()</a></li> title="addfBug14485()">addfBug14485</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">c_printf <ul class="simple nested-toc-section">c_printf
<li><a class="reference" href="#c_printf%2Ccstring" <li><a class="reference" href="#c_printf%2Ccstring"
title="c_printf(frmt: cstring): cint">c_printf(frmt: cstring): cint</a></li> title="c_printf(frmt: cstring): cint">c_printf,<wbr>cstring</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z12 <ul class="simple nested-toc-section">z12
<li><a class="reference" href="#z12" <li><a class="reference" href="#z12"
title="z12(): int">z12(): int</a></li> title="z12(): int">z12</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z3 <ul class="simple nested-toc-section">z3
<li><a class="reference" href="#z3" <li><a class="reference" href="#z3"
title="z3()">z3()</a></li> title="z3()">z3</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z9 <ul class="simple nested-toc-section">z9
<li><a class="reference" href="#z9" <li><a class="reference" href="#z9"
title="z9()">z9()</a></li> title="z9()">z9</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z4 <ul class="simple nested-toc-section">z4
<li><a class="reference" href="#z4" <li><a class="reference" href="#z4"
title="z4()">z4()</a></li> title="z4()">z4</a></li>
</ul>
<ul class="simple nested-toc-section">someFunc
<li><a class="reference" href="#someFunc"
title="someFunc()">someFunc()</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z8 <ul class="simple nested-toc-section">z8
<li><a class="reference" href="#z8" <li><a class="reference" href="#z8"
title="z8(): int">z8(): int</a></li> title="z8(): int">z8</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z1 <ul class="simple nested-toc-section">z1
<li><a class="reference" href="#z1" <li><a class="reference" href="#z1"
title="z1(): Foo">z1(): Foo</a></li> title="z1(): Foo">z1</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">z5 <ul class="simple nested-toc-section">z5
<li><a class="reference" href="#z5" <li><a class="reference" href="#z5"
title="z5(): int">z5(): int</a></li> title="z5(): int">z5</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">asyncFun2 <ul class="simple nested-toc-section">asyncFun2
<li><a class="reference" href="#asyncFun2" <li><a class="reference" href="#asyncFun2"
title="asyncFun2(): owned(Future[void])">asyncFun2(): owned(Future[void])</a></li> title="asyncFun2(): owned(Future[void])">asyncFun2</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">c_nonexistant <ul class="simple nested-toc-section">c_nonexistant
<li><a class="reference" href="#c_nonexistant%2Ccstring" <li><a class="reference" href="#c_nonexistant%2Ccstring"
title="c_nonexistant(frmt: cstring): cint">c_nonexistant(frmt: cstring): cint</a></li> title="c_nonexistant(frmt: cstring): cint">c_nonexistant,<wbr>cstring</a></li>
</ul> </ul>
<ul class="simple nested-toc-section">asyncFun1 <ul class="simple nested-toc-section">asyncFun1
<li><a class="reference" href="#asyncFun1" <li><a class="reference" href="#asyncFun1"
title="asyncFun1(): Future[int]">asyncFun1(): Future[int]</a></li> title="asyncFun1(): Future[int]">asyncFun1</a></li>
</ul>
</ul>
</li>
<li>
<a class="reference reference-toplevel" href="#13" id="63">Funcs</a>
<ul class="simple simple-toc-section">
<ul class="simple nested-toc-section">someFunc
<li><a class="reference" href="#someFunc"
title="someFunc()">someFunc</a></li>
</ul> </ul>
@@ -366,7 +370,6 @@ window.addEventListener('DOMContentLoaded', main);
</ul> </ul>
</div> </div>
<div class="nine columns" id="content"> <div class="nine columns" id="content">
<div id="tocRoot"></div> <div id="tocRoot"></div>
@@ -508,13 +511,6 @@ This is deprecated without message.
This is deprecated with a message. This is deprecated with a message.
</dd>
<a id="someFunc"></a>
<dt><pre><span class="Keyword">func</span> <a href="#someFunc"><span class="Identifier">someFunc</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</span></tt> here. <a class="reference external" href="https://nim-lang.org">Some link</a>
</dd> </dd>
<a id="fromUtils3"></a> <a id="fromUtils3"></a>
<dt><pre><span class="Keyword">proc</span> <a href="#fromUtils3"><span class="Identifier">fromUtils3</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt> <dt><pre><span class="Keyword">proc</span> <a href="#fromUtils3"><span class="Identifier">fromUtils3</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
@@ -804,7 +800,20 @@ ok1
<dt><pre><span class="Keyword">proc</span> <a href="#anything"><span class="Identifier">anything</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt> <dt><pre><span class="Keyword">proc</span> <a href="#anything"><span class="Identifier">anything</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd> <dd>
There is no block quote after blank lines at the beginning. <blockquote><p>There is no block quote after blank lines at the beginning.</p></blockquote>
</dd>
</dl></div>
<div class="section" id="13">
<h1><a class="toc-backref" href="#13">Funcs</a></h1>
<dl class="item">
<a id="someFunc"></a>
<dt><pre><span class="Keyword">func</span> <a href="#someFunc"><span class="Identifier">someFunc</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</span></tt> here. <a class="reference external" href="https://nim-lang.org">Some link</a>
</dd> </dd>

4
nimdoc/testproject/expected/theindex.html
View File

@@ -56,12 +56,10 @@ function main() {
} }
} }
} }
window.addEventListener('DOMContentLoaded', main);
</script> </script>
</head> </head>
<body> <body onload="main()">
<div class="document" id="documentId"> <div class="document" id="documentId">
<div class="container"> <div class="container">
<h1 class="title">Index</h1> <h1 class="title">Index</h1>