diff options
-rw-r--r-- | 01-title.md | 24 | ||||
-rw-r--r-- | 02-preface.md | 5 | ||||
-rw-r--r-- | 03-lexical-syntax.md | 5 | ||||
-rw-r--r-- | 04-identifiers-names-and-scopes.md | 5 | ||||
-rw-r--r-- | 05-types.md | 5 | ||||
-rw-r--r-- | 06-basic-declarations-and-definitions.md | 5 | ||||
-rw-r--r-- | 07-classes-and-objects.md | 5 | ||||
-rw-r--r-- | 08-expressions.md | 5 | ||||
-rw-r--r-- | 09-implicit-parameters-and-views.md | 5 | ||||
-rw-r--r-- | 10-pattern-matching.md | 5 | ||||
-rw-r--r-- | 11-top-level-definitions.md | 5 | ||||
-rw-r--r-- | 12-xml-expressions-and-patterns.md | 5 | ||||
-rw-r--r-- | 13-user-defined-annotations.md | 5 | ||||
-rw-r--r-- | 14-the-scala-standard-library.md | 5 | ||||
-rw-r--r-- | 15-syntax-summary.md (renamed from 15-scala-syntax-summary.md) | 7 | ||||
-rw-r--r-- | 16-references.md | 4 | ||||
-rw-r--r-- | _layouts/default.yml | 302 | ||||
-rw-r--r-- | index.md | 13 |
18 files changed, 401 insertions, 14 deletions
diff --git a/01-title.md b/01-title.md index 3e7d8e681e..c43908e61c 100644 --- a/01-title.md +++ b/01-title.md @@ -1,14 +1,12 @@ -% The Scala Language Specification, Version 2.9 -% Martin Odersky; - Philippe Altherr; - Vincent Cremet; - Gilles Dubochet; - Burak Emir; - Philipp Haller; - Stéphane Micheloud; - Nikolay Mihaylov; - Michel Schinz; - Erik Stenman; - Matthias Zenger -% 24th May 2011 +--- +title: The Scala Language Specification +layout: default +--- + +# The Scala Language Specification, Version 2.11 + +## Martin Odersky, Philippe Altherr, Vincent Cremet, Gilles Dubochet, Burak Emir, Philipp Haller, Stéphane Micheloud, Adriaan Moors, Nikolay Mihaylov, Lukas Rytz, Michel Schinz, Erik Stenman, Matthias Zenger + + +## Markdown conversion by Iain McGinniss. diff --git a/02-preface.md b/02-preface.md index 0e8b28958c..50e25d6c00 100644 --- a/02-preface.md +++ b/02-preface.md @@ -1,3 +1,8 @@ +--- +title: Preface +layout: default +--- + ## Preface Scala is a Java-like programming language which unifies diff --git a/03-lexical-syntax.md b/03-lexical-syntax.md index 7ea15ec9f4..83c05d285c 100644 --- a/03-lexical-syntax.md +++ b/03-lexical-syntax.md @@ -1,3 +1,8 @@ +--- +title: Lexical Syntax +layout: default +--- + # Lexical Syntax Scala programs are written using the Unicode Basic Multilingual Plane diff --git a/04-identifiers-names-and-scopes.md b/04-identifiers-names-and-scopes.md index 7caedb0241..19f875f4e5 100644 --- a/04-identifiers-names-and-scopes.md +++ b/04-identifiers-names-and-scopes.md @@ -1,3 +1,8 @@ +--- +title: Identifiers, Names and Scopes +layout: default +--- + # Identifiers, Names and Scopes Names in Scala identify types, values, methods, and classes which are diff --git a/05-types.md b/05-types.md index 7f701c6cf0..d1d2609797 100644 --- a/05-types.md +++ b/05-types.md @@ -1,3 +1,8 @@ +--- +title: Types +layout: default +--- + # Types ``` diff --git a/06-basic-declarations-and-definitions.md b/06-basic-declarations-and-definitions.md index 8abe68c137..175a5c71f0 100644 --- a/06-basic-declarations-and-definitions.md +++ b/06-basic-declarations-and-definitions.md @@ -1,3 +1,8 @@ +--- +title: Basic Declarations and Definitions +layout: default +--- + # Basic Declarations and Definitions diff --git a/07-classes-and-objects.md b/07-classes-and-objects.md index 012bbe44ff..75c8894617 100644 --- a/07-classes-and-objects.md +++ b/07-classes-and-objects.md @@ -1,3 +1,8 @@ +--- +title: Classes and Objects +layout: default +--- + # Classes and Objects ``` diff --git a/08-expressions.md b/08-expressions.md index 6e8e44051d..0c685f28e9 100644 --- a/08-expressions.md +++ b/08-expressions.md @@ -1,3 +1,8 @@ +--- +title: Expressions +layout: default +--- + # Expressions ``` diff --git a/09-implicit-parameters-and-views.md b/09-implicit-parameters-and-views.md index c6ee335f55..0dd81b89e8 100644 --- a/09-implicit-parameters-and-views.md +++ b/09-implicit-parameters-and-views.md @@ -1,3 +1,8 @@ +--- +title: Implicit Parameters and Views +layout: default +--- + # Implicit Parameters and Views ## The Implicit Modifier diff --git a/10-pattern-matching.md b/10-pattern-matching.md index 73f672c24a..1e214a6e36 100644 --- a/10-pattern-matching.md +++ b/10-pattern-matching.md @@ -1,3 +1,8 @@ +--- +title: Pattern Matching +layout: default +--- + # Pattern Matching ## Patterns diff --git a/11-top-level-definitions.md b/11-top-level-definitions.md index 4f63153fe5..eb379add6a 100644 --- a/11-top-level-definitions.md +++ b/11-top-level-definitions.md @@ -1,3 +1,8 @@ +--- +title: Top-Level Definitions +layout: default +--- + # Top-Level Definitions ## Compilation Units diff --git a/12-xml-expressions-and-patterns.md b/12-xml-expressions-and-patterns.md index d1a1e33b81..7707e91bae 100644 --- a/12-xml-expressions-and-patterns.md +++ b/12-xml-expressions-and-patterns.md @@ -1,3 +1,8 @@ +--- +title: XML Expressions and Patterns +layout: default +--- + # XML Expressions and Patterns __By Burak Emir__ diff --git a/13-user-defined-annotations.md b/13-user-defined-annotations.md index 3d7fba6746..e8c35fdba3 100644 --- a/13-user-defined-annotations.md +++ b/13-user-defined-annotations.md @@ -1,3 +1,8 @@ +--- +title: User-Defined Annotations +layout: default +--- + # User-Defined Annotations ``` diff --git a/14-the-scala-standard-library.md b/14-the-scala-standard-library.md index 9b39d93ff1..95904a4c12 100644 --- a/14-the-scala-standard-library.md +++ b/14-the-scala-standard-library.md @@ -1,3 +1,8 @@ +--- +title: The Scala Standard Library +layout: default +--- + # The Scala Standard Library The Scala standard library consists of the package `scala` with a diff --git a/15-scala-syntax-summary.md b/15-syntax-summary.md index d4d5166312..2dd9470b23 100644 --- a/15-scala-syntax-summary.md +++ b/15-syntax-summary.md @@ -1,4 +1,9 @@ -# Scala Syntax Summary +--- +title: Syntax Summary +layout: default +--- + +# Syntax Summary The following descriptions of Scala tokens uses literal characters `‘c’` when referring to the ASCII fragment `\u0000` – `\u007F`. diff --git a/16-references.md b/16-references.md index 82040075b6..aab189dc3f 100644 --- a/16-references.md +++ b/16-references.md @@ -1,3 +1,7 @@ +--- +title: References +layout: default +--- # References diff --git a/_layouts/default.yml b/_layouts/default.yml new file mode 100644 index 0000000000..3c0dbfe47e --- /dev/null +++ b/_layouts/default.yml @@ -0,0 +1,302 @@ +<!DOCTYPE html> +<html> +<head> + <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> + <script type="text/x-mathjax-config"> + MathJax.Hub.Config({ + tex2jax: { + inlineMath: [['$','$'], ['\\(','\\)']], + skipTags: ['script', 'noscript', 'style', 'textarea', 'pre'] + } + }); + </script> + <script type="text/javascript" src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> + </script> + <style type="text/css" media="screen"> + body { + font-family: Helvetica, arial, sans-serif; + font-size: 14px; + line-height: 1.6; + padding-top: 10px; + padding-bottom: 10px; + background-color: white; + padding: 30px; } + + body > *:first-child { + margin-top: 0 !important; } + body > *:last-child { + margin-bottom: 0 !important; } + + a { + color: #4183C4; } + a.absent { + color: #cc0000; } + a.anchor { + display: block; + padding-left: 30px; + margin-left: -30px; + cursor: pointer; + position: absolute; + top: 0; + left: 0; + bottom: 0; } + + h1, h2, h3, h4, h5, h6 { + margin: 20px 0 10px; + padding: 0; + font-weight: bold; + -webkit-font-smoothing: antialiased; + cursor: text; + position: relative; } + + h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor { + background: url("../../images/modules/styleguide/para.png") no-repeat 10px center; + text-decoration: none; } + + h1 tt, h1 code { + font-size: inherit; } + + h2 tt, h2 code { + font-size: inherit; } + + h3 tt, h3 code { + font-size: inherit; } + + h4 tt, h4 code { + font-size: inherit; } + + h5 tt, h5 code { + font-size: inherit; } + + h6 tt, h6 code { + font-size: inherit; } + + h1 { + font-size: 28px; + color: black; } + + h2 { + font-size: 24px; + border-bottom: 1px solid #cccccc; + color: black; } + + h3 { + font-size: 18px; } + + h4 { + font-size: 16px; } + + h5 { + font-size: 14px; } + + h6 { + color: #777777; + font-size: 14px; } + + p, blockquote, ul, ol, dl, li, table, pre { + margin: 15px 0; } + + hr { + background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0; + border: 0 none; + color: #cccccc; + height: 4px; + padding: 0; } + + body > h2:first-child { + margin-top: 0; + padding-top: 0; } + body > h1:first-child { + margin-top: 0; + padding-top: 0; } + body > h1:first-child + h2 { + margin-top: 0; + padding-top: 0; } + body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child { + margin-top: 0; + padding-top: 0; } + + a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 { + margin-top: 0; + padding-top: 0; } + + h1 p, h2 p, h3 p, h4 p, h5 p, h6 p { + margin-top: 0; } + + li p.first { + display: inline-block; } + + ul, ol { + padding-left: 30px; } + + ul :first-child, ol :first-child { + margin-top: 0; } + + ul :last-child, ol :last-child { + margin-bottom: 0; } + + dl { + padding: 0; } + dl dt { + font-size: 14px; + font-weight: bold; + font-style: italic; + padding: 0; + margin: 15px 0 5px; } + dl dt:first-child { + padding: 0; } + dl dt > :first-child { + margin-top: 0; } + dl dt > :last-child { + margin-bottom: 0; } + dl dd { + margin: 0 0 15px; + padding: 0 15px; } + dl dd > :first-child { + margin-top: 0; } + dl dd > :last-child { + margin-bottom: 0; } + + blockquote { + border-left: 4px solid #dddddd; + padding: 0 15px; + color: #777777; } + blockquote > :first-child { + margin-top: 0; } + blockquote > :last-child { + margin-bottom: 0; } + + table { + padding: 0; } + table tr { + border-top: 1px solid #cccccc; + background-color: white; + margin: 0; + padding: 0; } + table tr:nth-child(2n) { + background-color: #f8f8f8; } + table tr th { + font-weight: bold; + border: 1px solid #cccccc; + text-align: left; + margin: 0; + padding: 6px 13px; } + table tr td { + border: 1px solid #cccccc; + text-align: left; + margin: 0; + padding: 6px 13px; } + table tr th :first-child, table tr td :first-child { + margin-top: 0; } + table tr th :last-child, table tr td :last-child { + margin-bottom: 0; } + + img { + max-width: 100%; } + + span.frame { + display: block; + overflow: hidden; } + span.frame > span { + border: 1px solid #dddddd; + display: block; + float: left; + overflow: hidden; + margin: 13px 0 0; + padding: 7px; + width: auto; } + span.frame span img { + display: block; + float: left; } + span.frame span span { + clear: both; + color: #333333; + display: block; + padding: 5px 0 0; } + span.align-center { + display: block; + overflow: hidden; + clear: both; } + span.align-center > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: center; } + span.align-center span img { + margin: 0 auto; + text-align: center; } + span.align-right { + display: block; + overflow: hidden; + clear: both; } + span.align-right > span { + display: block; + overflow: hidden; + margin: 13px 0 0; + text-align: right; } + span.align-right span img { + margin: 0; + text-align: right; } + span.float-left { + display: block; + margin-right: 13px; + overflow: hidden; + float: left; } + span.float-left span { + margin: 13px 0 0; } + span.float-right { + display: block; + margin-left: 13px; + overflow: hidden; + float: right; } + span.float-right > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: right; } + + code, tt { + margin: 0 2px; + padding: 0 5px; + white-space: nowrap; + border: 1px solid #eaeaea; + background-color: #f8f8f8; + border-radius: 3px; } + + pre code { + margin: 0; + padding: 0; + white-space: pre; + border: none; + background: transparent; } + + .highlight pre { + background-color: #f8f8f8; + border: 1px solid #cccccc; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; } + + pre { + background-color: #f8f8f8; + border: 1px solid #cccccc; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; } + pre code, pre tt { + background-color: transparent; + border: none; } + + </style> +</head> + +<body> + +{{ content }} + +</body> +</html>
\ No newline at end of file diff --git a/index.md b/index.md new file mode 100644 index 0000000000..824fc81fff --- /dev/null +++ b/index.md @@ -0,0 +1,13 @@ +--- +title: Scala Language Reference +layout: default +--- + +<ul> + {% for post in site.pages %} + <li> + <a href="{{ post.url }}">{{ post.title }}</a> + </li> + {% endfor %} +</ul> + |