Skip to content

Commit 608f24c

Browse files
JulowJulow
committed
html: Output meta charset before any stylesheet
This moves the charset meta element closer to the beginning of the document but that's not the motivation for this change. The generator meta element has a variable length due to the %%VERSION%% watermarking and that makes the test fail after a 'dune subst'. The generator meta and the charset meta elements are sometimes formatted on the same line, depending on the length of the version string. This do not happen anymore.
1 parent f8844ee commit 608f24c

File tree

379 files changed

+706
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+706
-641
lines changed

‎src/html/html_page.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ let default_meta_elements ~config ~url =
9393
let theme_uri = Config.theme_uri config in
9494
let odoc_css_uri = file_uri ~config ~url theme_uri "odoc.css" in
9595
[
96-
Html.link ~rel:[ `Stylesheet ] ~href:odoc_css_uri ();
9796
Html.meta ~a:[ Html.a_charset "utf-8" ] ();
97+
Html.link ~rel:[ `Stylesheet ] ~href:odoc_css_uri ();
9898
Html.meta
9999
~a:[ Html.a_name "generator"; Html.a_content "odoc %%VERSION%%" ]
100100
();

‎test/generators/html/Alerts-Top1.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Top1 (Alerts.Top1)</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
3+
<head><title>Top1 (Alerts.Top1)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

‎test/generators/html/Alerts-Top2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Top2 (Alerts.Top2)</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
3+
<head><title>Top2 (Alerts.Top2)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

‎test/generators/html/Alerts.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Alerts (Alerts)</title><link rel="stylesheet" href="odoc.css"/>
4-
<meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
3+
<head><title>Alerts (Alerts)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
5+
<meta name="generator" content="odoc %%VERSION%%"/>
56
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
67
<script src="highlight.pack.js"></script>
78
<script>hljs.initHighlightingOnLoad();</script>

‎test/generators/html/Alias-X.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>X (Alias.X)</title><link rel="stylesheet" href="odoc.css"/>
4-
<meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
3+
<head><title>X (Alias.X)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
5+
<meta name="generator" content="odoc %%VERSION%%"/>
56
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
67
<script src="highlight.pack.js"></script>
78
<script>hljs.initHighlightingOnLoad();</script>

‎test/generators/html/Alias.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Alias (Alias)</title><link rel="stylesheet" href="odoc.css"/>
4-
<meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
3+
<head><title>Alias (Alias)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
5+
<meta name="generator" content="odoc %%VERSION%%"/>
56
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
67
<script src="highlight.pack.js"></script>
78
<script>hljs.initHighlightingOnLoad();</script>

‎test/generators/html/Bugs.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Bugs (Bugs)</title><link rel="stylesheet" href="odoc.css"/>
4-
<meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
3+
<head><title>Bugs (Bugs)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
5+
<meta name="generator" content="odoc %%VERSION%%"/>
56
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
67
<script src="highlight.pack.js"></script>
78
<script>hljs.initHighlightingOnLoad();</script>

‎test/generators/html/Bugs_post_406-class-let_open'.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head><title>let_open' (Bugs_post_406.let_open')</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
4+
<meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

‎test/generators/html/Bugs_post_406-class-type-let_open.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head><title>let_open (Bugs_post_406.let_open)</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
4+
<meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

‎test/generators/html/Bugs_post_406.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Bugs_post_406 (Bugs_post_406)</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
3+
<head><title>Bugs_post_406 (Bugs_post_406)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

0 commit comments

Comments
 (0)