From ee67e6bc578a421c691d7fce0a1aa87f9157dca7 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:40:13 +0100 Subject: don't use pure black and white, change base font --- lib/erl_docgen/priv/css/otp_doc.css | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 219740a557..fdcd2bca25 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -1,7 +1,8 @@ /* standard OTP style sheet */ body { - background: white; - font-family: Verdana, Arial, Helvetica, sans-serif; + background: #fefefe; + color: #3E4349; + font-family: 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif; margin: 0; padding: 0; border: 0; @@ -14,7 +15,7 @@ th { font-family: Verdana, Arial, Helvetica, sans-serif } td { font-family: Verdana, Arial, Helvetica, sans-serif } p { font-family: Verdana, Arial, Helvetica, sans-serif } -.header { background: #222; color: #fff } +.header { background: #222; color: #fefefe } .top { background: #efe } .otp { background: #efe } .erlang { background: #ffe } @@ -28,7 +29,7 @@ a:visited { color: blue; text-decoration: none } #container { width: 100%; margin: 0; - background-color: #fff; + background-color: #fefefe; } #leftnav { @@ -67,7 +68,7 @@ span.bold_code { font-family: Courier, monospace; font-weight: bold } span.code { font-family: Courier, monospace; font-weight: normal } .note, .warning, .do, .dont { - border: solid black 1px; + border: solid #3E4349 1px; margin: 1em 3em; } .note .label { @@ -78,7 +79,7 @@ span.code { font-family: Courier, monospace; font-weight: normal } } .note .content { background: #eafeea; - color: black; + color: #3E4349; line-height: 120%; font-size: 90%; padding: 5px 10px; @@ -91,7 +92,7 @@ span.code { font-family: Courier, monospace; font-weight: normal } } .warning .content { background: #FFF0F0; - color: black; + color: #3E4349; line-height: 120%; font-size: 90%; padding: 5px 10px; @@ -104,7 +105,7 @@ span.code { font-family: Courier, monospace; font-weight: normal } } .do .content { background: #eafeea; - color: black; + color: #3E4349; line-height: 120%; font-size: 90%; padding: 5px 10px; @@ -117,7 +118,7 @@ span.code { font-family: Courier, monospace; font-weight: normal } } .dont .content { background: #FFF0F0; - color: black; + color: #3E4349; line-height: 120%; font-size: 90%; padding: 5px 10px; -- cgit v1.2.3 From d621aa8ab3420de2abaf7d839808b7e62f56ec61 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:40:57 +0100 Subject: don't use red for the line separating panel --- lib/erl_docgen/priv/css/otp_doc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index fdcd2bca25..bdb0db5e30 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -42,7 +42,7 @@ a:visited { color: blue; text-decoration: none } overflow:auto; margin: 0; padding: 1px; - border-right: 1px solid red; + border-right: 1px solid #ccc; } #content { -- cgit v1.2.3 From 0e6d53ca9790b8cc8ea8cf87e73b1ad052364231 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:41:34 +0100 Subject: use mono as first font family for code --- lib/erl_docgen/priv/css/otp_doc.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index bdb0db5e30..5430a17e22 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -64,8 +64,8 @@ a:visited { color: blue; text-decoration: none } margin: 15px; /* Magins for inner DIV inside each DIV (to provide padding) */ } -span.bold_code { font-family: Courier, monospace; font-weight: bold } -span.code { font-family: Courier, monospace; font-weight: normal } +span.bold_code { font-family: mono, Courier, monospace; white-space: pre; font-weight: bold } +span.code { font-family: mono, Courier, monospace; white-space: pre; font-weight: normal } .note, .warning, .do, .dont { border: solid #3E4349 1px; @@ -138,7 +138,7 @@ span.code { font-family: Courier, monospace; font-weight: normal } font-size: 120%; } -pre { font-family: Courier, monospace; font-weight: normal } +pre { font-family: mono, Courier, monospace; font-weight: normal } .REFBODY { margin-left: 13mm } -- cgit v1.2.3 From 5aa3667dc23df5d16e5b2492b37d514b9322d917 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:44:58 +0100 Subject: improve example box colors and spacing --- lib/erl_docgen/priv/css/otp_doc.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 5430a17e22..aade375210 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -129,8 +129,9 @@ span.code { font-family: mono, Courier, monospace; white-space: pre; font } .example { - background-color:#eeeeff; - padding: 0px 10px; + background-color:#f1f3f5; + border: 1px solid #dee2e6; + padding: 0.5em 1em; } .extrafrontpageinfo { color: #C00; -- cgit v1.2.3 From 73c51597876ca53c4062dbd0b8405258c49e734a Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:51:13 +0100 Subject: improve warning/info colors --- lib/erl_docgen/priv/css/otp_doc.css | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index aade375210..4310d11f6d 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -68,38 +68,37 @@ span.bold_code { font-family: mono, Courier, monospace; white-space: pre; font span.code { font-family: mono, Courier, monospace; white-space: pre; font-weight: normal } .note, .warning, .do, .dont { - border: solid #3E4349 1px; + border: 1px solid #495057; margin: 1em 3em; } .note .label { - background: #30d42a; - color: white; + background-color: #2b8a3e; + color: #fefefe; font-weight: bold; padding: 5px 10px; } .note .content { - background: #eafeea; - color: #3E4349; + background: #f8f9fa; line-height: 120%; font-size: 90%; - padding: 5px 10px; + padding: 0.5em 1em; } .warning .label { - background: #C00; - color: white; + background: #c92a2a; + color: #fefefe; font-weight: bold; padding: 5px 10px; } .warning .content { - background: #FFF0F0; - color: #3E4349; + background-color: #f8f9fa; + border: 1px solid #dee2e6; line-height: 120%; font-size: 90%; - padding: 5px 10px; + padding: 0.5em 1em; } .do .label { background: #30d42a; - color: white; + color: #fefefe; font-weight: bold; padding: 5px 10px; } @@ -112,7 +111,7 @@ span.code { font-family: mono, Courier, monospace; white-space: pre; font } .dont .label { background: #C00; - color: white; + color: #fefefe; font-weight: bold; padding: 5px 10px; } -- cgit v1.2.3 From d5402ace1bfec1cb55a9550ee380d823d6c83d1d Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:53:21 +0100 Subject: improve link colors --- lib/erl_docgen/priv/css/otp_doc.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 4310d11f6d..aec2207ecd 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -22,9 +22,9 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif } .otp2 { background: #efe } .app { background: #ffe } -a:link { color: blue; text-decoration: none } -a:active { color: blue; text-decoration: none } -a:visited { color: blue; text-decoration: none } +a:link { color: #1862ab; text-decoration: none } +a:active { color: #1c7cd6; text-decoration: none } +a:visited { color: #1b6ec2; text-decoration: none } #container { width: 100%; -- cgit v1.2.3 From 058b082c1c4797f2211b03358d8bb5e657fcded9 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 12:55:22 +0100 Subject: remove drop shadows from logo --- lib/erl_docgen/priv/images/erlang-logo.gif | Bin 11588 -> 3342 bytes lib/erl_docgen/priv/images/erlang-logo.png | Bin 14795 -> 5837 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/images/erlang-logo.gif b/lib/erl_docgen/priv/images/erlang-logo.gif index abf5f225d7..ae13168429 100644 Binary files a/lib/erl_docgen/priv/images/erlang-logo.gif and b/lib/erl_docgen/priv/images/erlang-logo.gif differ diff --git a/lib/erl_docgen/priv/images/erlang-logo.png b/lib/erl_docgen/priv/images/erlang-logo.png index 56291aac15..41bba97417 100644 Binary files a/lib/erl_docgen/priv/images/erlang-logo.png and b/lib/erl_docgen/priv/images/erlang-logo.png differ -- cgit v1.2.3 From 45bda44b08d01c0835b7402b752b9c7b07a4b77c Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 13:40:58 +0100 Subject: center erlang logo on left panel --- lib/erl_docgen/priv/css/otp_doc.css | 5 +++++ lib/erl_docgen/priv/xsl/db_html.xsl | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index aec2207ecd..6f0019fb32 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -145,3 +145,8 @@ pre { font-family: mono, Courier, monospace; font-weight: normal } .REFTYPES { margin-left: 8mm } footer { } + +.erlang-logo-wrapper{ + text-align: center; + margin-bottom: 1em; +} diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index edab8e1c7e..beb52c69c1 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -799,10 +799,14 @@ - Erlang logo +
+ +
- Erlang logo +
+ +

