Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/BSVino/docs.gl
Browse files Browse the repository at this point in the history
  • Loading branch information
BSVino committed Jan 31, 2016
2 parents 6e9bd19 + fd330a2 commit a646c67
Show file tree
Hide file tree
Showing 1,605 changed files with 47,159 additions and 47,074 deletions.
9 changes: 7 additions & 2 deletions compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def create_directory(dir):
if version[0:2] == "sl":
glsl_index_versions_commands += "<span class='slversioncolumn disabled'>glsl" + version[2:3] + "</span>"
else:
glsl_index_versions_commands += "<span class='slversioncolumn disabled'>glsl-es" + version[2:3] + "</a></span>"
glsl_index_versions_commands += "<span class='slversioncolumn disabled'>glsl-es" + version[2:3] + "</span>"
glsl_index_versions_commands += "</span>\n"

index = index.replace("{$commandlist}", index_versions_commands+glsl_index_versions_commands)
Expand Down Expand Up @@ -819,7 +819,12 @@ def replace_alias(matchobj):

return "<a href='../" + version_dir + r"/" + command + "'>" + alias + "</a>"

code = re.sub(r"\{%([a-zA-Z_][a-zA-Z_0-9]*?)\}", replace_alias, code).replace("\t", " ").replace("&", "&amp;")
code = code.replace("\t", " ")
code = code.replace("&", "&amp;")
code = code.replace("<", "&lt;")
code = code.replace(">", "&gt;")

code = re.sub(r"\{%([a-zA-Z_][a-zA-Z_0-9]*?)\}", replace_alias, code)

