openstax_kitchen 15.0.0 → 18.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074dfc264ca97aab5805a3ab189b49fe1e97a1108366b592b5599a70e15f1345
-  data.tar.gz: fee3491d899d7983e55e5c6eb22010b49d23e8dd43e54ca97950a7be2fbda93f
+  metadata.gz: 4343b799c2a49cec3c179ba3af59dae109cdb4fb4839fd7993710d6a1125d322
+  data.tar.gz: 6ac5fcdb6adda5fbf080b507676156c42dfc301f8060bae4dabe1bf3561fbebf
 SHA512:
-  metadata.gz: d9a5936f931cf6b1c3485543adf375426d71b444109c68fc80b0a06ef6f953e4ac43cd40b27941c06dec0541e02dd2b3387074aa8a956821cdca781f97607f1d
-  data.tar.gz: 13d5bf302fe8144acef670f017bc8393847292d37f4a4dae68922cbf56c52da41c18719ec586ca1b5b1a135dc0c303e168f5515903e2b667299347cba909e7d4
+  metadata.gz: 4dad4bfc3619807740965bc6d8f9c4332e13d2031433a5b32576d3fb66d79005ae08bebd9e25398097921ff15e1c835ebefa2b3a35d30185f194442412355f89
+  data.tar.gz: 6372b3c2860ef570dd6e0ff9011ee08759138843eef48953a2187452581edcccd96df337d1441bad5f03c32482c9058104f2ae20d4e50a905baf279a478fdb87

data/CHANGELOG.md

@@ -6,6 +6,44 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [18.0.0] - 2022-01-14
+
+* Fix links in `BakeHanbook` outline to point sections (patch)
+* Add unit title prefix with number to `BakeUnitPageTitle` (patch)
+* Add `scope="col"` attribute to `BakeTableBody` and `BakeUnnumberedTables` (major)
+
+## [17.1.0] - 2021-12-17
+
+* Add append_to support to `BakeChapterSummary` (minor)
+* Add support for italicized terms in index (minor)
+* Fix problem with namespaces in `BakeLinkPlaceholders` and `BakeIndex` (minor)
+* Create `V3` for `BakeChapterReferences`  which sorts references alphabetically (minor)
+
+## [17.0.0] - 2021-12-3
+
+* Create method in `Integer` class that generate roman numbers up to 100 (minor)
+* Add more roman numbers to `Integer` class (patch)
+* Create `V2` for `BakeChapterReferences` (minor)
+* Create `BakeExercisePrefixes` direction adding prefixes for exercises in selected sections (minor)
+* Add support for 'text-heavy-top-titled' tables in `BakeTableBody` (minor)
+* Remove `Nokigiri#previous` patch, `ElementBase#previous` now uses `#previous_element` (minor)
+* Modifies `BakeAnnotationClasses` for annotations wrapper to be a `span` intead of a `div` (major)
+
+## [16.0.0] - 2021-11-19
+
+* Add reference link separator to `BakeReferences.v1` (patch)
+* Modify `BakeFootnotes` to be more general (minor)
+* Add `#preceded_by_text` method to element_base and the nokigiri patch (minor)
+* Remove `Nokigiri#previous` patch, `ElementBase#previous` now uses `#previous_element` (minor)
+* Broaden caption selection for `BakeNumberedTable#v2` (patch)
+* Add details of question count to injected exercises in `BakeInjectedExercise` (major)
+* Add target labels to chapter content module pages option in `BakeNonIntroductionPages`, create a separate directory `BakeLOLinkLabels` to add `.label-text`, `.label-counter` spans wrappers for links with `.lo-reference` class (minor)
+* Add `BakeScreenreaderSpans` direction (minor)
+* Fix `BakeIndex` to group terms by character in polish books and transliterate it for others (minor)
+* Add optional bake `exercies-context` figure_reference if there is one present in singular part exercises to `BakeInjectedExercise`,`BakeInjectedQuestion` to move it down from exercise to question problem container. (major)
+* Create v3 for autotitled exercises with os-hasSolution class
+
 ## [15.0.0] - 2021-11-05
 
 * Add unstyled tables to `BakeTableBody` (minor)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openstax_kitchen (15.0.0)