-- cgit v1.2.3 From 802900e22708ff5258d1a3619e4241ef09a159e6 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 13:46:46 +0100 Subject: improve docs landing page title and subtitle --- lib/erl_docgen/priv/css/otp_doc.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 6f0019fb32..ed5b8d5180 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -150,3 +150,13 @@ footer { } text-align: center; margin-bottom: 1em; } + +.main-title{ + text-align: center; +} + +.main-description{ + text-align: center; + margin: 2em 0; + font-size: 1.5em; +} -- cgit v1.2.3 From 64bf3e97309f1fd7f6fd5881e3b244b6c6d7e421 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 13:51:14 +0100 Subject: use lists for lists of links --- lib/erl_docgen/priv/xsl/db_html.xsl | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index beb52c69c1..c788f02454 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -810,26 +810,26 @@
- +
@@ -847,8 +847,10 @@
- Expand All
- Contract All +
-- cgit v1.2.3 From d6cef898ff0d913e0837f33321374ccb1870fb02 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 13:54:09 +0100 Subject: title case titles --- lib/erl_docgen/priv/xsl/db_html.xsl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index c788f02454..b478a40cf7 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -386,7 +386,7 @@

- DATA TYPES + Data Types

@@ -1779,7 +1779,7 @@ -

MODULE

