diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java index 873f48b9..e9ce5aee 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java @@ -2906,7 +2906,7 @@ else if (vsCache == null) { } if (!VersionUtilities.isR5Plus(context.getVersion())) { - System.out.print("Load R5 Specials"); + System.out.println("Load R5 Specials"); R5ExtensionsLoader r5e = new R5ExtensionsLoader(pcm, context); r5e.load(); r5e.loadR5SpecialTypes(SpecialTypeHandler.specialTypes(context.getVersion())); @@ -3993,7 +3993,6 @@ private void loadIGPackage(String name, String canonical, String packageId, Stri loadFromPackage(name, canonical, pi, webref, igm, loadDeps); } - private boolean isValidIGToken(String tail) { if (tail == null || tail.length() == 0) return false; @@ -4002,7 +4001,6 @@ private boolean isValidIGToken(String tail) { result = result && (Utilities.isAlphabetic(tail.charAt(i)) || Utilities.isDigit(tail.charAt(i)) || (tail.charAt(i) == '_')); } return result; - } private String idForDep(ImplementationGuideDependsOnComponent dep) { @@ -7428,6 +7426,17 @@ private Element convertToElement(FetchedResource r, Resource res) throws Excepti parseVersion = str(r.getConfig(), "version", version); } } + XhtmlNode xhtml = null; + if (res instanceof DomainResource) { + xhtml = ((DomainResource) res).getText().getDiv(); + if (xhtml != null) { + if (xhtml.isEmpty()) { + xhtml = null; + } else { + ((DomainResource) res).getText().setDiv(new XhtmlParser().parseFragment("