Merge pull request #10247 from johnwhitington/refman-examples

Add initial tranche of examples to reference manual

Changes

@@ -129,6 +129,12 @@ Working version
 
 ### Manual and documentation:
 
+- #10247: Add initial tranche of examples to reference manual.
+  Adds some eighty examples to the reference manual, principally to the
+  expressions and patterns sections.
+  (John Whitington, review by Xavier Leroy, Gabriel Scherer, @Fourchaux, and
+  Florian Angeletti)
+
 - #9786, #10181: improved documentation of Unix.{in,out}_channel_of_descr
   with respect to closing.
   (Xavier Leroy, report by Jacques-Henri Jourdan, review by Guillaume

manual/src/manual.tex

@@ -1,8 +1,13 @@
 \documentclass[11pt]{book}
 \usepackage{ae}
+
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 % HEVEA\@def@charset{UTF-8}%
+% Unicode character declarations
+\DeclareUnicodeCharacter{207A}{{}^{+}}
+\DeclareUnicodeCharacter{2014}{---}
+
 \usepackage{fullpage}
 \usepackage{syntaxdef}
 \usepackage{multind}
@@ -19,8 +24,11 @@
 \usepackage[normalem]{ulem}% for underlining errors in code examples
 
 \input{macros.tex}
+% Listing environments
 \lstnewenvironment{camloutput}{
   \lstset{
+    inputencoding=utf8,
+    extendedchars=true,
     basicstyle=\small\ttfamily\slshape,
     showstringspaces=false,
     language=caml,
@@ -38,14 +46,19 @@
 \else
   \lstset{
     upquote=true,
-    literate={'"'}{\textquotesingle "\textquotesingle}3
+    literate=%
+    {⁺}{{${}^{+}$}}1%
+    {—}{{---}}1%
+    {'"'}{\textquotesingle "\textquotesingle}3%
     {'\\"'}{\textquotesingle \textbackslash"\textquotesingle}4,
 }
 \fi
 }{}
 
 \lstnewenvironment{camlinput}{
   \lstset{
+    inputencoding=utf8,
+    extendedchars=true,
     basicstyle=\ttfamily,
     showstringspaces=false,
     language=caml,
@@ -67,7 +80,10 @@
 %not implemented in hevea: upquote and literate
   \lstset{
     upquote=true,
-    literate={'"'}{\textquotesingle "\textquotesingle}3
+    literate=%
+    {⁺}{{${}^{+}$}}1%
+    {—}{{---}}1%
+    {'"'}{\textquotesingle "\textquotesingle}3%
     {'\\"'}{\textquotesingle \textbackslash"\textquotesingle}4,
 }
 \fi