Merge remote-tracking branch 'origin/develop'

oat-sa · Nov 11, 2022 · 0f652bd · 0f652bd
2 parents 806b918 + 850d211
commit 0f652bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/qtism/data/content/xhtml/html5/Figure.php b/src/qtism/data/content/xhtml/html5/Figure.php
@@ -25,8 +25,9 @@
 use qtism\data\content\FlowCollection;
 use qtism\data\content\FlowStatic;
 use qtism\data\content\FlowTrait;
+use qtism\data\content\Inline;
 
-class Figure extends Html5Element implements FlowStatic
+class Figure extends Html5Element implements FlowStatic, Inline
 {
  use FlowTrait;
 

diff --git a/src/qtism/data/content/xhtml/html5/Ruby.php b/src/qtism/data/content/xhtml/html5/Ruby.php
@@ -25,8 +25,11 @@
 use qtism\data\content\FlowCollection;
 use qtism\data\content\FlowStatic;
 use qtism\data\content\FlowTrait;
+use qtism\data\content\Inline;
+use qtism\data\content\InlineStatic;
+use qtism\data\content\TextOrVariable;
 
-class Ruby extends Html5Element implements FlowStatic
+class Ruby extends Html5Element implements FlowStatic, Inline, TextOrVariable, InlineStatic
 {
  use FlowTrait;
 

diff --git a/src/qtism/data/storage/xml/marshalling/GapChoiceMarshaller.php b/src/qtism/data/storage/xml/marshalling/GapChoiceMarshaller.php
@@ -30,6 +30,7 @@
 use qtism\common\utils\Version;
 use qtism\data\content\FlowStaticCollection;
 use qtism\data\content\TextOrVariableCollection;
+use qtism\data\content\xhtml\html5\Ruby;
 use qtism\data\QtiComponent;
 use qtism\data\QtiComponentCollection;
 use qtism\data\ShowHide;
@@ -69,6 +70,7 @@ class GapChoiceMarshaller extends ContentMarshaller
  'textRun',
  'tt',
  'var',
+ Ruby::QTI_CLASS_NAME
  ];
 
  /**