[PATCH 0/5] Promote target 'mss' to default

[PATCH 0/5] Promote target 'mss' to default

[Akira Yokosawa]

Hi, Paul

As I mentioned, I'm submitting a patch set to switch default
monospace font to "couriers" (courier scaled).

Patch 1 does the switch.
Patch 2 adds a new target "help" that explains various targets.
Patches 3 and 4 revert manual fontsize tweaks.
Patch 5 encloses a short verbatim definition in a minipage, It was
a bit too wide with non-scaled courier, but now it is safe to
be indented as a paragraph.

                                        Thanks, Akira
--
Akira Yokosawa (5):
  Promote target 'mss' to default
  Makefile: Add target 'help'
  Revert "after: Tweak font size of Figure A.2"
  Revert "formal/dyntickrcu: Adjust font size of sample code"
  toolsoftrade: Enclose short verbatim in minipage

 Makefile                      | 45 ++++++++++++++++++++++++++++++++++---------
 appendix/questions/after.tex  |  2 +-
 formal/dyntickrcu.tex         |  2 +-
 perfbook.tex                  |  2 +-
 toolsoftrade/toolsoftrade.tex |  4 ++--
 5 files changed, 41 insertions(+), 14 deletions(-)

-- 
2.7.4

[PATCH 1/5] Promote target 'mss' to default

[Akira Yokosawa]

From cfe4542cfa118e68d309f81e40ce23adad88edc3 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 24 Dec 2016 00:27:22 +0900
Subject: [PATCH 1/5] Promote target 'mss' to default

This commit switches the default monospace font to "couriers" with
the option "[scaled=.94]", which has been used for target "mss"
for a while.

After this commit, perfbook.pdf, perfbook-1c.pdf, and perfbook-hb.pdf
use the scaled courier font as monospace font.

The target "mss" now builds perfbook.pdf.

A new target "msns" ([m]ono[s]pace [n]on-[s]caled) is added to
preserve the previous default font choice for comparison.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
 Makefile     | 26 +++++++++++++++++---------
 perfbook.tex |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 151fba7..997a4cf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ LATEXSOURCES = \

 LATEXGENERATED = autodate.tex qqz.tex contrib.tex origpub.tex

-ABBREVTARGETS := 1c hb mss mstx msr msn msnt 1csf
+ABBREVTARGETS := 1c hb msns mstx msr msn msnt 1csf

 PDFTARGETS := perfbook.pdf $(foreach v,$(ABBREVTARGETS),perfbook-$(v).pdf)

@@ -60,11 +60,19 @@ else
 	targ = $(default)
 endif

-.PHONY: all touchsvg clean distclean neatfreak 2c ls-unused $(ABBREVTARGETS)
+.PHONY: all touchsvg clean distclean neatfreak 2c ls-unused $(ABBREVTARGETS) mss perfbook-mss.pdf mssmsg
 all: $(targ)

 2c: perfbook.pdf

+mss: perfbook-mss.pdf
+
+perfbook-mss.pdf: perfbook.pdf mssmsg
+
+mssmsg:
+	@echo "perfbook-mss.pdf is promoted to default target,"
+	@echo "built as perfbook.pdf."
+
 $(PDFTARGETS): %.pdf: %.tex %.bbl
 	sh utilities/runlatex.sh $(basename $@)

@@ -98,27 +106,27 @@ perfbook-1c.tex: perfbook.tex
 perfbook-hb.tex: perfbook.tex
 	sed -e 's/,twocolumn/&,letterpaperhb/' -e 's/setboolean{hardcover}{false}/setboolean{hardcover}{true}/' < $< > $@

-perfbook-mss.tex: perfbook.tex
-	sed -e 's/usepackage{courier}/usepackage[scaled=0.94]{couriers}/' < $< > $@
+perfbook-msns.tex: perfbook.tex
+	sed -e 's/\[scaled=\.94\]{couriers}/{courier}/' < $< > $@

 perfbook-mstx.tex: perfbook.tex
