Fixed svg:a section. Now cff fully compatible with online validator http://validator.imsglobal.org/iwb/index.jsp?validate=package

preferencesAboutTextFull
Aleksei Kanash 12 years ago
parent ba98d879b4
commit c7107493d4
  1. 13
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  2. 2
      src/adaptors/UBCFFSubsetAdaptor.cpp

@ -1653,7 +1653,8 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZAudio(const QDomElement &element, Q
// CFF cannot show SVG images, so we need to convert it to png. // CFF cannot show SVG images, so we need to convert it to png.
if (bRes && createPngFromSvg(srcAudioImageFile, dstAudioImageFilePath, getTransformFromUBZ(element), QSize(audioImageDimention, audioImageDimention))) if (bRes && createPngFromSvg(srcAudioImageFile, dstAudioImageFilePath, getTransformFromUBZ(element), QSize(audioImageDimention, audioImageDimention)))
{ {
QDomElement svgSwitchSection = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBSwitch); // switch section disabled because of imcompatibility with validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
// QDomElement svgSwitchSection = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBSwitch);
// first we place content // first we place content
QDomElement svgASection = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBA); QDomElement svgASection = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBA);
@ -1665,8 +1666,8 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZAudio(const QDomElement &element, Q
svgElementPart.setAttribute(aWidth, audioImageDimention); svgElementPart.setAttribute(aWidth, audioImageDimention);
svgASection.appendChild(svgElementPart); svgASection.appendChild(svgElementPart);
// switch section disabled because of imcompatibility with validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
svgSwitchSection.appendChild(svgASection); // svgSwitchSection.appendChild(svgASection);
// if viewer cannot open that content - it must use that: // if viewer cannot open that content - it must use that:
QDomElement svgText = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBTextArea); QDomElement svgText = doc.createElementNS(svgIWBNS,svgIWBNSPrefix + ":" + tIWBTextArea);
@ -1679,9 +1680,11 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZAudio(const QDomElement &element, Q
QDomText text = doc.createTextNode("Cannot Open Content"); QDomText text = doc.createTextNode("Cannot Open Content");
svgText.appendChild(text); svgText.appendChild(text);
svgSwitchSection.appendChild(svgText); // switch section disabled because of imcompatibility with validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
// svgSwitchSection.appendChild(svgText);
addSVGElementToResultModel(svgSwitchSection, dstSvgList, getElementLayer(element)); // switch section disabled because of imcompatibility with validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
addSVGElementToResultModel(svgASection/*svgSwitchSection*/, dstSvgList, getElementLayer(element));
if (0 < iwbElementPart.attributes().count()) if (0 < iwbElementPart.attributes().count())
addIWBElementToResultModel(iwbElementPart); addIWBElementToResultModel(iwbElementPart);

@ -93,7 +93,7 @@ static QString aFontweight = "font-weight";
static QString aTextalign = "text-align"; static QString aTextalign = "text-align";
static QString aPoints = "points"; static QString aPoints = "points";
static QString svgNS = "http://www.w3.org/2000/svg"; static QString svgNS = "http://www.w3.org/2000/svg";
static QString iwbNS = "http://www.becta.org.uk/iwb"; static QString iwbNS = "http://www.imsglobal.org/xsd/iwb_v1p0";
static QString aId = "id"; static QString aId = "id";
static QString aRef = "ref"; static QString aRef = "ref";
static QString aHref = "href"; static QString aHref = "href";

Loading…
Cancel
Save