Feature/reformat part2 (#91)

* begin reformatting part 2

* wip

* wip subtyping explanation

* wip

* wip

* wip

* final corrections in chapter 1

* clarify chapter 5

* wip

* final corrections

sofp-src/check-punctuation-before-code-blocks.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+for a in sofp*tex; do 
+  b=linenumbers-p-$a
+  LC_ALL=C egrep -n  -B1 '^(\\begin{lstlisting}|\\\[$)' "$a" \
+   | LC_ALL=C egrep -v '^[0-9]+-.*[]?$):%},.~] *$' \
+   | LC_ALL=C egrep '^[0-9]+-[^ ]' \
+   | LC_ALL=C sed -e 's/^x\([0-9][0-9]*\)-.*$/\1/' \
+   | LC_ALL=C sed -e 's/^\(.*\)$/"\1"/' > $b
+  test -s $b && {
+    echo "Warning: file $a has no punctuation before code blocks or display math at lines:"
+    cat $b
+ }
+ rm -f $b
+# Output may contain several line numbers.
+done

sofp-src/make_sofp_pdf.sh

@@ -208,6 +208,7 @@ bash spelling_check.sh &
 #draft_pages=`pdfPages "$draft".pdf`
 bash check-consistent-labels.sh
 bash check-lines_with_displaymath_in_new_paragraph.sh
+bash check-punctuation-before-code-blocks.sh
 
 if [ x"$1" == x-nolulu ]; then
 	# Create a pdf file without references to lulu.com and without lulu.com's ISBN.

sofp-src/prepare_volume.sh

@@ -107,8 +107,12 @@ esac
   echo "Detected previous chapter $firstchapter, first page $firstpage, previous part number $firstpart"
 
   sed -i.bak -e 's|\(of Functional Programming\)|\1, '"$title1"'|; s|\(\\part{.*}\)|\\setcounter{page}{'$firstpage'}\\setcounter{part}{'$firstpart'}\\setcounter{chapter}{'$firstchapter'}\1|;' $name.tex
+
+  # Subtitle on cover page.
   sed -i.bak -e 's|% End of title.|\\vspace{0.2in}\\centerline{\\fontsize{20pt}{20pt}\\selectfont{'"$title2"'}}|' book_cover/sofp-cover-page-no-bg.tex
-  sed -i.bak -e 's|\(of Functional Programming\)|\1 - '"$title1"'|;' book_cover/sofp-spine.tex
+
+  # Title on spine.
+  sed -i.bak -e 's|\(of Functional Programming\)|\1, '"$title1"'|;' book_cover/sofp-spine.tex
 
   # Replace lulu.com hyperlink.
   sed -i.bak -e 's|{https://www.lulu.com/[^}]*}{\(Print on demand[^}]*\)}|{'"$url"'}{\1}|;' $name.tex

sofp-src/sofp-appendices.lyx

@@ -45,7 +45,7 @@
 %\titlespacing{\subparagraph}{\parindent}{\parskip}{3\wordsep}
 %\titlespacing{\paragraph}{0pt}{3pt}{2\wordsep}
 
-\renewcommand*{\subsubsectionformat}{}
+\renewcommand*{\subsubsectionformat}{} % This does not work if cleardoubleempty is given as a class option!
 \RedeclareSectionCommand[ % Statement 1.2.3.4
   runin=true,
   afterskip=2ex,
@@ -191,7 +191,7 @@
 \renewcommand{\ogreaterthan}{\boxrightarrow}
 \renewcommand{\varogreaterthan}{\boxrightarrow}
 \end_preamble
-\options numbers=noenddot,index=totoc,bibliography=totoc,listof=totoc,fontsize=12pt
+\options openright,numbers=noenddot,index=totoc,bibliography=totoc,listof=totoc,fontsize=12pt
 \use_default_options true
 \master sofp.lyx
 \maintain_unincluded_children false
@@ -216,7 +216,7 @@
 \output_sync 0
 \bibtex_command default
 \index_command makeindex
-\paperfontsize 10
+\paperfontsize 12
 \spacing single
 \use_hyperref true
 \pdf_title "The Science of Functional Programming: A Tutorial, with Examples in Scala"
@@ -40152,7 +40152,7 @@ def payments[Person, Amount](data: Seq[Map[Person, Amount]]): Map[Person,
 
 \begin_layout Plain Layout
 
-  data.flatMap(_.toSeq).groupBy(_._1).mapValues(_.map(_._2))
+  data.flatMap(_.toSeq).groupBy(_._1).map { case (k, v) => (k, v.map(_._2)) }
 \end_layout
 
 \end_inset

sofp-src/sofp-appendices.tex

@@ -4781,7 +4781,7 @@ \subsubsection*{Exercise \ref{tuples-Exercise-12}}
 ~
 \begin{lstlisting}
 def payments[Person, Amount](data: Seq[Map[Person, Amount]]): Map[Person, Seq[Amount]] =
-  data.flatMap(_.toSeq).groupBy(_._1).mapValues(_.map(_._2))
+  data.flatMap(_.toSeq).groupBy(_._1).map { case (k, v) => (k, v.map(_._2)) }
 \end{lstlisting}
 
 

sofp-src/sofp-applicative.lyx

@@ -45,7 +45,7 @@
 %\titlespacing{\subparagraph}{\parindent}{\parskip}{3\wordsep}
 %\titlespacing{\paragraph}{0pt}{3pt}{2\wordsep}
 
-\renewcommand*{\subsubsectionformat}{}
+\renewcommand*{\subsubsectionformat}{} % This does not work if cleardoubleempty is given as a class option!
 \RedeclareSectionCommand[ % Statement 1.2.3.4
   runin=true,
   afterskip=2ex,
@@ -191,7 +191,7 @@
 \renewcommand{\ogreaterthan}{\boxrightarrow}
 \renewcommand{\varogreaterthan}{\boxrightarrow}
 \end_preamble
-\options numbers=noenddot,index=totoc,bibliography=totoc,listof=totoc,fontsize=12pt
+\options openright,numbers=noenddot,index=totoc,bibliography=totoc,listof=totoc,fontsize=12pt
 \use_default_options true
 \master sofp.lyx
 \maintain_unincluded_children false
@@ -216,7 +216,7 @@
 \output_sync 0
 \bibtex_command default
 \index_command makeindex
-\paperfontsize 10
+\paperfontsize 12
 \spacing single
 \use_hyperref true
 \pdf_title "The Science of Functional Programming: A Tutorial, with Examples in Scala"