-	sed -e 's/usepackage{courier}/renewcommand*\\ttdefault{txtt}/' < $< > $@
+	sed -e 's/usepackage\[scaled=\.94\]{couriers}/renewcommand*\\ttdefault{txtt}/' < $< > $@

 perfbook-msr.tex: perfbook.tex
-	sed -e 's/usepackage{courier}/usepackage[scaled=0.94]{nimbusmono}/' < $< > $@
+	sed -e 's/\[scaled=\.94\]{couriers}/[scaled=.94]{nimbusmono}/' < $< > $@
 	@echo "## This target requires font package nimbus15. ##"

 perfbook-msn.tex: perfbook.tex
-	sed -e 's/usepackage{courier}/usepackage{nimbusmononarrow}/' < $< > $@
+	sed -e 's/\[scaled=\.94\]{couriers}/{nimbusmononarrow}/' < $< > $@
 	@echo "## This target requires font package nimbus15. ##"

 perfbook-msnt.tex: perfbook.tex
-	sed -e 's/usepackage{courier}/usepackage[zerostyle=a]{newtxtt}/' < $< > $@
+	sed -e 's/\[scaled=\.94\]{couriers}/[zerostyle=a]{newtxtt}/' < $< > $@
 	@echo "## This target requires font package newtxtt. ##"

 perfbook-1csf.tex: perfbook-1c.tex
 	sed -e 's/setboolean{sansserif}{false}/setboolean{sansserif}{true}/' \
-	    -e 's/usepackage{courier}/usepackage[var0]{inconsolata}/' < $< > $@
+	    -e 's/\[scaled=\.94\]{couriers}/[var0]{inconsolata}/' < $< > $@
 	@echo "## This target requires recent version (>= 1.3i) of mathastext. ##"

 # Rules related to perfbook_html are removed as of May, 2016
diff --git a/perfbook.tex b/perfbook.tex
index bb1e47e..f90ba18 100644
--- a/perfbook.tex
+++ b/perfbook.tex
@@ -9,7 +9,7 @@
 \usepackage{textcomp} % use symbols in TS1 encoding
 \usepackage{mathptmx} % use nice, standard fonts for roman,
 \usepackage[scaled=.92]{helvet}   % sans serif,
-\usepackage{courier}  % and monospace respectively
+\usepackage[scaled=.94]{couriers}  % and monospace respectively

 % Improves the text layout
 \usepackage{microtype}
-- 
2.7.4

[PATCH 2/5] Makefile: Add target 'help'

[Akira Yokosawa]

From d159316cc7c866dff5e014b6a466846809884788 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Thu, 5 Jan 2017 08:50:00 +0900
Subject: [PATCH 2/5] Makefile: Add target 'help'

Add a target for explanation of targets with various layout and font options.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
 Makefile | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 997a4cf..a7b10cf 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ else
 	targ = $(default)
 endif

-.PHONY: all touchsvg clean distclean neatfreak 2c ls-unused $(ABBREVTARGETS) mss perfbook-mss.pdf mssmsg
+.PHONY: all touchsvg clean distclean neatfreak 2c ls-unused $(ABBREVTARGETS) mss perfbook-mss.pdf mssmsg help
 all: $(targ)

 2c: perfbook.pdf
@@ -168,6 +168,25 @@ ifndef INKSCAPE
 endif
 	@inkscape --export-pdf=$@ $<