+

Module

@@ -1791,7 +1791,7 @@ -

MODULE SUMMARY

+

Module Summary

@@ -1802,7 +1802,7 @@ -

C LIBRARY

+

C Library

@@ -1814,7 +1814,7 @@ -

LIBRARY SUMMARY

+

Library Summary

@@ -1825,7 +1825,7 @@ -

COMMAND

+

Command

@@ -1837,7 +1837,7 @@ -

COMMAND SUMMARY

+

Command Summary

@@ -1848,7 +1848,7 @@ -

FILE

+

File

@@ -1860,7 +1860,7 @@ -

FILE SUMMARY

+

File Summary

@@ -1872,7 +1872,7 @@ -

APPLICATION

+

Application

@@ -1884,7 +1884,7 @@ -

APPLICATION SUMMARY

+

Application Summary

@@ -1895,7 +1895,7 @@ -

DESCRIPTION

+

Description

@@ -1910,7 +1910,7 @@

- EXPORTS + Exports

-- cgit v1.2.3 From 140adf0584f2ff5e0853b5dc763dc8082afb7750 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 14:38:25 +0100 Subject: use title tags on titles --- lib/erl_docgen/priv/xsl/db_html.xsl | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index b478a40cf7..6a85f95e09 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -1260,11 +1260,7 @@ -

- - Chapters - -

+

