Large batch of DS Workbook fixes (#2404)

for issue #2395

lessons/Core/computing-needs-all-voices/langs/en-us/index.adoc

@@ -70,7 +70,7 @@ Students watch a 5-minute video, hearing from programmers about how they got the
 
 === Launch
 
-@ifnotslide{
+@teacher{
 Explain to students that they are going to watch a short clip and then share what they noticed and wondered. They may either record their thoughts as they watch, or do so for a few minutes after the film is over.
 }
 
@@ -158,14 +158,14 @@ Decide which of you will go first and raise your hand when you're ready.
 @strategy{Pedagogy Note: Windows and Mirrors!}{
 
 
-@link{https://nationalseedproject.org/Key-SEED-Texts/curriculum-as-window-and-mirror, Curriculum as Window and Mirror} was first published by Emily Style, founding co-director of @link{https://nationalseedproject.org/, the National SEED Project (Seeking Educational Equity and Diversity)} in 1988 and remains a key piece that informs the work of SEED leaders to create reflective and inclusive classrooms and communities. This lesson only begins to tap into the power of the practice.
+@link{https://nationalseedproject.org/Key-SEED-Texts/curriculum-as-window-and-mirror, Curriculum as Window and Mirror} was first published by Emily Style, founding co-director of @link{https://nationalseedproject.org/, the National SEED Project} in 1988. This lesson only begins to tap into the power of the practice.
 }
 
-== Advantages of Diverse Teams in Tech
+== Where would you look for the ketchup?
 
 === Overview
 
-Students will complete a 30-second survey about how ketchup is used in their home, read a short article about diversity in tech, that uses ketchup placement in the kitchen as a metaphor for describing the advantages of diversity on a team when it comes to problem solving, reflect on the article, and then Notice and Wonder about the results of the class' ketchup survey.
+Students will complete a 30-second survey about how ketchup is used in their home, read a short article that uses ketchup placement in the kitchen as a metaphor for describing the advantages of diversity on a team when it comes to problem solving, reflect on the article, and then Notice and Wonder about the results of the class' ketchup survey.
 
 === Launch
 @teacher{
@@ -179,26 +179,14 @@ Complete this two-minute @online-exercise{https://docs.google.com/forms/d/16tCvW
 === Investigate
 
 @lesson-instruction{
-- Read @printable-exercise{ketchup-problem.pdf, LA Times Perspective: A solution to tech’s lingering diversity problem? Try thinking about ketchup}.
-- After you've read the brief article, complete @printable-exercise{advantages-of-diverse-teams.adoc}.
+- Read @handout{ketchup-problem.pdf, LA Times Perspective: A solution to tech’s lingering diversity problem? Try thinking about ketchup}.
+- After you've read the brief article, complete @printable-exercise{reflection-ketchup.adoc}.
 }
 
-=== Synthesize
-
-@ifnotslide{
-Facilitate a conversation with your students about the article. _You may or may not choose to use the questions they just answered as your framing._
-}
+@teacher{Facilitate a conversation with your students about their reflections on the article. Then display the results of the google form (as pie charts) and facilitate a discussion. What do students Notice? What do they Wonder?}
 
-- The author argues that tech companies with diverse teams have an advantage. Why?
-- What suggestions did the article offer for tech companies looking to diversify their teams?
-- What is one thing of interest to you in the author’s bio?
-- Think of a time when you had an idea that felt out of the box. Did you share your idea? Why or why not?
-
-@slidebreak
+=== Synthesize
 
-- Can you think of a time when someone else had a strategy or idea that you would never have thought of, but was interesting to you and/or pushed your thinking to a new level?
-- Based on your experience of exceptions to mainstream assumptions, propose another pair of questions that could be used in place of "Where do you keep your ketchup?" and "What would you reach for instead?".
+- Had you ever considered that different people keep their ketchup in different places in the fridge?
+- Did considering differences in people's kitchens make you have any other thoughts you'd like to share?
 
-@teacher{
-Display the results of the google form (as pie charts) and facilitate a discussion. What do students Notice? What do they Wonder?
-}

lessons/Core/computing-needs-all-voices/langs/en-us/pages/advantages-of-diverse-teams.adoc → lessons/Core/computing-needs-all-voices/langs/en-us/pages/reflection-ketchup.adoc

@@ -1,64 +1,65 @@
-= Reflection: Problem Solving Advantages of Diverse Teams
+= Reflection: Try Thinking About Ketchup
 ++++
 <style>
 body:not(.LessonPlan, .narrativepage) p { line-height: 1; }
 </style>
 ++++
 
 [.linkInstructions]
-This reflection is designed to follow reading @printable-exercise{ketchup-problem.pdf, LA Times Perspective: A solution to tech’s lingering diversity problem? Try thinking about ketchup}
+This reflection is designed to follow reading @handout{ketchup-problem.pdf, LA Times Perspective: A solution to tech’s lingering diversity problem? Try thinking about ketchup}
 
-@n The author argues that tech companies with diverse teams have an advantage. Why?
+@n Think of a time when someone else had a strategy or idea that you would never have thought of, but was interesting to you and/or pushed your thinking to a new level.
 
-@fitb{}{@ifsoln{Possible responses:}}
+@fitb{}{}
 
-@fitb{}{@ifsoln{Recruiting people from underrpresented backgrounds can lift a company above the competition!}}
+@fitb{}{}
 
-@fitb{}{@ifsoln{Different perspectives can result in fresh ideas.}}
+@fitb{}{}
 
 @fitb{}{}
 
 @vspace{1ex}
 
-@n What suggestions did the article offer for tech companies looking to diversify their teams?
+@n Think of a time when you had an idea that felt "out of the box".  Did you share your idea? Why or why not?
 
-@fitb{}{@ifsoln{Possible responses:}}
+@fitb{}{}
 
-@fitb{}{@ifsoln{Job listings can be more inviting to women by avoiding words like "hacker" and "rockstar".}}
+@fitb{}{}
 
-@fitb{}{@ifsoln{Tech company employees can learn about perspectives different from their own and practice listening.}}
+@fitb{}{}
 
 @fitb{}{}
 
 @vspace{1ex}
 
-@n What is one thing of interest to you in the author's bio?
 
-@fitb{}{@ifsoln{Possible response: Dexter Thomas is is interested in East Asian studies.}}
+@n The author argues that tech companies with diverse teams have an advantage. Why?
 
-@fitb{}{}
+@fitb{}{@ifsoln{Possible responses:}}
 
-@fitb{}{}
+@fitb{}{@ifsoln{Recruiting people from underrepresented backgrounds can lift a company above the competition!}}
+
+@fitb{}{@ifsoln{Different perspectives can result in fresh ideas.}}
 
 @fitb{}{}
 
 @vspace{1ex}
 
-@n Think of a time when you had an idea that felt "out of the box".  Did you share your idea? Why or why not?
+@n What suggestions did the article offer for tech companies looking to diversify their teams?
 
-@fitb{}{}
+@fitb{}{@ifsoln{Possible responses:}}
 
-@fitb{}{}
+@fitb{}{@ifsoln{Job listings can be more inviting to women by avoiding words like "hacker" and "rockstar".}}
 
-@fitb{}{}
+@fitb{}{@ifsoln{Tech company employees can learn about perspectives different from their own and practice listening.}}
 
 @fitb{}{}
 
 @vspace{1ex}
 
-@n Can you think of a time when someone else had a strategy or idea that you would never have thought of, but was interesting to you and/or pushed your thinking to a new level?
+@n What is one thing of interest to you in the author's bio?
 
-@fitb{}{}
+@fitb{}{@ifsoln{Possible response: Dexter Thomas is is interested in East Asian studies.}}
 
 @fitb{}{}
 
@@ -68,6 +69,7 @@ This reflection is designed to follow reading @printable-exercise{ketchup-proble
 
 @vspace{1ex}
 
+
 @n Based on your experience of exceptions to mainstream assumptions, propose another pair of questions that could be used in place of "Where do you keep your ketchup?" and "What would you reach for instead?"
 
 @fitb{}{}

lessons/Core/computing-needs-all-voices/langs/en-us/pages/windows-mirrors.adoc

@@ -6,7 +6,7 @@
 </style>
 ++++
 
-@n Think about the images and stories you've just encountered. Identify something(s) that served as a mirror for you, connecting you with your own identity and experience of the world. Write about who or what you connected with and why.
+@n Think about the stories you've just encountered. Identify something(s) from the film and/or posters that served as a mirror for you, connecting you with your own identity and experience of the world. Write about who or what you connected with and why.
 
 @fitb{}{}
 
@@ -16,15 +16,16 @@
 
 @fitb{}{}
 
-@fitb{}{@ifsoln{"There are scientists who are queer and not just white. It made me realize that anyone can be a computer coding scientist or just a scientist."}}
-
 @fitb{}{@ifsoln{"She loved math and science, which I do, too! She inspired me to let me be who I am."}}
 
+@fitb{}{@ifsoln{"I connect with Luis von Ahn because he’s from Guatemala... He also liked to learn new languages and made that cool app Duolingo."}}
+
 @fitb{}{@ifsoln{"I connected with her because she found socializing difficult. I have autism and some people are mean to me because of it."}}
 
+@fitb{}{@ifsoln{"There are scientists who are queer and not just white. It made me realize that anyone can be a computer coding scientist or just a scientist."}}
+
 @fitb{}{@ifsoln{"We girls need to see other Black people doing things..."}}
 
-@fitb{}{@ifsoln{"I connect with Luis von Ahn because he’s from Guatemala... He also liked to learn new languages and made that cool app Duolingo."}}
 
 @fitb{}{@ifsoln{"They gave me inspiration to try harder on things that seem complicated for me."}}
 

lessons/Core/computing-needs-all-voices/langs/en-us/pages/workbook-pages.txt

@@ -1,5 +1,4 @@
 computing-pioneers.adoc
 NoticeAndWonder.adoc
 windows-mirrors.adoc
-ketchup-problem.pdf
-advantages-of-diverse-teams.adoc
+reflection-ketchup.adoc

lessons/Core/contracts-strings-images/langs/en-us/pages/coe-to-code-scaffolded.adoc

@@ -6,8 +6,7 @@
 ++++
 == Complete the Code by Filling in the Blanks!
 
-Finish the Code by filling in the blanks. +
-@teacher{The answers below are shown with _all_ parentheses included. There are also correct solutions in which the unnecessary parentheses are left out.}
+Finish the Code by filling in the blanks.
 
 @do{
   (define expra '(overlay (circle 5 "solid" "tan") (square 9 "solid" "red")))
@@ -22,8 +21,7 @@ Finish the Code by filling in the blanks. +
 
 == Complete the Code by adding Parentheses
 
-For each Circle of Evaluation, finish the Code by adding parentheses@ifproglang{pyret}{ and commas}. +
-@teacher{The answers below are shown with _all_ parentheses included. There are also correct solutions in which the unnecessary parentheses are left out.}
+For each Circle of Evaluation, finish the Code by adding parentheses@ifproglang{pyret}{ and commas}.
 
 @do{
   (define expr1 '(beside (triangle 5 "solid" "blue") (circle 8 "outline" "red")))
@@ -35,8 +33,10 @@ For each Circle of Evaluation, finish the Code by adding parentheses@ifproglang{
 
 @vspace{1ex}
 
+@ifnotsoln{
 [.codetwo]
 beside @hspace{1em} triangle @hspace{1em} 5 @hspace{1em} "solid" @hspace{1em} "blue" @hspace{1em} circle @hspace{1em} 8 @hspace{1em} "outline" "red"
+}
   
 @showsoln{(code expr1 #:parens true)}
 
@@ -46,8 +46,10 @@ beside @hspace{1em} triangle @hspace{1em} 5 @hspace{1em} "solid" @hspace{1em} "b
 
 @vspace{1ex}
 
+@ifnotsoln{
 [.codetwo]
 rotate @hspace{1em} 8 @hspace{1em} above @hspace{1em} star @hspace{1em} 5 @hspace{1em} "solid" @hspace{1em} "gold" @hspace{1em} triangle @hspace{1em} 3 @hspace{1em} "solid" @hspace{1em} "green" 
+}
 
 @showsoln{(code expr2 #:parens true)}
 
@@ -57,8 +59,10 @@ rotate @hspace{1em} 8 @hspace{1em} above @hspace{1em} star @hspace{1em} 5 @hspac
 
 @vspace{1ex}
 
+@ifnotsoln{
 [.codetwo]
 beside @hspace{1em} rotate @hspace{1em} 9 @hspace{1em} triangle @hspace{1em} 5 @hspace{1em} "solid" @hspace{1em} "blue" @hspace{1em} circle @hspace{1em} 8 @hspace{1em} "outline" @hspace{1em} "red"
+}
 
 @showsoln{(code expr3 #:parens true)}
 

lessons/Core/contracts-strings-images/langs/en-us/pages/matching-expressions.adoc

@@ -11,7 +11,7 @@
 </style>
 ++++
 
-_Match_ the Contract (left) with the expression described by the function being used (right). + 
+_Match_ the Contract (left) with the expression that uses it correctly (right). +
 _Note: The contracts on this page are not defined in Pyret and cannot be tested in the editor._
 
 [.FillVerticalSpace, cols=">.^17a,^.^3a,5,^.^1a,.^13a",stripes="none",grid="none",frame="none", options="header"]

lessons/Core/contracts-strings-images/langs/en-us/pages/notes-DUPLICATE-intro-to-programming.adoc

@@ -1,4 +1,4 @@
-= Introduction to Programming
+= Introduction to Programming in a Nutshell
 
 The *Editor* is a software program we use to write Code. Our Editor allows us to experiment with Code on the right-hand side, in the *Interactions Area*. For Code that we want to _keep_, we can put it on the left-hand side in the *Definitions Area*. Clicking the "Run" button causes the computer to re-read everything in the Definitions Area and erase anything that was typed into the Interactions Area.
 
@@ -9,7 +9,7 @@ Programming languages involve different @vocab{data types}, such as Numbers, Str
 
 	** Numbers are _usually_  used for quantitative data and other values are _usually_  used as categorical data.
 
-@ifproglang{pyret}{** In Pyret, any decimal _must_  start with a 0. For example, `0.22` is valid, but `.22` is not.}
+@ifproglang{pyret}{** In Pyret, decimals _must_  start with a zero. For example, `0.22` is valid, but `.22` is not.}
 
 	- Strings are values like `"Emma"`, `"Rosanna"`, `"Jen and Ed"`, or even `"08/28/1980"`.
 
@@ -48,7 +48,7 @@ Applying functions @ifproglang{wescheme}{(and operators!)} works much the way it
 	- Applying the operator @math{+} to the inputs 1 and 2 would look like @show{(code '(+ 1 2))}.
 }
 	- Applying a function to make images would look like @show{(code '(star 50 "solid" "red"))}.
-	- There are many other functions, for example @show{(code 'sqr)}, @show{(code 'sqrt)}, @show{(code 'triangle)}, @show{(code 'square)}, @show{(code 'string-repeat)}, etc.
+	- There are many other functions in @proglang, for example @show{(code 'sqr)}, @show{(code 'sqrt)}, @show{(code 'triangle)}, @show{(code 'square)}, @show{(code 'string-repeat)}, etc.
 
 @vspace{1ex}
 

lessons/Core/contracts-strings-images/langs/en-us/pages/pyret/catching-bugs.adoc

@@ -18,12 +18,14 @@
 
 @fitb{}{@showsoln{(contract 'triangle '(Number String String) "Image")}}
 
-== What Kind of Error is it?
+@n Read the explanation below. Then explain the difference in your own words.
 
-@hspace{2em} *syntax errors* -  when the computer cannot make sense of the code because of unclosed strings, missing commas or parentheses,  etc.
-@hspace{2em} *contract errors* - when the function isn't given what it needs (the wrong type or number of arguments are used)
+@indented{
+*syntax errors* -  when the computer cannot make sense of the code because of unclosed strings, missing commas or parentheses,  etc.
+*contract errors* - when the function isn't given what it needs (the wrong type or number of arguments are used)
+}
 
-@n In your own words, the difference between *syntax errors* and *contract errors* is: @fitb{}{}
+ The difference between *syntax errors* and *contract errors* is: @fitb{}{}
 
 @fitb{}{}
 

lessons/Core/contracts-strings-images/langs/en-us/pages/text-coe.adoc

@@ -3,12 +3,10 @@
 ++++
 <style>
 table .autonum::after { content: ')' !important; }
-
-/* Push content to the top (instead of the default vertical distribution), which was leaving empty space at the top. */
-#content { display: block !important; }
 </style>
 ++++
 
+[.no-flex-section]
 == Notice and Wonder
 
 @do{
@@ -45,12 +43,14 @@ _Suppose we want to see the `text` "Diego" written vertically in yellow letters
 
 _Suppose you wanted the computer to show your name in your favorite color and rotate it so that it's diagonal..._
 
-[.FillVerticalSpace, cols=".<1a, .<1a", stripes="none"]
+[.FillVerticalSpace, cols=".<1a, .<1a", stripes="none", grid="none", frame="none"]
 |===
 
-| @n Draw the circle of evaluation to generate the image of your name in your favorite color.
+| @n Draw the circle of evaluation to: +
+ generate the image of your name in your favorite color
 
-| @n Draw the circle of evaluation to `rotate` it so that it's diagonal.
+| @n Draw the circle of evaluation to: +
+ `rotate` the image so that it's diagonal
 
 ^| @showsoln{(coe '(text "Shriram" 45 "purple"))}  	^| @showsoln{(coe exp2)}
 @ifnotsoln{@vspace{35ex}}