Merge from Trunk revisions 699793 to 706550.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@706553 13f79535-47bb-0310-9956-ffa450edef68

diff --cc build.xml
Simple merge

diff --cc src/java/org/apache/fop/cli/CommandLineOptions.java
index 916745e4c2e74ab4b44725f121e8e5886eeabf1c,b589f7443a994f52aece66d8075ca4daecd563d9..c0bcc96f43b05e722dfc63bc9fd9868bdb27f13a
--- 1/src/java/org/apache/fop/cli/CommandLineOptions.java
--- 2/src/java/org/apache/fop/cli/CommandLineOptions.java
+++ b/src/java/org/apache/fop/cli/CommandLineOptions.java
@@@ -311,10 -309,9 +317,11 @@@ public class CommandLineOptions 
                  i = i + parseCustomOutputOption(args, i);
              } else if (args[i].equals("-at")) {
                  i = i + parseAreaTreeOption(args, i);
 +            } else if (args[i].equals("-if")) {
 +                i = i + parseIntermediateFormatOption(args, i);
              } else if (args[i].equals("-v")) {
-                 System.out.println("FOP Version " + Version.getVersion());
+                 printVersion();
+                 return false;
              } else if (args[i].equals("-param")) {
                    if (i + 2 < args.length) {
                        String name = args[++i];

diff --cc src/java/org/apache/fop/render/pcl/PCLRenderer.java
Simple merge

diff --cc src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
index f699378889a989c0414078da0b72cfe5e6cfb969,2aa11227abc8c3ba882a5fb3515e92883e1e5f4c..4da7f13cbecbbcb7600731a8250f8ae3d0989cf8
--- 1/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
--- 2/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
@@@ -67,13 -66,12 +67,13 @@@ public class PDFGraphics2DAdapter exten
          float imw = (float)dim.getWidth() / 1000f;
          float imh = (float)dim.getHeight() / 1000f;
  
-         float sx = fwidth / (float)imw;
-         float sy = fheight / (float)imh;
+         float sx = pdfInfo.paintAsBitmap ? 1.0f : (fwidth / (float)imw);
+         float sy = pdfInfo.paintAsBitmap ? 1.0f : (fheight / (float)imh);
  
 -        renderer.saveGraphicsState();
 -        renderer.setColor(Color.black, false, null);
 -        renderer.setColor(Color.black, true, null);
 +        generator.comment("G2D start");
 +        generator.saveGraphicsState();
 +        generator.updateColor(Color.black, false, null);
 +        generator.updateColor(Color.black, true, null);
  
          //TODO Clip to the image area.