Chapters

    @@ -1425,11 +1421,7 @@ -

    - - Table of Contents - -

    +

    Table of Contents

      @@ -2272,11 +2264,7 @@ -

      - - Chapters - -

      +

      Chapters

        -- cgit v1.2.3 From 830a3cc565b43954988ffedf56d6a00a45e4608a Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 14:39:01 +0100 Subject: add semantic markup to section info --- lib/erl_docgen/priv/xsl/db_html.xsl | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index 6a85f95e09..bdfd839cad 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -1252,11 +1252,9 @@ -

        -
        - User's Guide
        - Version -

        +

        +

        User's Guide

        +

        Version

        @@ -1413,11 +1411,9 @@ -

        -
        - Reference Manual
        - Version -

        +

        +

        Reference Manual

        +

        Version

        @@ -2256,11 +2252,9 @@ -

        -
        - Release Notes
        - Version -

        +

        +

        Release Notes

        +

        Version

        -- cgit v1.2.3 From 6be6bb8a81d875ddb7cbe5c19766d7050236589b Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 14:39:33 +0100 Subject: use list on list of links --- lib/erl_docgen/priv/css/otp_doc.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index ed5b8d5180..b1d18b09d5 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -131,6 +131,7 @@ span.code { font-family: mono, Courier, monospace; white-space: pre; font background-color:#f1f3f5; border: 1px solid #dee2e6; padding: 0.5em 1em; + margin: 1em 0; } .extrafrontpageinfo { color: #C00; -- cgit v1.2.3 From 298a7e6af185fecc01063a53e35ced4d5a00484a Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 14:39:57 +0100 Subject: update flipmenu icons --- lib/erl_docgen/priv/js/flipmenu/flip_closed.gif | Bin 82 -> 113 bytes lib/erl_docgen/priv/js/flipmenu/flip_open.gif | Bin 86 -> 119 bytes lib/erl_docgen/priv/js/flipmenu/flip_static.gif | Bin 109 -> 132 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/js/flipmenu/flip_closed.gif b/lib/erl_docgen/priv/js/flipmenu/flip_closed.gif index 9a27c7c25d..fd4457f76a 100644 Binary files a/lib/erl_docgen/priv/js/flipmenu/flip_closed.gif and b/lib/erl_docgen/priv/js/flipmenu/flip_closed.gif differ diff --git a/lib/erl_docgen/priv/js/flipmenu/flip_open.gif b/lib/erl_docgen/priv/js/flipmenu/flip_open.gif index 9dda60e73a..af93d892e8 100644 Binary files a/lib/erl_docgen/priv/js/flipmenu/flip_open.gif and b/lib/erl_docgen/priv/js/flipmenu/flip_open.gif differ diff --git a/lib/erl_docgen/priv/js/flipmenu/flip_static.gif b/lib/erl_docgen/priv/js/flipmenu/flip_static.gif index 2b3ddb5382..4cc914a50a 100644 Binary files a/lib/erl_docgen/priv/js/flipmenu/flip_static.gif and b/lib/erl_docgen/priv/js/flipmenu/flip_static.gif differ -- cgit v1.2.3 From 224a1977ac4efc77078adc8490a396805a3dd270 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 16:41:10 +0100 Subject: improve table styling --- lib/erl_docgen/priv/css/otp_doc.css | 45 ++++++++++++++++++++++++++++++++++++- lib/erl_docgen/priv/xsl/db_html.xsl | 8 ++++--- 2 files changed, 49 insertions(+), 4 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index b1d18b09d5..1ff9bcade2 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -69,7 +69,7 @@ span.code { font-family: mono, Courier, monospace; white-space: pre; font .note, .warning, .do, .dont { border: 1px solid #495057; - margin: 1em 3em; + margin: 1em 0; } .note .label { background-color: #2b8a3e; @@ -161,3 +161,46 @@ footer { } margin: 2em 0; font-size: 1.5em; } + +.doc-table-wrapper{ + width: 100%; +} + +.doc-table{ + min-width: 50%; + margin: 0 auto; +} + +.doc-table-caption{ + margin-top: 1em; + font-style: italic; + text-align: center; +} + +table { + border-collapse: collapse; + min-width: 50%; + margin: 1em; +} + +table, th, td { + border: 1px solid #666; +} + +th, td { + padding: 0.5em; + text-align: left; +} + +tr:hover { + background-color: #f5f5f5; +} + +tr:nth-child(even) { + background-color: #f2f2f2; +} + +th { + background-color: #777; + color: #fefefe; +} diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index bdfd839cad..529d28e88f 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -1135,7 +1135,8 @@ - +
        +
        @@ -1147,6 +1148,7 @@ + @@ -1166,11 +1168,11 @@ - Table +

        Table .:   - +

        -- cgit v1.2.3 From b234f1de2c8eaba384b30014f01cfc8d58b096bd Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 16:42:40 +0100 Subject: improve left panel section info and menu --- lib/erl_docgen/priv/css/otp_doc.css | 13 +++++++++++++ lib/erl_docgen/priv/xsl/db_html.xsl | 15 +++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 1ff9bcade2..cbeb1037a9 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -204,3 +204,16 @@ th { background-color: #777; color: #fefefe; } + +.section-title, .section-subtitle, .section-version{ + text-align: center; + margin: 0; +} + +.section-title{ + font-weight: bold; +} + +.section-version{ + font-size: small; +} diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index 529d28e88f..9f49fc31d5 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -809,7 +809,7 @@ -
        +
        • User's Guide
        • @@ -845,7 +845,6 @@ -
          • Expand All
          • @@ -1252,12 +1251,12 @@
            - -

            User's Guide

            Version

            + +

            Chapters

            @@ -1411,12 +1410,12 @@
            - -

            Reference Manual

            Version

            + +

            Table of Contents

            @@ -2252,12 +2251,12 @@
            - -

            Release Notes

            Version

            + +

            Chapters

            -- cgit v1.2.3 From 298ee093472695d459fdc0d3a2254fbb4976db5a Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 16:43:30 +0100 Subject: clickable anchors for standard sections --- lib/erl_docgen/priv/xsl/db_html.xsl | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index 9f49fc31d5..c3e7352f7b 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -386,7 +386,7 @@

            - Data Types + Data Types

            @@ -1768,7 +1768,7 @@ -

            Module

            +

            Module

            @@ -1780,7 +1780,7 @@ -

            Module Summary

            +

            Module Summary

            @@ -1791,7 +1791,7 @@ -

            C Library

            +

            C Library

            @@ -1803,7 +1803,7 @@ -

            Library Summary

            +

            Library Summary

            @@ -1814,7 +1814,7 @@ -

            Command

            +

            Command

            @@ -1826,7 +1826,7 @@ -

            Command Summary

            +

            Command Summary

            @@ -1837,7 +1837,7 @@ -

            File

            +

            File

            @@ -1849,7 +1849,7 @@ -

            File Summary

            +

            File Summary

            @@ -1861,7 +1861,7 @@ -

            Application

            +

            Application

            @@ -1873,7 +1873,7 @@ -

            Application Summary

            +

            Application Summary

            @@ -1884,7 +1884,7 @@ -

            Description

            +

            Description

            @@ -1898,9 +1898,7 @@ -

            - Exports -

            +

            Exports

            -- cgit v1.2.3 From db41a7fe2ebbc44c7fa16835630c11fe78a9cc4a Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 16:43:53 +0100 Subject: anchor section shouldn't look like a link --- lib/erl_docgen/priv/css/otp_doc.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index cbeb1037a9..b73aeb27ae 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -217,3 +217,11 @@ th { .section-version{ font-size: small; } + +.expand-collapse-items{ + font-size: small; +} + +h3>a{ + color: #3E4349; +} -- cgit v1.2.3 From 1a48f131dd39ae406a3aedf997090a54052a42c2 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 17:20:28 +0100 Subject: simplify font-family choice --- lib/erl_docgen/priv/css/otp_doc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index b73aeb27ae..f4388bae03 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -2,7 +2,7 @@ body { background: #fefefe; color: #3E4349; - font-family: 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif; + font-family: serif; margin: 0; padding: 0; border: 0; -- cgit v1.2.3 From 985d1a0f274048cc891b49d68e7d905f19643c48 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 17:20:54 +0100 Subject: force black on title anchors --- lib/erl_docgen/priv/css/otp_doc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index f4388bae03..950bfdcf03 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -223,5 +223,5 @@ th { } h3>a{ - color: #3E4349; + color: #3E4349 !important; } -- cgit v1.2.3 From 65bba4855da0e4c753222f947cc065b534946e54 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 17:21:06 +0100 Subject: split logo from top menu to change menu order --- lib/erl_docgen/priv/xsl/db_html.xsl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index c3e7352f7b..91d830a667 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -796,7 +796,7 @@ - +
            @@ -809,7 +809,9 @@
            +
            +
            • User's Guide
            • @@ -1251,6 +1253,8 @@
              + +

              User's Guide

              Version

              @@ -1410,6 +1414,8 @@
              + +

              Reference Manual

              Version

              @@ -2249,6 +2255,8 @@
              + +

              Release Notes

              Version

              -- cgit v1.2.3 From 1f0689526a75e776bb4486da55cd48cb2e2efb15 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 17:30:55 +0100 Subject: add style for hr --- lib/erl_docgen/priv/css/otp_doc.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css index 950bfdcf03..fbcf53125f 100644 --- a/lib/erl_docgen/priv/css/otp_doc.css +++ b/lib/erl_docgen/priv/css/otp_doc.css @@ -225,3 +225,9 @@ th { h3>a{ color: #3E4349 !important; } + +hr{ + border: 0; + border-top: 1px solid #aaa; +} + -- cgit v1.2.3 From 2887ebb0cd748f60cfe410f414ad27acfc7a3cb5 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 21:22:52 +0100 Subject: add progressive enhanced syntax highlighter it loads a script at the end of the page that loads the required resources and initializes the syntax highlighter. if js is disabled or blocked nothing happens, the code blocks will display with the style they had until now --- lib/erl_docgen/priv/css/Makefile | 3 +- lib/erl_docgen/priv/css/highlight.css | 96 ++++++++++++++++++++++++++++++++ lib/erl_docgen/priv/js/flipmenu/Makefile | 1 + lib/erl_docgen/priv/js/highlight.js | 39 +++++++++++++ lib/erl_docgen/priv/js/highlight.pack.js | 2 + lib/erl_docgen/priv/xsl/db_html.xsl | 4 +- 6 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 lib/erl_docgen/priv/css/highlight.css create mode 100644 lib/erl_docgen/priv/js/highlight.js create mode 100644 lib/erl_docgen/priv/js/highlight.pack.js (limited to 'lib/erl_docgen/priv') diff --git a/lib/erl_docgen/priv/css/Makefile b/lib/erl_docgen/priv/css/Makefile index c317411d32..e3d2ee7e3f 100644 --- a/lib/erl_docgen/priv/css/Makefile +++ b/lib/erl_docgen/priv/css/Makefile @@ -39,7 +39,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/erl_docgen-$(VSN) CSS_FILES = \ - otp_doc.css + otp_doc.css \ + highlight.css # ---------------------------------------------------- diff --git a/lib/erl_docgen/priv/css/highlight.css b/lib/erl_docgen/priv/css/highlight.css new file mode 100644 index 0000000000..d5bd1d2a9a --- /dev/null +++ b/lib/erl_docgen/priv/css/highlight.css @@ -0,0 +1,96 @@ +/* + +Atom One Light by Daniel Gamage +Original One Light Syntax theme from https://github.com/atom/one-light-syntax + +base: #fafafa +mono-1: #383a42 +mono-2: #686b77 +mono-3: #a0a1a7 +hue-1: #0184bb +hue-2: #4078f2 +hue-3: #a626a4 +hue-4: #50a14f +hue-5: #e45649 +hue-5-2: #c91243 +hue-6: #986801 +hue-6-2: #c18401 + +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + color: #383a42; + background: #fafafa; +} + +.hljs-comment, +.hljs-quote { + color: #a0a1a7; + font-style: italic; +} + +.hljs-doctag, +.hljs-keyword, +.hljs-formula { + color: #a626a4; +} + +.hljs-section, +.hljs-name, +.hljs-selector-tag, +.hljs-deletion, +.hljs-subst { + color: #e45649; +} + +.hljs-literal { + color: #0184bb; +} + +.hljs-string, +.hljs-regexp, +.hljs-addition, +.hljs-attribute, +.hljs-meta-string { + color: #50a14f; +} + +.hljs-built_in, +.hljs-class .hljs-title { + color: #c18401; +} + +.hljs-attr, +.hljs-variable, +.hljs-template-variable, +.hljs-type, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo, +.hljs-number { + color: #986801; +} + +.hljs-symbol, +.hljs-bullet, +.hljs-link, +.hljs-meta, +.hljs-selector-id, +.hljs-title { + color: #4078f2; +} + +.hljs-emphasis { + font-style: italic; +} + +.hljs-strong { + font-weight: bold; +} + +.hljs-link { + text-decoration: underline; +} diff --git a/lib/erl_docgen/priv/js/flipmenu/Makefile b/lib/erl_docgen/priv/js/flipmenu/Makefile index 06a13defca..ad6d4acb6c 100644 --- a/lib/erl_docgen/priv/js/flipmenu/Makefile +++ b/lib/erl_docgen/priv/js/flipmenu/Makefile @@ -76,6 +76,7 @@ release_spec: opt release_docs_spec: $(INSTALL_DIR) "$(RELEASE_PATH)/doc/js/flipmenu" $(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) "$(RELEASE_PATH)/doc/js/flipmenu" + $(INSTALL_DATA) ../highlight.js ../highlight.pack.js "$(RELEASE_PATH)/doc/js/" release_tests_spec: diff --git a/lib/erl_docgen/priv/js/highlight.js b/lib/erl_docgen/priv/js/highlight.js new file mode 100644 index 0000000000..0594b42aa3 --- /dev/null +++ b/lib/erl_docgen/priv/js/highlight.js @@ -0,0 +1,39 @@ +/*globals document, window*/ +window.addEventListener("load", function () { + "use strict"; + var body = document.body, + base = window.__otpTopDocDir || "/doc/js/", + cssLink = document.createElement('link'), + script = document.createElement('script'), + intervalId, attempts = 0; + + cssLink.rel = "stylesheet"; + cssLink.href = base + "../highlight.css"; + script.src = base + "highlight.pack.js"; + + body.appendChild(cssLink); + body.appendChild(script); + + function doHighlight() { + attempts += 1; + + if (attempts > 20) { + window.clearInterval(intervalId); + return; + } + + if (!window.hljs) { + return; + } + + window.clearInterval(intervalId); + + var i, len, nodes = document.querySelectorAll('.example'); + for (i = 0, len = nodes.length; i < len; i += 1) { + window.hljs.highlightBlock(nodes[i]); + } + + } + + intervalId = window.setInterval(doHighlight, 50); +}); diff --git a/lib/erl_docgen/priv/js/highlight.pack.js b/lib/erl_docgen/priv/js/highlight.pack.js new file mode 100644 index 0000000000..073d39e644 --- /dev/null +++ b/lib/erl_docgen/priv/js/highlight.pack.js @@ -0,0 +1,2 @@ +/*! highlight.js v9.7.0 | BSD3 License | git.io/hljslicense */ +!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/[&<>]/gm,function(e){return I[e]})}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return R(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||R(i))return i}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset"}function u(e){l+=""}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):E(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"===e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function h(e,n,t,r){var a=r?"":y.classPrefix,i='',i+n+o}function p(){var e,t,r,a;if(!E.k)return n(B);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(B);r;)a+=n(B.substr(t,r.index-t)),e=g(E,r),e?(M+=e[1],a+=h(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(B);return a+n(B.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!x[E.sL])return n(B);var t=e?l(E.sL,B,!0,L[E.sL]):f(B,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(L[E.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){k+=null!=E.sL?d():p(),B=""}function v(e){k+=e.cN?h(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(B+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?B+=n:(t.eB&&(B+=n),b(),t.rB||t.eB||(B=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?B+=n:(a.rE||a.eE||(B+=n),b(),a.eE&&(B=n));do E.cN&&(k+=C),E.skip||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"")+'"');return B+=n,n.length||1}var N=R(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var w,E=i||N,L={},k="";for(w=E;w!==N;w=w.parent)w.cN&&(k=h(w.cN,"",!0)+k);var B="",M=0;try{for(var I,j,O=0;;){if(E.t.lastIndex=O,I=E.t.exec(t),!I)break;j=m(t.substr(O,I.index-O),I[0]),O=I.index+j}for(m(t.substr(O)),w=E;w.parent;w=w.parent)w.cN&&(k+=C);return{r:M,value:k,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function f(e,t){t=t||y.languages||E(x);var r={r:0,value:n(e)},a=r;return t.filter(R).forEach(function(n){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return y.tabReplace||y.useBR?e.replace(M,function(e,n){return y.useBR&&"\n"===e?"
              ":y.tabReplace?n.replace(/\t/g,y.tabReplace):void 0}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n,t,r,o,s,p=i(e);a(p)||(y.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e,s=n.textContent,r=p?l(p,s,!0):f(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=g(r.value),e.innerHTML=r.value,e.className=h(e.className,p,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function d(e){y=o(y,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");w.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function N(){return E(x)}function R(e){return e=(e||"").toLowerCase(),x[e]||x[L[e]]}var w=[],E=Object.keys,x={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="
              ",y={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},I={"&":"&","<":"<",">":">"};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=R,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}}); \ No newline at end of file diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index 91d830a667..a9f7ff9e5f 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -659,7 +659,7 @@ - +
              +