+    openstax_kitchen (18.0.0)
       activesupport
       i18n
       nokogiri
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -36,7 +36,7 @@ GEM
       yard (~> 0.9.12)
     method_source (1.0.0)
     mini_portile2 (2.5.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -99,7 +99,7 @@ GEM
       tins (~> 1.0)
     tins (1.26.0)
       sync
-    twitter_cldr (6.7.0)
+    twitter_cldr (6.11.0)
       camertron-eprun
       cldr-plurals-runtime-rb (~> 1.1)
       tzinfo
@@ -107,7 +107,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     yard (0.9.24)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby

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

@@ -20,9 +20,18 @@ module Kitchen::Directions::BakeAnnotationClasses
                                    kinesthetic-icon]
       annotation_icon_classes.each do |annotation_icon_class|
         book.search("p.#{annotation_icon_class}").each do |annotation_with_icon_class|
-          annotation_with_icon_class.search('div.os-icons').first.append(child:
+          annotation_with_icon_class.search('div.os-icons').first&.name = 'span'
+
+          icon_title = I18n.t(:"annotation_icons.#{annotation_icon_class}.title")
+
+          annotation_with_icon_class.search('span.os-icons').first.append(child:
             <<~HTML
-              <span class = "#{annotation_icon_class}"></span>
+              <span
+                class = "#{annotation_icon_class}"
+                role="img"
+                title="#{icon_title}"
+                aria-label="#{icon_title}"
+              ></span>
             HTML
           )
         end

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

@@ -10,6 +10,10 @@ module Kitchen
       def self.v2(exercise:, title:)
         V2.new.bake(exercise: exercise, title: title)
       end
+
+      def self.v3(exercise:, title:)
+        V3.new.bake(exercise: exercise, title: title)
+      end
     end
   end
 end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::BakeAutotitledExercise
+  # Differences from V2:
+  # 1. Exercise with solution has class os-hasSolution
+  # 2. Solution id is based on exercise id
+  class V3
+    def bake(exercise:, title:)
+      exercise.add_class('unnumbered')
+      exercise.titles.first&.trash
+
+      # bake problem
+      exercise.prepend(child:
+        <<~HTML
+          <h3 class="os-title" data-type="title">
+            <span class="os-title-label">#{title}</span>
+          </h3>
+        HTML
+      )
+      exercise.problem.wrap_children(class: 'os-problem-container')
+      return unless exercise.solution
+
+      exercise.add_class('os-hasSolution')
+      exercise.solution.id = "#{exercise.id}-solution"
+      exercise.solution.wrap_children(class: 'os-solution-container')
+      exercise.solution.prepend(child:
+        <<~HTML
+          <h4 class="solution-title" data-type="title">
+            <span class="os-text">#{I18n.t(:solution)}</span>
+          </h4>
+        HTML
+      )
+    end
+  end
+end

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

@@ -10,6 +10,21 @@ module Kitchen
           uuid_prefix: uuid_prefix,
           klass: klass)
       end
+
+      def self.v2(chapter:, metadata_source:, uuid_prefix: '.', klass: 'references')
+        V2.new.bake(
+          chapter: chapter,
+          metadata_source: metadata_source,
+          uuid_prefix: uuid_prefix,
+          klass: klass)
+      end
+
+      def self.v3(chapter:, metadata_source:, uuid_prefix: '.')
+        V3.new.bake(
+          chapter: chapter,
+          metadata_source: metadata_source,
+          uuid_prefix: uuid_prefix)
+      end
     end
   end
 end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::BakeChapterReferences
+  class V2
+    def bake(chapter:, metadata_source:, uuid_prefix: '.', klass: 'references')
+      chapter.pages.each do |page|
+        bake_page_cite(page: page)
+        bake_page_references(page: page)
+      end
+
+      return if chapter.pages.references.none?
+
+      content = chapter.pages.references.cut.paste
+
+      Kitchen::Directions::CompositePageContainer.v1(
+        container_key: klass,
+        uuid_key: "#{uuid_prefix}#{klass}",
+        metadata_source: metadata_source,
+        content: content,
+        append_to: chapter
+      )
+    end
+
+    def bake_page_cite(page:)
+      page.search('[data-type="cite"]').each do |link|
+        link.id = "#{page.id}-endNote#{link.count_in(:chapter)}"
+
+        link.prepend(child:
+          <<~HTML
+            <sup class="os-end-note-number">#{link.count_in(:chapter)}</sup>
+          HTML
+        )
+
+        link.search('.delete-me').trash
+      end
+    end
+
+    def bake_page_references(page:)
+      page.references.each do |reference|
+        Kitchen::Directions::RemoveSectionTitle.v1(section: reference)
+
+        reference.search('a').each do |ref_link|
+          ref_link.replace_children(with:
+            <<~HTML
+              <span>#{ref_link.count_in(:chapter)}.</span>
+            HTML
+          )
+          ref_link.href = "##{page.id}-endNote#{ref_link.count_in(:chapter)}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::BakeChapterReferences
+  class V3
+    class Reference
+      attr_reader :element
+
+      def initialize(element)
+        reference_item = Kitchen::I18nString.new(element.text.downcase)
+        @sortable = [reference_item]
+        @element = element
+      end
+
+      def <=>(other)
+        sortable <=> other.sortable
+      end
+
+      protected
+
+      attr_reader :sortable
+    end
+
+    def bake(chapter:, metadata_source:, append_to: nil, uuid_prefix: '.')
+      @references = []
+
+      chapter.references.search('p').each do |reference_element|
+        @references.push(Reference.new(reference_element.cut))
+      end
+
+      chapter.references.trash
+
+      content = @references.sort.map { |reference| reference.element.paste }.join
+
+      return if content.empty?
+
+      Kitchen::Directions::CompositePageContainer.v1(
+        container_key: 'references',
+        uuid_key: "#{uuid_prefix}references",
+        metadata_source: metadata_source,
+        content: content,
+        append_to: append_to || chapter
+      )
+    end
+  end
+end