code = re.sub(r"(?<![a-zA-Z0-9_])(auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|size_t|NULL|GLbyte|GLshort|GLint|GLsizei|GLfloat|GLclampf|GLdouble|GLclampd|GLubyte|GLboolean|GLushort|GLuint|GLenum|GLbitfield|GLchar)(?![a-zA-Z0-9_])", r"<span class='ckeyword'>\1</span>", code)
code = re.sub(r"(GL_[A-Z_0-9]*)", r"<span class='constant'>\1</span>", code)
Expand Down
4 changes: 2 additions & 2 deletions el3/abs.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -116,7 +116,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
20 changes: 10 additions & 10 deletions el3/acos.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
<h2>Description</h2>
<p>
<code class="function">atan</code> returns the angle whose trigonometric cosine is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math>.
<math overflow="scroll"><mi mathvariant="italic">x</mi></math>.
The range of values returned by <code class="function">acos</code> is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll">
<mml:list order="numeric">
<mml:mn>0</mml:mn>
<mml:pi definitionURL="" encoding=""/>
</mml:list>
</mml:math>.
<math overflow="scroll">
<mfenced open="[" close="]">
<mn>0</mn>
<mi>π</mi>
</mfenced>
</math>.
The result is undefined if
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:apply><mml:gt definitionURL="" encoding=""/><mml:apply><mml:abs definitionURL="" encoding=""/><mml:mi mathvariant="italic">x</mml:mi></mml:apply><mml:mn>1</mml:mn></mml:apply></mml:math>.
<math overflow="scroll"><mo>|</mo><mi mathvariant="italic">x</mi><mo>|</mo><mo>&gt;</mo><mn>1</mn></math>.
</p>
</div>
{$pipelinestall}{$examples}
Expand All @@ -67,7 +67,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -112,7 +112,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
8 changes: 4 additions & 4 deletions el3/acosh.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<h2>Description</h2>
<p>
<code class="function">acosh</code> returns the arc hyperbolic cosine of
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math>;
<math overflow="scroll"><mi mathvariant="italic">x</mi></math>;
the non-negative inverse of <a class="citerefentry" href="cosh"><span class="citerefentry"><span class="refentrytitle">cosh</span></span></a>. Results
are undefined if <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:apply><mml:lt definitionURL="" encoding=""/><mml:mi mathvariant="italic">x</mml:mi><mml:mn>1</mml:mn></mml:apply></mml:math>.
are undefined if <math overflow="scroll"><mi mathvariant="italic">x</mi><mo>&lt;</mo><mn>1</mn></math>.
</p>
</div>
{$pipelinestall}{$examples}
Expand All @@ -60,7 +60,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -104,7 +104,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
4 changes: 2 additions & 2 deletions el3/all.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -114,7 +114,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
4 changes: 2 additions & 2 deletions el3/any.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -114,7 +114,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
38 changes: 19 additions & 19 deletions el3/asin.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@
<h2>Description</h2>
<p>
<code class="function">atan</code> returns the angle whose trigonometric sine is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math>.
<math overflow="scroll"><mi mathvariant="italic">x</mi></math>.
The range of values returned by <code class="function">asin</code> is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll">
<mml:list order="numeric">
<mml:mrow>
<mml:mo></mml:mo>
<mml:mfrac>
<mml:pi definitionURL="" encoding=""/>
<mml:mn>2</mml:mn>
</mml:mfrac>
</mml:mrow>
<mml:mfrac>
<mml:pi definitionURL="" encoding=""/>
<mml:mn>2</mml:mn>
</mml:mfrac>
</mml:list>
</mml:math>.
<math overflow="scroll">
<mfenced open="[" close="]">
<mrow>
<mo></mo>
<mfrac>
<mi>π</mi>
<mn>2</mn>
</mfrac>
</mrow>
<mfrac>
<mi>π</mi>
<mn>2</mn>
</mfrac>
</mfenced>
</math>.
The result is undefined if
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:apply><mml:gt definitionURL="" encoding=""/><mml:apply><mml:abs definitionURL="" encoding=""/><mml:mi mathvariant="italic">x</mml:mi></mml:apply><mml:mn>1</mml:mn></mml:apply></mml:math>.
<math overflow="scroll"><mo>|</mo><mi mathvariant="italic">x</mi><mo>|</mo><mo>&gt;</mo><mn>1</mn></math>.
</p>
</div>
{$pipelinestall}{$examples}
Expand All @@ -76,7 +76,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -121,7 +121,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
6 changes: 3 additions & 3 deletions el3/asinh.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<h2>Description</h2>
<p>
<code class="function">asinh</code> returns the arc hyperbolic sine of
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math>;
<math overflow="scroll"><mi mathvariant="italic">x</mi></math>;
the inverse of <a class="citerefentry" href="sinh"><span class="citerefentry"><span class="refentrytitle">sinh</span></span></a>.
</p>
</div>
Expand All @@ -59,7 +59,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -103,7 +103,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
75 changes: 39 additions & 36 deletions el3/atan.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -80,45 +80,48 @@
<h2>Description</h2>
<p>
<code class="function">atan</code> returns the angle whose trigonometric arctangent is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll">
<mml:mfrac>
<mml:mrow>
<mml:mi mathvariant="italic">y</mml:mi>
</mml:mrow>
<mml:mrow>
<mml:mi mathvariant="italic">x</mml:mi>
</mml:mrow>
</mml:mfrac>
</mml:math> or <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">y_over_x</mml:mi></mml:math>,
depending on which overload is invoked. In the first overload, the signs of <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">y</mml:mi></mml:math>
and <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math> are used to determine the quadrant
<math overflow="scroll">
<mfrac>
<mrow>
<mi mathvariant="italic">y</mi>
</mrow>
<mrow>
<mi mathvariant="italic">x</mi>
</mrow>
</mfrac>
</math> or <math overflow="scroll"><mi mathvariant="italic">y_over_x</mi></math>,
depending on which overload is invoked. In the first overload, the signs of <math overflow="scroll"><mi mathvariant="italic">y</mi></math>
and <math overflow="scroll"><mi mathvariant="italic">x</mi></math> are used to determine the quadrant
that the angle lies in. The values returned by <code class="function">atan</code> in this case are in the range
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll">
<mml:list order="numeric">
<mml:mrow><mml:mo></mml:mo><mml:pi definitionURL="" encoding=""/></mml:mrow>
<mml:pi definitionURL="" encoding=""/>
</mml:list>
</mml:math>. Results are undefined if <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math> is zero.
<math overflow="scroll">
<mfenced open="[" close="]">
<mrow>
<mo></mo>
<mi>π</mi>
</mrow>
<mi>π</mi>
</mfenced>
</math>. Results are undefined if <math overflow="scroll"><mi mathvariant="italic">x</mi></math> is zero.
</p>
<p>
For the second overload, <code class="function">atan</code> returns the angle whose tangent is
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">y_over_x</mml:mi></mml:math>. Values
<math overflow="scroll"><mi mathvariant="italic">y_over_x</mi></math>. Values
returned in this case are in the range
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll">
<mml:list order="numeric">
<mml:mrow>
<mml:mo></mml:mo>
<mml:mfrac>
<mml:pi definitionURL="" encoding=""/>
<mml:mn>2</mml:mn>
</mml:mfrac>
</mml:mrow>
<mml:mfrac>
<mml:pi definitionURL="" encoding=""/>
<mml:mn>2</mml:mn>
</mml:mfrac>
</mml:list>
</mml:math>.
<math overflow="scroll">
<mfenced open="[" close="]">
<mrow>
<mo></mo>
<mfrac>
<mi>π</mi>
<mn>2</mn>
</mfrac>
</mrow>
<mfrac>
<mi>π</mi>
<mn>2</mn>
</mfrac>
</mfenced>
</math>.
</p>
</div>
{$pipelinestall}{$examples}
Expand All @@ -135,7 +138,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -180,7 +183,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
8 changes: 4 additions & 4 deletions el3/atanh.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<h2>Description</h2>
<p>
<code class="function">atanh</code> returns the arc hyperbolic tangent of
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:mi mathvariant="italic">x</mml:mi></mml:math>;
<math overflow="scroll"><mi mathvariant="italic">x</mi></math>;
the inverse of <a class="citerefentry" href="tanh"><span class="citerefentry"><span class="refentrytitle">tanh</span></span></a>. Results
are undefined if <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML" overflow="scroll"><mml:apply><mml:gt definitionURL="" encoding=""/><mml:apply><mml:abs definitionURL="" encoding=""/><mml:mi mathvariant="italic">x</mml:mi></mml:apply><mml:mn>1</mml:mn></mml:apply></mml:math>.
are undefined if <math overflow="scroll"><mo>|</mo><mi mathvariant="italic">x</mi><mo>|</mo><mo>&gt;</mo><mn>1</mn></math>.
</p>
</div>
{$pipelinestall}{$examples}
Expand All @@ -60,7 +60,7 @@
<thead>
<tr>
<th style="text-align: left; border-right: 2px solid ; ">

</th>
<th style="text-align: center; border-bottom: 2px solid ; " colspan="3">
<span class="bold"><strong>OpenGL ES Shading Language Version</strong></span>
Expand Down Expand Up @@ -104,7 +104,7 @@
<div class="refsect1" id="Copyright">
<h2>Copyright</h2>
<p>
Copyright <span class="trademark"/>© 2011-2014 Khronos Group.
Copyright © 2011-2014 Khronos Group.
This material may be distributed subject to the terms and conditions set forth in
the Open Publication License, v 1.0, 8 June 1999.
<a class="link" href="http://opencontent.org/openpub/" target="_top">http://opencontent.org/openpub/</a>.
Expand Down
Loading

0 comments on commit a646c67

Please sign in to comment.