+help:
+	@echo "Official targets:"
+	@echo "  Full,              Abbr."
+	@echo "  perfbook.pdf,      2c:   (defalut) 2-column layout"
+	@echo "  perfbook-1c.pdf,   1c:   1-column layout"
+	@echo "  perfbook-hb.pdf,   hb:   For hardcover books (2-column)"
+	@echo
+	@echo "Experimental targets:"
+	@echo "  Full,              Abbr."
+	@echo "  perfbook-msr.pdf,  msr:  2c with regular thickness courier clone"
+	@echo "  perfbook-msn.pdf,  msn:  2c with narrow courier clone"
+	@echo "  perfbook-mstx.pdf, mstx: 2c with txtt as monospace"
+	@echo "  perfbook-msnt.pdf, msnt: 2c with newtxtt as monospace (non-slashed 0)"
+	@echo "  perfbook-1csf.pdf, 1csf: 1c with sans serif font"
+	@echo "  perfbook-msns.pdf, msns: 2c with non-scaled courier"
+	@echo "  \"msr\" and \"msn\" require \"numbus15\"."
+	@echo "  \"msnt\" requires \"newtxtt\"."
+	@echo "  \"1csf\" requires recent version (>=1.3i) of \"mathastext\"."
+
 clean:
 	find . -name '*.aux' -o -name '*.blg' \
 		-o -name '*.dvi' -o -name '*.log' \
-- 
2.7.4

[PATCH 3/5] Revert "after: Tweak font size of Figure A.2"

[Akira Yokosawa]

From 8b8635c3158f941fd5ff2d0c3b561c2df52cbc99 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Wed, 28 Dec 2016 20:30:02 +0900
Subject: [PATCH 3/5] Revert "after: Tweak font size of Figure A.2"

This reverts commit bc0fd9d40035c09b22d138cf68c2233fde8ce2b8.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
 appendix/questions/after.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appendix/questions/after.tex b/appendix/questions/after.tex
index e1802ba..cbba768 100644
--- a/appendix/questions/after.tex
+++ b/appendix/questions/after.tex
@@ -51,7 +51,7 @@ e.g., where time has appeared to go backwards.
 \end{figure}

 \begin{figure}[htbp]