data/lib/kitchen/directions/bake_chapter_summary.rb

@@ -5,17 +5,18 @@ module Kitchen
     # Bake directions for eoc summary
     #
     module BakeChapterSummary
-      def self.v1(chapter:, metadata_source:, klass: 'summary', uuid_prefix: '.')
+      def self.v1(chapter:, metadata_source:, klass: 'summary', uuid_prefix: '.', append_to: nil)
         V1.new.bake(
           chapter: chapter,
           metadata_source: metadata_source,
           uuid_prefix: uuid_prefix,
-          klass: klass
+          klass: klass,
+          append_to: append_to
         )
       end
 
       class V1
-        def bake(chapter:, metadata_source:, uuid_prefix: '.', klass: 'summary')
+        def bake(chapter:, metadata_source:, uuid_prefix: '.', klass: 'summary', append_to: nil)
           summaries = Clipboard.new
 
           chapter.pages.each do |page|
@@ -36,7 +37,7 @@ module Kitchen
             uuid_key: "#{uuid_prefix}#{klass}",
             metadata_source: metadata_source,
             content: summaries.paste,
-            append_to: chapter
+            append_to: append_to || chapter
           )
         end
       end

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

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

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Kitchen::Directions::BakeExercisePrefixes
+  class V1
+    def bake(chapter:, sections_prefixed:)
+      sections_prefixed.each do |section_key|
+        chapter.composite_pages.each do |composite_page|
+          composite_page.search("section.#{section_key}").exercises.each do |exercise|
+            problem = exercise.problem
+            exercise_prefix =
+              "<span class='os-text'>#{I18n.t(:"sections_prefixed.#{section_key}")}</span>"
+            problem.prepend(child:
+              <<~HTML
+                #{exercise_prefix}
+              HTML
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Kitchen::Directions::BakeFootnotes
         aside_id_to_footnote_number[aside_id] = footnote_number
         if anchor.parent.name == 'p'
           anchor.parent.add_class('has-noteref')
-        elsif anchor.parent.name == 'em' && anchor.parent.parent.name == 'p'
+        elsif anchor.parent.name != 'p' && anchor.parent.parent.name == 'p'
           anchor.parent.parent.add_class('has-noteref')
         end
       end

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

@@ -43,7 +43,7 @@ module Kitchen::Directions::BakeHandbook
 
         outline_item_html = <<~HTML
           <div class="os-handbook-objective">
-            <a class="os-handbook-objective" href="##{first_section_title[:id]}">
+            <a class="os-handbook-objective" href="##{section[:id]}">
               #{first_section_title.children}
             </a>
           </div>

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

@@ -11,12 +11,14 @@ module Kitchen::Directions::BakeIndex
       attr_reader :id
       attr_reader :group_by
       attr_reader :page_title
+      attr_reader :italicized
 
-      def initialize(text:, id:, group_by:, page_title:)
+      def initialize(text:, id:, group_by:, page_title:, italicized:)
         @text = text.strip
         @id = id
         @group_by = group_by
         @page_title = page_title
+        @italicized = italicized
       end
     end
 
@@ -126,7 +128,8 @@ module Kitchen::Directions::BakeIndex
         page = term_element.ancestor(:page)
         term_element.id = "auto_#{page.id}_term#{term_element.count_in(:book)}"
         page_title = page.title.text
-        add_term_to_index(term_element, page_title)
+        term_italicized = term_element&.first("em[data-effect='italics']")
+        add_term_to_index(term_element, page_title, term_italicized)
       end
 
       book.chapters.composite_pages.terms.each do |term_element|
@@ -135,7 +138,8 @@ module Kitchen::Directions::BakeIndex
         term_element.id = "auto_composite_page_term#{term_element.count_in(:book)}"
         chapter_number = chapter.count_in(:book)
         page_title = "#{chapter_number} #{page.title.text.strip}".strip
-        add_term_to_index(term_element, page_title)
+        term_italicized = term_element&.first("em[data-effect='italics']")
+        add_term_to_index(term_element, page_title, term_italicized)
       end
 
       types.each do |type|
@@ -150,22 +154,22 @@ module Kitchen::Directions::BakeIndex
       end
     end
 
-    def add_term_to_index(term_element, page_title)
+    def add_term_to_index(term_element, page_title, term_italicized)
       type =
         if !term_element.key?('index')
           'term'
-        elsif term_element['cxlxt:index'] == 'name'
+        elsif term_element['cxlxt:index'] == 'name' || term_element['index'] == 'name'
           'name'
-        elsif term_element['cxlxt:index'] == 'foreign'
+        elsif term_element['cxlxt:index'] == 'foreign' || term_element['index'] == 'foreign'
           'foreign'
         end
 
       if term_element.key?('reference')
-        term_reference = term_element['cmlnle:reference']
+        term_reference = term_element['cmlnle:reference'] || term_element['reference']
         group_by = term_reference[0]
         content = term_reference
       else
-        group_by = I18n.transliterate(term_element.text.strip[0])
+        group_by = I18n.character_to_group(term_element.text.strip[0])
         content = term_element.text
       end
 
@@ -175,6 +179,7 @@ module Kitchen::Directions::BakeIndex
       # Add it to our index object
       @indexes[type].add_term(
         Term.new(
+          italicized: term_italicized,
           text: content,
           id: term_element.id,
           group_by: group_by,

data/lib/kitchen/directions/bake_index/v1.xhtml.erb

@@ -13,7 +13,7 @@
         <div class="os-index-item">
           <%- item.terms.each_with_index do |term, ii| -%>
             <%- if ii == 0 -%>
-              <span class="os-term" group-by="<%= term.group_by %>"><%= term.text %></span>
+              <span class="os-term" group-by="<%= term.group_by %>"><%- if term.italicized -%><em data-effect="italics"><%= term.text %></em><%- else -%><%= term.text %><% end %></span>
             <%- else -%><span class="os-index-link-separator">, </span><% end %>
             <a class="os-term-section-link" href="#<%= term.id %>"><span class="os-term-section"><%= term.page_title %></span></a><!--
           --><%- end %>

data/lib/kitchen/directions/{bake_injected_exercise.rb → bake_injected_exercise/bake_injected_exercise.rb}

@@ -7,12 +7,21 @@ module Kitchen::Directions::BakeInjectedExercise
 
   class V1
     def bake(exercise:)
-      context = exercise.search('div[data-type="exercise-context"]')&.first
+      question_count = exercise.injected_questions.count
+      exercise[:'data-question-count'] = question_count
+      exercise[:'data-is-multipart'] = question_count > 1 ? 'True' : 'False'
+
+      context = exercise&.exercise_context
+
       return unless context
 
       # link replacement is done by BakeLinkPlaceholders
       link = context.first('a').cut
       context.replace_children(with: "#{I18n.t(:context_lead_text)}#{link.paste}")
+      return unless question_count == 1
+
+      question = exercise.exercise_question
+      question.prepend(child: context.cut.paste)
     end
   end
 end

data/lib/kitchen/directions/bake_injected_exercise/bake_injected_exercise_question.rb

@@ -41,11 +41,15 @@ module Kitchen::Directions::BakeInjectedExerciseQuestion
         end
       end
 
+      context = question.exercise_context_in_question&.cut&.paste
+
       question.prepend(child:
         <<~HTML
           #{problem_number unless only_number_solution}
           #{"<span class='os-divider'>. </span>" unless only_number_solution}
           <div class="os-problem-container">
+            #{context if context.present?}
+            #{"<span class='os-divider'>. </span>" if context.present?}
             #{question.stimulus&.cut&.paste}
             #{question.stem.cut.paste}
             #{question.answers&.cut&.paste}

data/lib/kitchen/directions/bake_link_placeholders.rb

@@ -9,7 +9,7 @@ module Kitchen
         book.search('a').each do |anchor|
           next unless anchor.text == '[link]'
 
-          label_case = anchor['cmlnle:case']
+          label_case = anchor['cmlnle:case'] || anchor['case']
           id = anchor[:href][1..-1]
 
           if cases

data/lib/kitchen/directions/bake_lo_link_labels.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Kitchen
+  module Directions
+    # Bake directions for LO link labels
+    module BakeLOLinkLabels
+      def self.v1(book:)
+        book.search('a.lo-reference').each do |anchor|
+          anchor.wrap_children('span', class: 'label-counter')
+          anchor.prepend(child:
+            <<~HTML
+              <span class="label-text">#{I18n.t(:lo_label_text)}</span>
+            HTML
+          )
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/directions/bake_non_introduction_pages.rb

@@ -3,13 +3,15 @@
 module Kitchen
   module Directions
     module BakeNonIntroductionPages
-      def self.v1(chapter:)
+      def self.v1(chapter:, add_target_label: false)
         chapter.non_introduction_pages.each do |page|
           number = "#{chapter.count_in(:book)}.#{page.count_in(:chapter)}"
 
           page.search("div[data-type='description']").each(&:trash)
           page.add_class('chapter-content-module')
 
+          page.target_label(custom_content: number) if add_target_label
+
           title = page.title
           title.name = 'h2'
           title.replace_children(with:

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

@@ -40,12 +40,17 @@ module Kitchen
           table.remove_attribute('summary')
           table.wrap(%(<div class="os-table">))
 
+          table.search('th').each do |header|
+            header[:scope] = 'col'
+          end
+
           # Store label information
           table.target_label(label_text: 'table', custom_content: number, cases: cases)
 
           if table.top_titled?
+            klass = table.text_heavy? ? 'text-heavy-top-titled' : 'top-titled'
             custom_table = CustomBody.new(table: table,
-                                          klass: 'top-titled',
+                                          klass: klass,
                                           fake_title_class: 'os-table-title',
                                           fake_title: table.title,
                                           to_trash: table.title_row)

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

@@ -9,7 +9,8 @@ module Kitchen::Directions::BakeNumberedTable
       Kitchen::Directions::BakeTableBody::V1.new.bake(table: table, number: number, cases: cases)
 
       caption = ''
-      if table&.caption&.first("span[data-type='title']") && !table.top_captioned?
+      if (table&.caption&.first("span[data-type='title']") || table&.caption) \
+        && !table.top_captioned?
         caption_el = table.caption
         caption_el.add_class('os-caption')
         caption_el.name = 'span'

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

@@ -12,6 +12,19 @@ module Kitchen::Directions::BakeReferences
               <sup class="os-citation-number">#{link.count_in(:chapter)}</sup>
             HTML
           )
+
+          next if link.nil?
+
+          link_sibling = link.previous unless link.preceded_by_text?
+          next if link_sibling.nil?
+
+          next unless link_sibling&.raw&.attr('data-type') == 'cite'
+
+          link.prepend(sibling:
+            <<~HTML
+              <span class="os-reference-link-separator">, </span>
+            HTML
+            )
         end
 
         chapter.references.each do |reference|

data/lib/kitchen/directions/bake_screenreader_spans.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Kitchen
+  module Directions
+    module BakeScreenreaderSpans
+      # Add text for accessibility.
+      # Additional screenreader spans can be added below.
+      def self.v1(book:)
+        book.search('u[data-effect="double-underline"]').each do |element|
+          element.add_previous_sibling(
+            '<span data-screenreader-only="true">double underline</span>'
+          )
+        end
+        book.search('u[data-effect="underline"]').each do |element|
+          element.add_previous_sibling(
+            '<span data-screenreader-only="true">underline</span>'
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -4,17 +4,23 @@ module Kitchen::Directions::BakeUnitPageTitle
   class V1
     def bake(book:)
       book.units.each do |unit|
+        @unit_title = I18n.t(:unit)
+        @unit_number = unit.count_in(:book)
         unit.element_children.only(Kitchen::PageElement).each do |page|
-          compose_unit_page_title(page: page)
+          compose_unit_page_title(page: page, unit_title_prefix: @unit_title,
+                                  unit_number: @unit_number)
         end
       end
     end
 
-    def compose_unit_page_title(page:)
+    def compose_unit_page_title(page:, unit_title_prefix:, unit_number:)
       title = page.title
       title.name = 'h2'
       title.replace_children(with:
         <<~HTML
+          <span class="os-part-text">#{unit_title_prefix} </span>
+          <span class="os-number">#{unit_number}</span>
+          <span class="os-divider"> </span>
           <span data-type="" itemprop="" class="os-text">#{title.text}</span>
         HTML
       )

data/lib/kitchen/directions/bake_unnumbered_tables.rb

@@ -10,6 +10,10 @@ module Kitchen
           table.parent.add_class('os-unstyled-container') if table.unstyled?
           table.parent.add_class('os-column-header-container') if table.column_header?
           table.parent.add_class('os-top-titled-container') if table.top_titled?
+
+          table.search('th').each do |header|
+            header[:scope] = 'col'
+          end
         end
       end
     end

data/lib/kitchen/element_base.rb

@@ -82,9 +82,13 @@ module Kitchen
     #   Set the inner HTML for this element
     #   @see https://www.rubydoc.info/github/sparklemotion/nokogiri/Nokogiri/XML/Node#inner_html=-instance_method Nokogiri::XML::Node#inner_html=
     #   @return Object
+    # @!method preceded_by_text
+    #   Returns true if the immediately preceding sibling is text
+    #   @return Boolean
     def_delegators :@node, :name=, :name, :[], :[]=, :add_class, :remove_class,
                    :text, :wrap, :children, :to_html, :remove_attribute,
-                   :key?, :classes, :path, :inner_html=
+                   :key?, :classes, :path, :inner_html=, :add_previous_sibling,
+                   :preceded_by_text?
 
     # @!method config
     #   Get the config for this element's document
@@ -219,6 +223,22 @@ module Kitchen
       self[:'data-type']
     end
 
+    # Returns the element's href
+    #
+    # @return [String]
+    #
+    def href
+      self[:href]
+    end
+
+    # Sets the element's href
+    #
+    # @param value [String] the new value for the href
+    #
+    def href=(value)
+      self[:href] = value
+    end
+
     # A way to set values and chain them
     #
     # @param property [String, Symbol] the name of the property to set
@@ -502,12 +522,12 @@ module Kitchen
       Element.new(node: raw.parent, document: document, short_type: "parent(#{short_type})")
     end
 
-    # returns previous element
-    # skips double indentations that the nokigiri sometimes picks up
+    # returns previous element sibling
+    # (only returns elements or nil)
     # nil if there's no previous sibling
     #
     def previous
-      prev = raw.previous
+      prev = raw.previous_element
       return prev if prev.nil?
 
       Element.new(
@@ -754,7 +774,7 @@ module Kitchen
     def_delegators :as_enumerator, :pages, :chapters, :terms, :figures, :notes, :tables, :examples,
                    :metadatas, :non_introduction_pages, :units, :titles, :exercises, :references,
                    :composite_pages, :composite_chapters, :solutions, :injected_questions,
-                   :search_with, :sections
+                   :search_with, :sections, :injected_exercises
 
     # Returns this element as an enumerator (over only one element, itself)
     #

data/lib/kitchen/element_enumerator_base.rb

@@ -336,6 +336,24 @@ module Kitchen
                css_or_xpath: css_or_xpath, only: only, except: except)
     end
 
+    # Returns an enumerator that iterates through injected exercises within the scope of this enumerator
+    #
+    # @param css_or_xpath [String] additional selectors to further narrow the element iterated over;
+    #   a "$" in this argument will be replaced with the default selector for the element being
+    #   iterated over.
+    # @param only [Symbol, Callable] the name of a method to call on an element or a
+    #   lambda or proc that accepts an element; elements will only be included in the
+    #   search results if the method or callable returns true
+    # @param except [Symbol, Callable] the name of a method to call on an element or a
+    #   lambda or proc that accepts an element; elements will not be included in the
+    #   search results if the method or callable returns false
+    #
+    def injected_exercises(css_or_xpath=nil, only: nil, except: nil)
+      block_error_if(block_given?)
+      chain_to(InjectedExerciseElementEnumerator,
+               css_or_xpath: css_or_xpath, only: only, except: except)
+    end
+
     # Returns an enumerator that iterates within the scope of this enumerator
     #
     # @param css_or_xpath [String] additional selectors to further narrow the element iterated over

data/lib/kitchen/injected_exercise_element.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Kitchen
+  # An element for an example
+  #
+  class InjectedExerciseElement < ElementBase
+
+    # Creates a new +InjectedQuestionElement+
+    #
+    # @param node [Nokogiri::XML::Node] the node this element wraps
+    # @param document [Document] this element's document
+    #
+    def initialize(node:, document: nil)
+      super(node: node,
+            document: document,
+            enumerator_class: InjectedExerciseElementEnumerator)
+    end
+
+    # Returns the short type
+    # @return [Symbol]
+    #
+    def self.short_type
+      :injected_exercise
+    end
+
+    # Returns the exercise context element.
+    # @return [Element]
+    #
+    def exercise_context
+      first("div[data-type='exercise-context']")
+    end
+
+    # Returns the exercise question element.
+    # @return [Element]
+    #
+    def exercise_question
+      first("div[data-type='exercise-question']")
+    end
+
+  end
+end

data/lib/kitchen/injected_exercise_element_enumerator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Kitchen
+  # An enumerator for example elements
+  #
+  class InjectedExerciseElementEnumerator < ElementEnumeratorBase
+
+    # Returns a factory for this enumerator
+    #
+    # @return [ElementEnumeratorFactory]
+    #
+    def self.factory
+      ElementEnumeratorFactory.new(
+        default_css_or_xpath: Selector.named(:injected_exercise),
+        sub_element_class: InjectedExerciseElement,
+        enumerator_class: self
+      )
+    end
+
+  end
+end

data/lib/kitchen/injected_question_element.rb

@@ -55,6 +55,13 @@ module Kitchen
       first("div[data-type='question-solution']")
     end
 
+    # Returns the exercise context element.
+    # @return [Element]
+    #
+    def exercise_context_in_question
+      first("div[data-type='exercise-context']")
+    end
+
     # Returns the answer correctness given an alphabet
     #
     # @return [Array]

data/lib/kitchen/patches/i18n.rb

@@ -4,6 +4,10 @@ require 'twitter_cldr'
 
 # rubocop:disable Style/Documentation
 module I18n
+  def self.character_to_group(character)
+    I18n.locale == :pl ? character : I18n.transliterate(character)
+  end
+
   def self.sort_strings(first, second)
     string_sorter.compare(first, second)
   end

data/lib/kitchen/patches/integer.rb

@@ -3,7 +3,22 @@
 # Monkey patches for +Integer+
 #
 class Integer
-  ROMAN_NUMERALS = %w[0 i ii iii iv v vi vii viii ix x xi xii xiii xiv xv xvi xvii xviii xix xx].freeze
+
+  @roman_numerals = {
+    100 => 'c',
+    90 => 'xc',
+    50 => 'l',
+    40 => 'xl',
+    10 => 'x',
+    9 => 'ix',
+    5 => 'v',
+    4 => 'iv',
+    1 => 'i'
+  }
+
+  class << self
+    attr_accessor :roman_numerals
+  end
 
   # Formats as different types of integers, including roman numerals.
   #
@@ -14,11 +29,25 @@ class Integer
     when :arabic
       to_s
     when :roman
-      raise 'Unknown conversion to Roman numerals' if self >= ROMAN_NUMERALS.size
+      raise 'Unknown conversion to Roman numerals' if self > self.class.roman_numerals.keys.first
 
-      ROMAN_NUMERALS[self]
+      to_roman
     else
       raise 'Unknown integer format'
     end
   end
+
+  def to_roman
+    return 0 if zero?
+
+    roman = ''
+    integer = self
+    self.class.roman_numerals.each do |number, letter|
+      until integer < number
+        roman += letter
+        integer -= number
+      end
+    end
+    roman
+  end
 end

data/lib/kitchen/patches/nokogiri.rb

@@ -67,11 +67,12 @@ module Nokogiri
         self[:class]&.split || []
       end
 
-      def previous
-        prev = previous_element
-        return nil if prev.nil?
+      def preceded_by_text?
+        prev = previous_sibling
+        while !prev.nil? && prev.blank? do prev = prev.previous_sibling end
+        return false if prev.nil?
 
-        prev.text? ? prev.previous : prev
+        prev.text?
       end
 
       def self.selector_to_css_nodes(selector)

data/lib/kitchen/selectors/base.rb

@@ -65,6 +65,9 @@ module Kitchen
       # Selector for a section
       # @return [String]
       attr_accessor :section
+      # Selector for an injected exercise
+      # @return [String]
+      attr_accessor :injected_exercise
 
       # Override specific selectors
       #

data/lib/kitchen/selectors/standard_1.rb

@@ -30,6 +30,7 @@ module Kitchen
                                           "div[data-type='question-solution']"
         self.injected_question          = "div[data-type='exercise-question']"
         self.section                    = 'section'
+        self.injected_exercise          = "div[data-type='injected-exercise']"
       end
 
     end

data/lib/kitchen/version.rb

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

data/lib/locales/en.yml

@@ -28,6 +28,7 @@ en:
   iframe_link_text: Click to view content
   handbook_outline_title: Outline
   context_lead_text: 'Refer to '
+  lo_label_text: 'LO '
   eoc:
     glossary: Key Terms
     key-equations: Key Equations
@@ -45,3 +46,18 @@ en:
     reference: References
   index:
     main: Index
+  annotation_icons:
+    linguistic-icon:
+      title: Language lens icon
+    culture-icon:
+      title: Culture lens icon
+    dreaming-icon:
+      title: Generating and capturing ideas icon
+    visual-icon:
+      title: Visual learning style icon
+    speech-icon:
+      title: Voice to text icon
+    auditory-icon:
+      title: Auditory learning style icon
+    kinesthetic-icon:
+      title: Kinesthetic learning style icon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_kitchen
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 18.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -252,6 +252,7 @@ files:
 - lib/kitchen/directions/bake_autotitled_exercise/main.rb
 - lib/kitchen/directions/bake_autotitled_exercise/v1.rb
 - lib/kitchen/directions/bake_autotitled_exercise/v2.rb
+- lib/kitchen/directions/bake_autotitled_exercise/v3.rb
 - lib/kitchen/directions/bake_chapter_glossary/main.rb
 - lib/kitchen/directions/bake_chapter_glossary/v1.rb
 - lib/kitchen/directions/bake_chapter_introductions/bake_chapter_objectives.rb
@@ -264,6 +265,8 @@ files:
 - lib/kitchen/directions/bake_chapter_key_equations.rb
 - lib/kitchen/directions/bake_chapter_references/main.rb
 - lib/kitchen/directions/bake_chapter_references/v1.rb
+- lib/kitchen/directions/bake_chapter_references/v2.rb
+- lib/kitchen/directions/bake_chapter_references/v3.rb
 - lib/kitchen/directions/bake_chapter_section_exercises/main.rb
 - lib/kitchen/directions/bake_chapter_section_exercises/v1.rb
 - lib/kitchen/directions/bake_chapter_solutions/main.rb
@@ -280,6 +283,8 @@ files:
 - 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_exercise_prefixes/main.rb
+- lib/kitchen/directions/bake_exercise_prefixes/v1.rb
 - lib/kitchen/directions/bake_figure.rb
 - lib/kitchen/directions/bake_first_elements.rb
 - lib/kitchen/directions/bake_folio.rb
@@ -296,13 +301,14 @@ files:
 - lib/kitchen/directions/bake_index/main.rb
 - lib/kitchen/directions/bake_index/v1.rb
 - lib/kitchen/directions/bake_index/v1.xhtml.erb
-- lib/kitchen/directions/bake_injected_exercise.rb
 - lib/kitchen/directions/bake_injected_exercise/add_injected_exercise_id.rb
+- lib/kitchen/directions/bake_injected_exercise/bake_injected_exercise.rb
 - lib/kitchen/directions/bake_injected_exercise/bake_injected_exercise_question.rb
 - lib/kitchen/directions/bake_inline_lists.rb
 - lib/kitchen/directions/bake_learning_objectives.rb
 - lib/kitchen/directions/bake_link_placeholders.rb
 - lib/kitchen/directions/bake_lists_with_para.rb
+- lib/kitchen/directions/bake_lo_link_labels.rb
 - lib/kitchen/directions/bake_math_in_paragraph.rb
 - lib/kitchen/directions/bake_non_introduction_pages.rb
 - lib/kitchen/directions/bake_notes/bake_autotitled_notes.rb
@@ -326,6 +332,7 @@ files:
 - lib/kitchen/directions/bake_references/v1.rb
 - lib/kitchen/directions/bake_references/v2.rb
 - lib/kitchen/directions/bake_references/v3.rb
+- lib/kitchen/directions/bake_screenreader_spans.rb
 - lib/kitchen/directions/bake_stepwise.rb
 - lib/kitchen/directions/bake_suggested_reading.rb
 - lib/kitchen/directions/bake_toc.rb
@@ -373,6 +380,8 @@ files:
 - lib/kitchen/figure_element_enumerator.rb
 - lib/kitchen/i18n_string.rb
 - lib/kitchen/id_tracker.rb
+- lib/kitchen/injected_exercise_element.rb
+- lib/kitchen/injected_exercise_element_enumerator.rb
 - lib/kitchen/injected_question_element.rb
 - lib/kitchen/injected_question_element_enumerator.rb
 - lib/kitchen/metadata_element.rb