diff --git a/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java b/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java index ecbf52f..820789b 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java +++ b/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java @@ -128,6 +128,28 @@ public abstract class PDFMojo extends AbstractFoMojo { */ private String coverColor; + /** + * + * + * @parameter expression="${generate-pdf.pageWidth}" default-value="" + */ + private String pageWidth; + + /** + * + * + * @parameter expression="${generate-pdf.pageHeight}" default-value="" + */ + private String pageHeight; + + /** + * Should cover be omitted? + * + * @parameter expression="${generate-pdf.omitCover}" default-value="" + */ + private String omitCover; + + /** * The greeting to display. * @@ -373,7 +395,17 @@ public abstract class PDFMojo extends AbstractFoMojo { transformer.setParameter("coverLogoTop", coverLogoTop); transformer.setParameter("coverUrl", coverUrl); transformer.setParameter("coverColor", coverColor); - + + if(null != pageWidth){ + transformer.setParameter("page.width", pageWidth); + } + if(null != pageHeight){ + transformer.setParameter("page.height", pageHeight); + } + if(null != omitCover){ + transformer.setParameter("omitCover", omitCover); + } + String sysDraftStatus=System.getProperty("draft.status"); getLog().info("adjustTransformer():sysDraftStatus="+sysDraftStatus); if(null!=sysDraftStatus && !sysDraftStatus.isEmpty()){ diff --git a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java index 768efdf..34c8ee8 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java +++ b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java @@ -172,7 +172,25 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { */ private String coverColor; + /** + * + * + * @parameter expression="${generate-pdf.pageWidth}" default-value="" + */ + private String pageWidth; + /** + * + * + * @parameter expression="${generate-pdf.pageHeight}" default-value="" + */ + private String pageHeight; + /** + * Should cover be omitted? + * + * @parameter expression="${generate-pdf.omitCover}" default-value="" + */ + private String omitCover; /** @@ -447,6 +465,17 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { transformer.setParameter("coverUrl", coverUrl); transformer.setParameter("coverColor", coverColor); + if(null != pageWidth){ + transformer.setParameter("page.width", pageWidth); + } + if(null != pageHeight){ + transformer.setParameter("page.height", pageHeight); + } + if(null != omitCover){ + transformer.setParameter("omitCover", omitCover); + } + + transformer.setParameter("enable.disqus", enableDisqus); if (disqusShortname != null) { transformer.setParameter("disqus.shortname", disqusShortname); @@ -842,6 +871,11 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { pdfBuilder.setSourceDirectory(getSourceDirectory()); pdfBuilder.setAutopdfTargetDirectory(targetDir); pdfBuilder.setCoverColor(coverColor); + + pdfBuilder.setPageWidth(pageWidth); + pdfBuilder.setPageHeight(pageHeight); + pdfBuilder.setOmitCover(omitCover); + pdfBuilder.setCoverLogoPath(coverLogoPath); pdfBuilder.setSecondaryCoverLogoPath(secondaryCoverLogoPath); pdfBuilder.setCoverLogoLeft(coverLogoLeft); diff --git a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java index 40aa673..39314a4 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java +++ b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java @@ -101,6 +101,9 @@ public class PDFBuilder { //transformer settings //TODO: need to somehow pass coverLogoPath, secondaryCoverLogoPath, coverLogoLeft, coverLogoTop, coverUrl from the WebHelp flow private String coverColor; + private String pageWidth; + private String pageHeight; + private String omitCover; private String coverLogoPath; private String secondaryCoverLogoPath; private String coverLogoLeft; @@ -352,6 +355,16 @@ public class PDFBuilder { transformer.setParameter("coverUrl", coverUrl); transformer.setParameter("coverColor", coverColor); + if(null != pageWidth){ + transformer.setParameter("page.width", pageWidth); + } + if(null != pageHeight){ + transformer.setParameter("page.height", pageHeight); + } + if(null != omitCover){ + transformer.setParameter("omitCover", omitCover); + } + if(null != sectionAutolabel){ transformer.setParameter("section.autolabel", sectionAutolabel); } @@ -609,6 +622,28 @@ public class PDFBuilder { this.branding = branding; } + public String getPageWidth() { + return pageWidth; + } + public void setPageWidth(String pageWidth) { + this.pageWidth = pageWidth; + } + + public String getPageHeight() { + return pageHeight; + } + public void setPageHeight(String pageHeight) { + this.pageHeight = pageHeight; + } + + public String getOmitCover() { + return omitCover; + } + public void setOmitCover(String omitCover) { + this.omitCover = omitCover; + } + + public String getSecurity() { return security; } diff --git a/src/main/resources/cloud/fo/docbook.xsl b/src/main/resources/cloud/fo/docbook.xsl index 5cd3821..3450d0a 100644 --- a/src/main/resources/cloud/fo/docbook.xsl +++ b/src/main/resources/cloud/fo/docbook.xsl @@ -40,7 +40,7 @@ - + no start @@ -299,6 +299,12 @@ + + + + + + @@ -398,6 +404,7 @@ + + @@ -457,7 +465,7 @@ - +