-{ \fontsize{6.5pt}{7.5pt}\selectfont
+{ \scriptsize
 \begin{verbbox}
   1 /* WARNING: BUGGY CODE. */
   2 void *consumer(void *ignored)
-- 
2.7.4

[PATCH 4/5] Revert "formal/dyntickrcu: Adjust font size of sample code"

[Akira Yokosawa]

From 36e5015882b9e157e6aa8d66c589398dbca02d86 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Wed, 28 Dec 2016 20:30:25 +0900
Subject: [PATCH 4/5] Revert "formal/dyntickrcu: Adjust font size of sample code"

This reverts commit c7c5e8a1829e60349cc4eace0479e7ac37ec859d.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
 formal/dyntickrcu.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formal/dyntickrcu.tex b/formal/dyntickrcu.tex
index 75eb93f..50e87d8 100644
--- a/formal/dyntickrcu.tex
+++ b/formal/dyntickrcu.tex
@@ -1252,7 +1252,7 @@ and finally lines~32-43 model \co{rcu_irq_exit()}.

 The \co{grace_period()} process then becomes as follows:

-{ \fontsize{6.7pt}{8pt}\selectfont
+{ \scriptsize
 \begin{verbatim}
   1 proctype grace_period()
   2 {
-- 
2.7.4

[PATCH 5/5] toolsoftrade: Enclose short verbatim in minipage

[Akira Yokosawa]

From a1d64d31f52b7b2f96fb6e15ef30dde7f8d521bf Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sun, 1 Jan 2017 00:59:39 +0900
Subject: [PATCH 5/5] toolsoftrade: Enclose short verbatim in minipage

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
 toolsoftrade/toolsoftrade.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolsoftrade/toolsoftrade.tex b/toolsoftrade/toolsoftrade.tex
index bc51437..0d1bf8c 100644
--- a/toolsoftrade/toolsoftrade.tex
+++ b/toolsoftrade/toolsoftrade.tex
@@ -1252,7 +1252,7 @@ These last two primitives are not provided directly by gcc,
 but may be implemented straightforwardly as follows:

 \vspace{5pt}
-{
+\begin{minipage}[t]{\columnwidth}
 \scriptsize
 \begin{verbatim}
 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
@@ -1260,7 +1260,7 @@ but may be implemented straightforwardly as follows:
 #define WRITE_ONCE(x, val) ({ ACCESS_ONCE(x) = (val); })
 #define barrier() __asm__ __volatile__("": : :"memory")
 \end{verbatim}
-}
+\end{minipage}
 \vspace{5pt}

 \QuickQuiz{}
-- 
2.7.4

Re: [PATCH 0/5] Promote target 'mss' to default

[Paul E. McKenney]

On Thu, Jan 05, 2017 at 09:27:57AM +0900, Akira Yokosawa wrote:
> Hi, Paul
> 
> As I mentioned, I'm submitting a patch set to switch default
> monospace font to "couriers" (courier scaled).
> 
> Patch 1 does the switch.
> Patch 2 adds a new target "help" that explains various targets.
> Patches 3 and 4 revert manual fontsize tweaks.
> Patch 5 encloses a short verbatim definition in a minipage, It was
> a bit too wide with non-scaled courier, but now it is safe to
> be indented as a paragraph.

Thank you, queued and pushed.  I added a fixup patch for what looked
to me to be typos in the Makefile help text (which is a very nice
addition, by the way!).  Please let me know if my fixes need fixing.

						Thanx, Paul

>                                         Thanks, Akira
> --
> Akira Yokosawa (5):
>   Promote target 'mss' to default
>   Makefile: Add target 'help'
>   Revert "after: Tweak font size of Figure A.2"
>   Revert "formal/dyntickrcu: Adjust font size of sample code"
>   toolsoftrade: Enclose short verbatim in minipage
> 
>  Makefile                      | 45 ++++++++++++++++++++++++++++++++++---------
>  appendix/questions/after.tex  |  2 +-
>  formal/dyntickrcu.tex         |  2 +-
>  perfbook.tex                  |  2 +-
>  toolsoftrade/toolsoftrade.tex |  4 ++--
>  5 files changed, 41 insertions(+), 14 deletions(-)
> 
> -- 
> 2.7.4
> 

Re: [PATCH 0/5] Promote target 'mss' to default

[Akira Yokosawa]

On 2017/01/04 21:18:35 -0800, Paul E. McKenney wrote:
> On Thu, Jan 05, 2017 at 09:27:57AM +0900, Akira Yokosawa wrote:
>> Hi, Paul
>>
>> As I mentioned, I'm submitting a patch set to switch default
>> monospace font to "couriers" (courier scaled).
>>
>> Patch 1 does the switch.
>> Patch 2 adds a new target "help" that explains various targets.
>> Patches 3 and 4 revert manual fontsize tweaks.
>> Patch 5 encloses a short verbatim definition in a minipage, It was
>> a bit too wide with non-scaled courier, but now it is safe to
>> be indented as a paragraph.
> 
> Thank you, queued and pushed.  I added a fixup patch for what looked
> to me to be typos in the Makefile help text (which is a very nice
> addition, by the way!).  Please let me know if my fixes need fixing.

Thanks for the fixes!
                                 Akira

> 
> 						Thanx, Paul
> 
>>                                         Thanks, Akira
>> --
>> Akira Yokosawa (5):
>>   Promote target 'mss' to default
>>   Makefile: Add target 'help'
>>   Revert "after: Tweak font size of Figure A.2"
>>   Revert "formal/dyntickrcu: Adjust font size of sample code"
>>   toolsoftrade: Enclose short verbatim in minipage
>>
>>  Makefile                      | 45 ++++++++++++++++++++++++++++++++++---------
>>  appendix/questions/after.tex  |  2 +-
>>  formal/dyntickrcu.tex         |  2 +-
>>  perfbook.tex                  |  2 +-
>>  toolsoftrade/toolsoftrade.tex |  4 ++--
>>  5 files changed, 41 insertions(+), 14 deletions(-)
>>
>> -- 
>> 2.7.4
>>
> 
>