From 22c77febbc48fdfbe1d22dc11040b09ce6a52259 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Thu, 20 Aug 2015 17:59:25 +0200 Subject: [PATCH 1/3] Spec: fix missing section IDs --- en/modules/declarations.xml | 2 +- en/modules/execution.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/modules/declarations.xml b/en/modules/declarations.xml index 57b226da6..73064b9ce 100644 --- a/en/modules/declarations.xml +++ b/en/modules/declarations.xml @@ -1001,7 +1001,7 @@ TypeConstraints? -
+
Dynamic interfaces A dynamic interface is an interface declared with the diff --git a/en/modules/execution.xml b/en/modules/execution.xml index f8d8dee37..103e171ce 100644 --- a/en/modules/execution.xml +++ b/en/modules/execution.xml @@ -239,7 +239,7 @@ void run() { or when an exception is thrown by an evaluation, assignment, invocation, or instantiation. -
+
Frames When execution of a body begins, a frame is created. @@ -294,7 +294,7 @@ void run() {
-
+
Current instances and current frames A frame may be the current frame for a body. When the @@ -586,7 +586,7 @@ String result = middleObject.string;
-
+
Initialization of late references A reference annotated late may be uninitialized in a From 3cfeb8cf250a1cfc1efb07b5f95488d4e8fa5c48 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Fri, 21 Aug 2015 14:05:46 +0200 Subject: [PATCH 2/3] Add docbook to texinfo support support/docbook-xsl/texinfo/docbook.xsl can be used to transform a limited subset of Docbook into Texinfo. --- support/docbook-xsl/texinfo/block.xsl | 48 +++++ support/docbook-xsl/texinfo/docbook.xsl | 30 ++++ support/docbook-xsl/texinfo/empty.xsl | 11 ++ support/docbook-xsl/texinfo/inline.xsl | 12 ++ support/docbook-xsl/texinfo/param.xsl | 40 +++++ support/docbook-xsl/texinfo/structure.xsl | 203 ++++++++++++++++++++++ support/docbook-xsl/texinfo/text.xsl | 96 ++++++++++ 7 files changed, 440 insertions(+) create mode 100644 support/docbook-xsl/texinfo/block.xsl create mode 100644 support/docbook-xsl/texinfo/docbook.xsl create mode 100644 support/docbook-xsl/texinfo/empty.xsl create mode 100644 support/docbook-xsl/texinfo/inline.xsl create mode 100644 support/docbook-xsl/texinfo/param.xsl create mode 100644 support/docbook-xsl/texinfo/structure.xsl create mode 100644 support/docbook-xsl/texinfo/text.xsl diff --git a/support/docbook-xsl/texinfo/block.xsl b/support/docbook-xsl/texinfo/block.xsl new file mode 100644 index 000000000..56e1af35e --- /dev/null +++ b/support/docbook-xsl/texinfo/block.xsl @@ -0,0 +1,48 @@ + + + + + + + + + + + + @itemize @bullet + + @end itemize + + + + @item + + + +@smallindentedblock + +@end smallindentedblock + + + +@example + +@end example + + + +@quotation + +@end quotation + + + +@verbatim + +@end verbatim + + + diff --git a/support/docbook-xsl/texinfo/docbook.xsl b/support/docbook-xsl/texinfo/docbook.xsl new file mode 100644 index 000000000..cecc46c9e --- /dev/null +++ b/support/docbook-xsl/texinfo/docbook.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/support/docbook-xsl/texinfo/empty.xsl b/support/docbook-xsl/texinfo/empty.xsl new file mode 100644 index 000000000..9eb30088f --- /dev/null +++ b/support/docbook-xsl/texinfo/empty.xsl @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/support/docbook-xsl/texinfo/inline.xsl b/support/docbook-xsl/texinfo/inline.xsl new file mode 100644 index 000000000..b16a4bef0 --- /dev/null +++ b/support/docbook-xsl/texinfo/inline.xsl @@ -0,0 +1,12 @@ + + + +@code{} +@emph{} +@ref{, ,} +@file{} + + diff --git a/support/docbook-xsl/texinfo/param.xsl b/support/docbook-xsl/texinfo/param.xsl new file mode 100644 index 000000000..2bade9037 --- /dev/null +++ b/support/docbook-xsl/texinfo/param.xsl @@ -0,0 +1,40 @@ + + + + + +0 +0 + + + + + + + + + + + + + + + + + + +number + + + + + + + + + +: + + +no + diff --git a/support/docbook-xsl/texinfo/structure.xsl b/support/docbook-xsl/texinfo/structure.xsl new file mode 100644 index 000000000..a804614e3 --- /dev/null +++ b/support/docbook-xsl/texinfo/structure.xsl @@ -0,0 +1,203 @@ + + + + + + + + + +\input texinfo +@setfilename ceylon-spec.info +@settitle +@dircategory Software development +@direntry +* Ceylon: (ceylon-spec). The Ceylon Language Specification. +@end direntry +@codequotebacktick on + +@copying +This is the Ceylon Language Specification, version . + +Copyright @copyright{} 2008--2015 and contributors + +@quotation +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +@end quotation +@end copying + +@titlepage +@title +@subtitle + +@page +@vskip 0pt plus 1filll +@insertcopying +@end titlepage + +@contents + +@ifnottex +@node Top +@top + +This is the Ceylon Language Specification, version . +@end ifnottex + +@menu +* preface:: Welcome to Ceylon. + + +* :: + +* index:: Complete index. +@end menu + + + +@node index +@unnumbered Index + +@printindex cp + +@bye + + + + + +@node +@chapter +@cindex + +@menu + + + +* :: + +@end menu + + + + + + + + +@node + + +@section + + +@subsection + + +@subsubsection + + +@cindex + + + + + + + +@menu + + + +* :: + +@end menu + + + + + + + + + + + + + + + +@node preface +@unnumbered Preface +@cindex Preface + + + + + + + + + + + + + + +@multitable {Comparison, containment, assignability, inheritance:} {@code{=}, @code{+=}, @code{-=}, @code{*=}, @code{/=}, @code{%=}, @code{&=}, @code{|=}, @code{~=}, @code{&&=}, @code{||=}} {Binary (and ternary)} {Associativity} + + +@multitable {@code{lhs[from:length]}} {lower spanned subrange} {@code{compose((Iterable<T,N> ts)=>[*ts], lhs.spread(X.method))}} {any subtype of @code{Anything[]?} whose intersections with @code{[]} and @code{[Nothing+]} are not @code{Nothing}} {@code{Y given Y satisfies Identifiable} where @code{X&Y} is not @code{Nothing}} {@code{[T*](*P)} or @code{[T+](*P)}} + + +@multitable @columnfractions + + + +@headitem + + +@tab + + + +@item + + +@tab + + +@end multitable + + + + + + diff --git a/support/docbook-xsl/texinfo/text.xsl b/support/docbook-xsl/texinfo/text.xsl new file mode 100644 index 000000000..a734ec403 --- /dev/null +++ b/support/docbook-xsl/texinfo/text.xsl @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From cb6f9bb44b272bccbdf92d7d96e090f15ca4a8e4 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Fri, 21 Aug 2015 14:08:04 +0200 Subject: [PATCH 3/3] Add Ant targets for texinfo documentation By default, we now build the specification in texinfo format in addition to PDF, HTML, and single HTML. In addition to that, the lang.docinfo.install target can be used to install the specification into the system's info directory. --- build.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/build.xml b/build.xml index 71f7444c5..624aa5d23 100644 --- a/build.xml +++ b/build.xml @@ -36,6 +36,7 @@ + @@ -57,6 +58,11 @@ + + + + + @@ -104,6 +110,17 @@ + + + + + + + + + @@ -135,6 +152,7 @@ + @@ -295,6 +313,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +