openstax_kitchen 10.0.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a071ba6e289c222a7333f401c7d6bd25d6dba9527253b6c6ae123169d9b6425
-  data.tar.gz: 2debc535f61a289f6668019f1eeb5cd639efaf8d49172d668f8b602e02e91b07
+  metadata.gz: e6964a7fe85234e82e7f54f3b6d4980633f4f4c29c49d3123743c214d9f46653
+  data.tar.gz: 2426f1990ae74d35d2ac098bcf7d5c09aa5094eeef598dd9658d8fedf97916c4
 SHA512:
-  metadata.gz: 6bfeae3a664c95c17249ab32a8bba863091fb1e23f501273fd57d9752688c29ba9877b5a6404393dc88ae993f16af3f89fa768e3984cf81233908ab238b0350a
-  data.tar.gz: '086fa06f8f7eb33f3908c15ba0172a02a1738c943ba87b25245f63626cda51e5163edbece95cdce2ce1907d5815aefd179db7fb7e3a4fe2a7165c623c5120ede'
+  metadata.gz: faba0041d8c958c3ffa369dbe2d0c5453f8a236bedd0654e362afa65c84093ec22771dadaa9a313e688f6644681267b63f263ba60af9d1b81a211bc3c98a5df1
+  data.tar.gz: a1e8ff40b3377508904ab62980302f129527755512f58506c805d7ae1507977ce65f1c993786cdeffc5f3871e4448e5d4df264979539d60f995d7f9c7b3ece48

data/CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.0.0] - 2021-08-6
+
+* Add `ChangeSubsectionTitleTag` direction for modifying eoc sections (minor)
+* Add `MoveSolutionsFromNumberedNote`, `MoveSolutionsFromExerciseSection`, and `SolutionAreaSnippet` for answer key baking (minor)
+* Refactor the following `Strategies`: contemporary math, precalculus, uphysics (minor)
+* Fix `BakeUnitPageTite` to utilize only pages which are direct children of the unit (patch)
+* Patch `BakeFirstElements` to include first figure elements (patch)
+* Refactor `MoveCustomSectionToEocContainer` to remove `include_intro_page` (major)
+* Update `BakeFirstElement` to optionally add the `has-first-inline-element` class (patch)
+* Patch `BakeExample` crashing if an example has commentary but no title (patch)
+* Refactor `EocSectionTitleLinkSnippet` to only have v1 with optional params (major)
+* Adds `PageElement#count_in_chapter_without_intro_page` (minor)
+* Adds `ChapterElement#has_introduction?` (minor)
+* Adds `BakeFolio` to set spanish translation variables in the html tag for folio-pdf purposes (minor)
+* Create `BakeAnnotationClasses` v1 for English Composition (minor)
+
 ## [10.0.0] - 2021-07-30
 
 * Add support for baking multipart questions to `BakeNumberedExercise` (minor)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openstax_kitchen (10.0.0)
+    openstax_kitchen (11.0.0)
       activesupport
       i18n
       nokogiri
@@ -99,7 +99,7 @@ GEM
       tins (~> 1.0)
     tins (1.26.0)
       sync
-    twitter_cldr (6.6.0)
+    twitter_cldr (6.7.0)
       camertron-eprun
       cldr-plurals-runtime-rb (~> 1.1)
       tzinfo

data/lib/kitchen/chapter_element.rb

@@ -44,6 +44,14 @@ module Kitchen
       pages('$.introduction').first
     end
 
+    # Returns true if the chapter has an introduction
+    #
+    # @return [Boolean]
+    #
+    def has_introduction?
+      @has_introduction ||= introduction_page.present?
+    end
+
     # Returns an enumerator for the glossaries
     #
     # @return [ElementEnumerator]

data/lib/kitchen/directions/bake_annotation_classes/main.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Kitchen
+  module Directions
+    module BakeAnnotationClasses
+      def self.v1(chapter:)
+        V1.new.bake(
+          chapter: chapter)
+      end
+    end
+  end
+end

data/lib/kitchen/directions/bake_annotation_classes/v1.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::BakeAnnotationClasses
+  class V1
+    def bake(chapter:)
+      chapter.search('p.annotation').each do |annotation|
+        annotation.wrap_children('span', class: 'os-text')
+        annotation.prepend(child:
+          <<~HTML
+            <div class="os-icons"></div>
+          HTML
+        )
+      end
+      annotation_icon_classes = %w[linguistic-icon
+                                   culture-icon
+                                   dreaming-icon
+                                   visual-icon
+                                   speech-icon
+                                   auditory-icon
+                                   kinesthetic-icon]
+      annotation_icon_classes.each do |annotation_icon_class|
+        chapter.search("p.#{annotation_icon_class}").each do |annotation_with_icon_class|
+          annotation_with_icon_class.search('div.os-icons').first.append(child:
+            <<~HTML
+              <span class = "#{annotation_icon_class}"></span>
+            HTML
+          )
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/directions/bake_chapter_key_concepts/v1.rb

@@ -10,7 +10,6 @@ module Kitchen::Directions::BakeChapterKeyConcepts
         uuid_key: "#{uuid_prefix}key-concepts",
         section_selector: 'section.key-concepts',
         append_to: append_to || chapter,
-        include_intro_page: false,
         wrap_section: true, wrap_content: true
       ) do |section|
         Kitchen::Directions::RemoveSectionTitle.v1(section: section)

data/lib/kitchen/directions/bake_chapter_references/v1.rb

@@ -3,9 +3,7 @@
 module Kitchen::Directions::BakeChapterReferences
   class V1
     def bake(chapter:, metadata_source:, uuid_prefix: '.', klass: 'references')
-      bake_page_references(page: chapter.introduction_page)
-
-      chapter.non_introduction_pages.each do |page|
+      chapter.pages.each do |page|
         bake_page_references(page: page)
       end
 

data/lib/kitchen/directions/bake_chapter_summary.rb

@@ -18,7 +18,7 @@ module Kitchen
         def bake(chapter:, metadata_source:, uuid_prefix: '.', klass: 'summary')
           summaries = Clipboard.new
 
-          chapter.non_introduction_pages.each do |page|
+          chapter.pages.each do |page|
             summary = page.summary
 
             next if summary.nil?

data/lib/kitchen/directions/bake_eoc_section_content/change_subsection_title_tag.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Kitchen
+  module Directions
+    module ChangeSubsectionTitleTag
+      def self.v1(section:)
+        section.search('section').each do |subsection|
+          subsection.first('h4').name = 'h5'
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/directions/bake_example.rb

@@ -54,6 +54,8 @@ module Kitchen
           next unless commentary.present?
 
           commentary_title = commentary.titles.first
+          next unless commentary_title.present?
+
           commentary_title.name = 'h4'
           commentary_title['data-type'] = 'commentary-title'
           commentary_title.wrap_children('span', class: 'os-title-label')

data/lib/kitchen/directions/bake_first_elements.rb

@@ -3,13 +3,15 @@
 module Kitchen
   module Directions
     module BakeFirstElements
-      def self.v1(within:)
+      def self.v1(within:, first_inline_list: false)
         # add has-first-element class
         selectors = [
           'div.os-problem-container > div.os-table',
           'div.os-problem-container > span[data-type="media"]',
+          'div.os-problem-container > div.os-figure',
           'div.os-solution-container > div.os-table',
-          'div.os-solution-container > span[data-type="media"]'
+          'div.os-solution-container > span[data-type="media"]',
+          'div.os-solution-container > div.os-figure'
         ]
         selectors.each do |selector|
           within.search("#{selector}:first-child").each do |problem|
@@ -18,9 +20,11 @@ module Kitchen
           end
         end
 
+        return unless first_inline_list
+
         # add first-inline-element class
         inline_selector = 'div.os-solution-container > ol[type="1"]:first-child,' \
-                           'div.os-problem-container > ol[type="1"]:first-child'
+                          'div.os-problem-container > ol[type="1"]:first-child'
         within.search(inline_selector).each do |inline_list|
           inline_list.add_class('first-inline-list-element')
           inline_list.parent.add_class('has-first-inline-list-element')

data/lib/kitchen/directions/bake_folio.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Kitchen
+  module Directions
+    module BakeFolio
+      def self.v1(book:)
+        book['data-pdf-folio-preface-message'] = I18n.t(:"folio.preface")
+        book['data-pdf-folio-access-message'] = I18n.t(:"folio.access_for_free")
+      end
+    end
+  end
+end

data/lib/kitchen/directions/bake_free_response/v1.rb

@@ -8,7 +8,7 @@ module Kitchen::Directions::BakeFreeResponse
       @metadata_elements = metadata_source.children_to_keep.copy
 
       @free_response_clipboard = Kitchen::Clipboard.new
-      chapter.non_introduction_pages.each do |page|
+      chapter.pages.each do |page|
         free_response_questions = page.free_response
         next if free_response_questions.none?
 

data/lib/kitchen/directions/bake_further_research.rb

@@ -20,8 +20,7 @@ module Kitchen
             container_key: 'further-research',
             uuid_key: "#{uuid_prefix}further-research",
             section_selector: 'section.further-research',
-            append_to: nil,
-            include_intro_page: false
+            append_to: nil
           ) do |further_research|
             RemoveSectionTitle.v1(section: further_research)
             title = EocSectionTitleLinkSnippet.v1(page: further_research.ancestor(:page))

data/lib/kitchen/directions/bake_numbered_table/bake_table_body.rb

@@ -5,24 +5,65 @@ module Kitchen
     # Bake directions for table body
     #
     module BakeTableBody
-      def self.v1(table:, number:)
-        table.remove_attribute('summary')
-        table.wrap(%(<div class="os-table">))
-
-        table_label = "#{I18n.t(:table_label)} #{number}"
-        table.pantry(name: :link_text).store table_label, label: table.id if table.id
-
-        if table.top_titled?
-          table.parent.add_class('os-top-titled-container')
-          table.prepend(sibling:
-            <<~HTML
-              <div class="os-table-title">#{table.title}</div>
-            HTML
-          )
-          table.title_row.trash
+      class V1
+        renderable
+        class CustomBody
+          attr_reader :table
+          attr_reader :klass
+          attr_reader :fake_title_class
+          attr_reader :fake_title
+          attr_reader :to_trash
+
+          def initialize(table:, klass:, fake_title_class: nil, fake_title: nil, to_trash: nil)
+            @table = table
+            @klass = klass
+            @fake_title_class = fake_title_class
+            @fake_title = fake_title
+            @to_trash = to_trash
+          end
+
+          def modify_body(has_fake_title: false)
+            @table.parent.add_class("os-#{@klass}-container")
+
+            return unless has_fake_title
+
+            @table.prepend(sibling:
+              <<~HTML
+                <div class="#{@fake_title_class}">#{@fake_title}</div>
+              HTML
+            )
+            @to_trash.trash
+          end
         end
 
-        table.parent.add_class('os-column-header-container') if table.column_header?
+        def bake(table:, number:)
+          table.remove_attribute('summary')
+          table.wrap(%(<div class="os-table">))
+
+          table_label = "#{I18n.t(:table_label)} #{number}"
+          table.pantry(name: :link_text).store table_label, label: table.id if table.id
+
+          if table.top_titled?
+            custom_table = CustomBody.new(table: table,
+                                          klass: 'top-titled',
+                                          fake_title_class: 'os-table-title',
+                                          fake_title: table.title,
+                                          to_trash: table.title_row)
+
+            custom_table.modify_body(has_fake_title: true)
+          elsif table.top_captioned?
+            custom_table = CustomBody.new(table: table,
+                                          klass: 'top-captioned',
+                                          fake_title_class: 'os-top-caption',
+                                          fake_title: table.caption_title,
+                                          to_trash: table.top_caption)
+
+            custom_table.modify_body(has_fake_title: true)
+          elsif table.column_header?
+            custom_table = CustomBody.new(table: table, klass: 'column-header')
+            custom_table.modify_body(has_fake_title: false)
+          end
+        end
       end
     end
   end

data/lib/kitchen/directions/bake_numbered_table/v1.rb

@@ -4,7 +4,7 @@ module Kitchen::Directions::BakeNumberedTable
   class V1
 
     def bake(table:, number:, always_caption: false)
-      Kitchen::Directions::BakeTableBody.v1(table: table, number: number)
+      Kitchen::Directions::BakeTableBody::V1.new.bake(table: table, number: number)
 
       # TODO: extra spaces added here to match legacy implementation, but probably not meaningful?
       new_caption = ''

data/lib/kitchen/directions/bake_numbered_table/v2.rb

@@ -6,10 +6,10 @@ module Kitchen::Directions::BakeNumberedTable
   class V2
 
     def bake(table:, number:)
-      Kitchen::Directions::BakeTableBody.v1(table: table, number: number)
+      Kitchen::Directions::BakeTableBody::V1.new.bake(table: table, number: number)
 
       caption = ''
-      if table&.caption&.first("span[data-type='title']")
+      if table&.caption&.first("span[data-type='title']") && !table.top_captioned?
         caption_el = table.caption
         caption_el.add_class('os-caption')
         caption_el.name = 'span'

data/lib/kitchen/directions/bake_unit_page_title/v1.rb

@@ -3,8 +3,10 @@
 module Kitchen::Directions::BakeUnitPageTitle
   class V1
     def bake(book:)
-      book.units.pages.each do |page|
-        compose_unit_page_title(page: page)
+      book.units.each do |unit|
+        unit.element_children.only(Kitchen::PageElement).each do |page|
+          compose_unit_page_title(page: page)
+        end
       end
     end
 

data/lib/kitchen/directions/eoc_section_title_link_snippet.rb

@@ -3,30 +3,41 @@
 module Kitchen
   module Directions
     module EocSectionTitleLinkSnippet
-      def self.v1(page:)
-        chapter = page.ancestor(:chapter)
-        <<~HTML
-          <a href="##{page.title.id}">
-            <h3 data-type="document-title" id="#{page.title.copied_id}">
-              <span class="os-number">#{chapter.count_in(:book)}.#{page.count_in(:chapter)}</span>
+      def self.v1(page:, title_tag: 'h3', wrapper: 'link')
+        if page.is_introduction?
+          os_number = ''
+        else
+          chapter = page.ancestor(:chapter)
+          os_number =
+            <<~HTML
+              <span class="os-number">#{chapter.count_in(:book)}.#{page.count_in_chapter_without_intro_page}</span>
               <span class="os-divider"> </span>
-              <span class="os-text" data-type="" itemprop="">#{page.title_text}</span>
-            </h3>
-          </a>
-        HTML
-      end
+            HTML
+        end
 
-      def self.v2(page:)
-        chapter = page.ancestor(:chapter)
-        <<~HTML
-          <div>
-            <h3 data-type="document-title" id="#{page.title.copied_id}">
-              <span class="os-number">#{chapter.count_in(:book)}.#{page.count_in(:chapter)}</span>
-              <span class="os-divider"> </span>
-              <span class="os-text" data-type="" itemprop="">#{page.title_text}</span>
-            </h3>
-          </div>
+        title_snippet = <<~HTML
+          <#{title_tag} data-type="document-title" id="#{page.title.copied_id}">
+            #{os_number}
+            <span class="os-text" data-type="" itemprop="">#{page.title_text}</span>
+          </#{title_tag}>
         HTML
+
+        case wrapper
+        when 'link'
+          <<~HTML
+            <a href="##{page.title.id}">
+              #{title_snippet}
+            </a>
+          HTML
+        when 'div'
+          <<~HTML
+            <div>
+              #{title_snippet}
+            </div>
+          HTML
+        else
+          title_snippet
+        end
       end
     end
   end

data/lib/kitchen/directions/move_custom_section_to_eoc_container/main.rb

@@ -14,11 +14,10 @@ module Kitchen
       # @param uuid_key [String] the uuid key for the wrapper class, e.g. `'.summary'`
       # @param section_selector [String] the selector for the section to be moved, e.g. `'section.summary'`
       # @param append_to [ElementBase] the element to be appended. Defaults to the value of `chapter` param if none given.
-      # @param include_intro_page [Boolean] control the introduction page for the chapter should be searched for a section to move, default is true
       # @return [ElementBase] the append_to element with container appended
       #
       def self.v1(chapter:, metadata_source:, container_key:, uuid_key:,
-                  section_selector:, append_to: nil, include_intro_page: true,
+                  section_selector:, append_to: nil,
                   wrap_section: false, wrap_content: false)
         V1.new.bake(
           chapter: chapter,
@@ -27,7 +26,6 @@ module Kitchen
           uuid_key: uuid_key,
           section_selector: section_selector,
           append_to: append_to || chapter,
-          include_intro_page: include_intro_page,
           wrap_section: wrap_section,
           wrap_content: wrap_content
         ) do |section|

data/lib/kitchen/directions/move_custom_section_to_eoc_container/v1.rb

@@ -5,10 +5,10 @@
 module Kitchen::Directions::MoveCustomSectionToEocContainer
   class V1
     def bake(chapter:, metadata_source:, container_key:, uuid_key:,
-             section_selector:, append_to:, include_intro_page:, wrap_section:, wrap_content:,
+             section_selector:, append_to:, wrap_section:, wrap_content:,
              &block)
       section_clipboard = Kitchen::Clipboard.new
-      pages = include_intro_page ? chapter.pages : chapter.non_introduction_pages
+      pages = chapter.pages
       sections = pages.search(section_selector)
       sections.each(&block)
       if wrap_section

data/lib/kitchen/directions/move_exercises_to_eoc/v1.rb

@@ -9,8 +9,7 @@ module Kitchen::Directions::MoveExercisesToEOC
         container_key: klass,
         uuid_key: "#{uuid_prefix}#{klass}",
         section_selector: "section.#{klass}",
-        append_to: append_to || chapter,
-        include_intro_page: false
+        append_to: append_to || chapter
       ) do |exercise_section|
         Kitchen::Directions::RemoveSectionTitle.v1(section: exercise_section)
       end

data/lib/kitchen/directions/move_exercises_to_eoc/v2.rb

@@ -12,7 +12,6 @@ module Kitchen::Directions::MoveExercisesToEOC
         uuid_key: "#{uuid_prefix}#{klass}",
         section_selector: "section.#{klass}",
         append_to: append_to || chapter,
-        include_intro_page: false,
         wrap_section: true, wrap_content: true
       ) do |section|
         Kitchen::Directions::RemoveSectionTitle.v1(section: section)

data/lib/kitchen/directions/move_exercises_to_eoc/v3.rb

@@ -11,8 +11,7 @@ module Kitchen::Directions::MoveExercisesToEOC
         container_key: klass,
         uuid_key: "#{uuid_prefix}#{klass}",
         section_selector: "section.#{klass}",
-        append_to: append_to || chapter,
-        include_intro_page: false
+        append_to: append_to || chapter
       ) do |exercise_section|
         Kitchen::Directions::RemoveSectionTitle.v1(section: exercise_section)
         title = Kitchen::Directions::EocSectionTitleLinkSnippet.v1(

data/lib/kitchen/directions/move_solutions_to_answer_key/move_solutions_from_exercise_section.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::MoveSolutionsFromExerciseSection
+  def self.v1(chapter:, append_to:, section_class:, title_number: nil)
+    V1.new.bake(chapter: chapter, append_to: append_to, section_class: section_class,
+                title_number: title_number)
+  end
+
+  class V1
+    def bake(chapter:, append_to:, section_class:, title_number:)
+      solutions_clipboard = Kitchen::Clipboard.new
+      chapter.search("section.#{section_class}").exercises.each do |exercise|
+        solution = exercise.solution
+        next unless solution
+
+        solution.cut(to: solutions_clipboard)
+      end
+
+      return if solutions_clipboard.items.empty?
+
+      title_text = \
+        if title_number
+          I18n.t(:"eoc.#{section_class}", number: title_number)
+        else
+          I18n.t(:"eoc.#{section_class}")
+        end
+      title = <<~HTML
+        <h3 data-type="title">
+          <span class="os-title-label">#{title_text}</span>
+        </h3>
+      HTML
+
+      append_to.append(child:
+        Kitchen::Directions::SolutionAreaSnippet.v1(
+          title: title, solutions_clipboard: solutions_clipboard
+        )
+      )
+    end
+  end
+end

data/lib/kitchen/directions/move_solutions_to_answer_key/move_solutions_from_numbered_note.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::MoveSolutionsFromNumberedNote
+  def self.v1(chapter:, append_to:, note_class:)
+    V1.new.bake(chapter: chapter, append_to: append_to, note_class: note_class)
+  end
+
+  class V1
+    def bake(chapter:, append_to:, note_class:)
+      solutions_clipboard = Kitchen::Clipboard.new
+      chapter.notes("$.#{note_class}").exercises.each do |exercise|
+        solution = exercise.solution
+        next unless solution
+
+        solution.cut(to: solutions_clipboard)
+      end
+
+      return if solutions_clipboard.items.empty?
+
+      title = <<~HTML
+        <h3 data-type="title">
+          <span class="os-title-label">#{I18n.t(:"notes.#{note_class}")}</span>
+        </h3>
+      HTML
+
+      append_to.append(child:
+        Kitchen::Directions::SolutionAreaSnippet.v1(
+          title: title, solutions_clipboard: solutions_clipboard
+        )
+      )
+    end
+  end
+end

data/lib/kitchen/directions/move_solutions_to_answer_key/solution_area_snippet.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::SolutionAreaSnippet
+  def self.v1(title:, solutions_clipboard:)
+    <<~HTML
+      <div class="os-solution-area">
+        #{title}
+        #{solutions_clipboard.paste}
+      </div>
+    HTML
+  end
+end

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/calculus.rb

@@ -25,7 +25,7 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
       protected
 
       def append_solution_area(title, clipboard, append_to)
-        append_to.add_child(
+        append_to.append(child:
           <<~HTML
             <div class="os-solution-area">
               <h3 data-type="title">

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/contemporary_math.rb

@@ -4,36 +4,19 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
   module Strategies
     class ContemporaryMath
       def bake(chapter:, append_to:)
-        solutions_clipboard = Kitchen::Clipboard.new
+        # Hacky numbering fix
         chapter.notes('$.your-turn').exercises.each do |exercise|
           solution = exercise.solution
           next unless solution
 
-          # Hacky numbering fix
           number = exercise.ancestor(:note).count_in(:chapter)
           solution.first('a.os-number').inner_html = number.to_s
           solution.first('span.os-divider').inner_html = '. '
-          solution.cut(to: solutions_clipboard)
         end
-        title = <<~HTML
-          <h3 data-type="title">
-            <span class="os-title-label">#{I18n.t(:'notes.your-turn')}</span>
-          </h3>
-        HTML
-        append_solution_area(title: title, solutions: solutions_clipboard,
-                             append_to: append_to)
-      end
-
-      def append_solution_area(title:, solutions:, append_to:)
-        append_to = append_to.add_child(
-          <<~HTML
-            <div class="os-solution-area">
-              #{title}
-            </div>
-          HTML
-        ).first
 
-        append_to.add_child(solutions.paste)
+        Kitchen::Directions::MoveSolutionsFromNumberedNote.v1(
+          chapter: chapter, append_to: append_to, note_class: 'your-turn'
+        )
       end
     end
   end

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/default.rb

@@ -12,7 +12,7 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
       def bake_section(chapter:, append_to:)
         @selectors.each do |selector|
           chapter.search("#{selector} div[data-type='solution']").each do |solution|
-            append_to.add_child(solution.cut.to_s)
+            append_to.append(child: solution.cut.to_s)
           end
         end
       end

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/precalculus.rb

@@ -9,40 +9,25 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
         # Bake section exercises
         chapter.non_introduction_pages.each do |page|
           number = "#{chapter.count_in(:book)}.#{page.count_in(:chapter)}"
-          bake_section(chapter: page, append_to: append_to, klass: 'section-exercises',
-                       number: number)
+          Kitchen::Directions::MoveSolutionsFromExerciseSection.v1(
+            chapter: page, append_to: append_to, section_class: 'section-exercises',
+            title_number: number
+          )
         end
 
         # Bake other types of exercises
         classes = %w[review-exercises practice-test]
         classes.each do |klass|
-          bake_section(chapter: chapter, append_to: append_to, klass: klass)
+          Kitchen::Directions::MoveSolutionsFromExerciseSection.v1(
+            chapter: chapter, append_to: append_to, section_class: klass
+          )
         end
       end
 
       protected
 
-      def bake_section(chapter:, append_to:, klass:, number: nil)
-        section_solutions_set = Kitchen::Clipboard.new
-        chapter.search("section.#{klass}").each do |section|
-          section.search('div[data-type="solution"]').each do |solution|
-            solution.cut(to: section_solutions_set)
-          end
-        end
-
-        return if section_solutions_set.items.empty?
-
-        title = <<~HTML
-          <h3 data-type="title">
-            <span class="os-title-label">#{I18n.t(:"eoc.#{klass}", number: number)}</span>
-          </h3>
-        HTML
-
-        append_solution_area(title: title, solutions: section_solutions_set, append_to: append_to)
-      end
-
       def try_note_solutions(chapter:, append_to:)
-        append_to.add_child(
+        append_to.append(child:
           <<~HTML
             <div class="os-module-reset-solution-area os-try-solution-area">
               <h3 data-type="title">
@@ -51,7 +36,7 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
             </div>
           HTML
         )
-        chapter.non_introduction_pages.each do |page|
+        chapter.pages.each do |page|
           solutions = Kitchen::Clipboard.new
           page.notes('$.try').each do |note|
             note.exercises.each do |exercise|
@@ -61,24 +46,18 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
           end
           next if solutions.items.empty?
 
-          title_snippet = Kitchen::Directions::EocSectionTitleLinkSnippet.v2(page: page)
+          title_snippet = Kitchen::Directions::EocSectionTitleLinkSnippet.v1(
+            page: page,
+            wrapper: 'div'
+          )
 
-          append_solution_area(title: title_snippet, solutions: solutions,
-                               append_to: append_to.search('div.os-try-solution-area').first)
+          append_to.first('div.os-try-solution-area').append(child:
+            Kitchen::Directions::SolutionAreaSnippet.v1(
+              title: title_snippet, solutions_clipboard: solutions
+            )
+          )
         end
       end
-
-      def append_solution_area(title:, solutions:, append_to:)
-        append_to = append_to.add_child(
-          <<~HTML
-            <div class="os-solution-area">
-              #{title}
-            </div>
-          HTML
-        ).first
-
-        append_to.add_child(solutions.paste)
-      end
     end
   end
 end

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/uphysics.rb

@@ -4,58 +4,16 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
   module Strategies
     class UPhysics
       def bake(chapter:, append_to:)
-        bake_from_notes(chapter: chapter, append_to: append_to, klass: 'check-understanding')
+        Kitchen::Directions::MoveSolutionsFromNumberedNote.v1(
+          chapter: chapter, append_to: append_to, note_class: 'check-understanding'
+        )
 
         classes = %w[review-conceptual-questions review-problems review-additional-problems
                      review-challenge]
         classes.each do |klass|
-          bake_section(chapter: chapter, append_to: append_to, klass: klass)
-        end
-      end
-
-      protected
-
-      def bake_section(chapter:, append_to:, klass:)
-        section_solutions_set = []
-        chapter.search(".#{klass}").each do |section|
-          section.search('div[data-type="solution"]').each do |solution|
-            section_solutions_set.push(solution.cut)
-          end
-        end
-
-        return if section_solutions_set.empty?
-
-        title = I18n.t(:"eoc.#{klass}")
-        append_solution_area(title, section_solutions_set, append_to)
-      end
-
-      def bake_from_notes(chapter:, append_to:, klass:)
-        solutions = []
-        chapter.notes("$.#{klass}").each do |note|
-          note.exercises.each do |exercise|
-            solution = exercise.solution
-            solutions.push(solution.cut) if solution
-          end
-        end
-        return if solutions.empty?
-
-        title = I18n.t(:"notes.#{klass}")
-        append_solution_area(title, solutions, append_to)
-      end
-
-      def append_solution_area(title, solutions, append_to)
-        append_to = append_to.add_child(
-          <<~HTML
-            <div class="os-solution-area">
-              <h3 data-type="title">
-                <span class="os-title-label">#{title}</span>
-              </h3>
-            </div>
-          HTML
-        ).first
-
-        solutions.each do |solution|
-          append_to.add_child(solution.raw)
+          Kitchen::Directions::MoveSolutionsFromExerciseSection.v1(
+            chapter: chapter, append_to: append_to, section_class: klass
+          )
         end
       end
     end

data/lib/kitchen/directions/move_solutions_to_answer_key/v1.rb

@@ -23,10 +23,11 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
         end
 
       solutions_or_solution = solutions_plural ? 'solutions' : 'solution'
+      uuid_key = ".#{solutions_or_solution}#{chapter.count_in(:book)}"
       append_to.append(child:
         <<~HTML
           <div class="os-eob os-#{solutions_or_solution}-container" data-type="composite-page" \
-          data-uuid-key=".#{solutions_or_solution}#{chapter.count_in(:book)}">
+          data-uuid-key="#{uuid_key}">
             <h2 data-type="document-title">
               <span class="os-text">#{I18n.t(:chapter)} #{chapter.count_in(:book)}</span>
             </h2>
@@ -37,7 +38,7 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
           </div>
         HTML
       )
-      strategy.bake(chapter: chapter, append_to: append_to.last_element)
+      strategy.bake(chapter: chapter, append_to: append_to.first("[data-uuid-key='#{uuid_key}']"))
     end
     # rubocop:enable Metrics/ParameterLists
   end

data/lib/kitchen/element_base.rb

@@ -722,10 +722,6 @@ module Kitchen
       end
     end
 
-    def last_element
-      node.last_element_child
-    end
-
     # @!method pages
     #   Returns a pages enumerator
     def_delegators :as_enumerator, :pages, :chapters, :terms, :figures, :notes, :tables, :examples,

data/lib/kitchen/page_element.rb

@@ -58,7 +58,18 @@ module Kitchen
     # @return [Boolean]
     #
     def is_introduction?
-      has_class?('introduction')
+      @is_introduction ||= has_class?('introduction')
+    end
+
+    # Returns  replaces generic call to page.count_in(:chapter)
+    #
+    # @raise [StandardError] if called on an introduction page
+    # @return [Integer]
+    #
+    def count_in_chapter_without_intro_page
+      raise 'Introduction pages cannot be counted with this method' if is_introduction?
+
+      count_in(:chapter) - (ancestor(:chapter).has_introduction? ? 1 : 0)
     end
 
     # Returns true if this page is a preface

data/lib/kitchen/table_element.rb

@@ -48,6 +48,31 @@ module Kitchen
       has_class?('top-titled')
     end
 
+    # Returns an element for the top caption, if present
+    #
+    # @return [Element, nil]
+    #
+    def top_caption
+      top_captioned? ? first('caption') : nil
+    end
+
+    # Returns the caption title nodes
+    #
+    # @return [Nokogiri::XML::NodeSet]
+    #
+    def caption_title
+      top_caption&.first('span[data-type="title"]')&.children
+    end
+
+    # Returns true if the table has a caption at the top
+    # that transforms to top title
+    #
+    # @return [Boolean]
+    #
+    def top_captioned?
+      has_class?('top-captioned')
+    end
+
     # Returns true if the table is unnumbered
     #
     # @return [Boolean]

data/lib/kitchen/version.rb

@@ -3,5 +3,5 @@
 # A library for modifying the structure of OpenStax book XML.
 #
 module Kitchen
-  VERSION = '10.0.0'
+  VERSION = '11.0.0'
 end

data/lib/locales/en.yml

@@ -36,3 +36,6 @@ en:
     key-concepts: Key Concepts
     references: References
     solutions: Solutions
+  folio:
+    preface: Preface
+    access_for_free: Access for free at openstax.org

data/lib/locales/es.yml

@@ -33,3 +33,6 @@ es:
     summary: Resumen
     further-research: Investigación Adicional
     references: Referencias
+  folio:
+    preface: Prefacio
+    access_for_free: Acceso gratis en openstax.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_kitchen
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,6 +243,8 @@ files:
 - lib/kitchen/counter.rb
 - lib/kitchen/debug/print_recipe_error.rb
 - lib/kitchen/directions/.rubocop.yml
+- lib/kitchen/directions/bake_annotation_classes/main.rb
+- lib/kitchen/directions/bake_annotation_classes/v1.rb
 - lib/kitchen/directions/bake_appendix.rb
 - lib/kitchen/directions/bake_chapter_glossary/main.rb
 - lib/kitchen/directions/bake_chapter_glossary/v1.rb
@@ -263,11 +265,13 @@ files:
 - lib/kitchen/directions/bake_checkpoint.rb
 - lib/kitchen/directions/bake_composite_chapters.rb
 - lib/kitchen/directions/bake_composite_pages.rb
+- lib/kitchen/directions/bake_eoc_section_content/change_subsection_title_tag.rb
 - lib/kitchen/directions/bake_eoc_section_content/remove_section_title.rb
 - lib/kitchen/directions/bake_equations.rb
 - lib/kitchen/directions/bake_example.rb
 - lib/kitchen/directions/bake_figure.rb
 - lib/kitchen/directions/bake_first_elements.rb
+- lib/kitchen/directions/bake_folio.rb
 - lib/kitchen/directions/bake_footnotes/main.rb
 - lib/kitchen/directions/bake_footnotes/v1.rb
 - lib/kitchen/directions/bake_free_response/free_response.xhtml.erb
@@ -328,6 +332,9 @@ files:
 - lib/kitchen/directions/move_exercises_to_eoc/v2.rb
 - lib/kitchen/directions/move_exercises_to_eoc/v3.rb
 - lib/kitchen/directions/move_solutions_to_answer_key/main.rb
+- lib/kitchen/directions/move_solutions_to_answer_key/move_solutions_from_exercise_section.rb
+- lib/kitchen/directions/move_solutions_to_answer_key/move_solutions_from_numbered_note.rb
+- lib/kitchen/directions/move_solutions_to_answer_key/solution_area_snippet.rb
 - lib/kitchen/directions/move_solutions_to_answer_key/strategies/calculus.rb
 - lib/kitchen/directions/move_solutions_to_answer_key/strategies/contemporary_math.rb
 - lib/kitchen/directions/move_solutions_to_answer_key/strategies/default.rb