Added the "-name_is_filename" command-line option

Author: jpt13653903

Docs/Readme.md

@@ -4,7 +4,8 @@
 Usage: Gerber2pdf [-silentexit] [-nowarnings] [-CMYK] ...
        [-output=output_file_name] ...
        [-background=R,G,B[,A]] [-backgroundCMYK=C,M,Y,K[,A]] ...
-       [-strokes2fills] [-page_size=extents|A3|A4|letter] ...
+       [-strokes2fills] [-name_is_filename] ...
+       [-page_size=extents|A3|A4|letter] ...
        [-orientation=portrait|landscape] [-scale_to_fit] ...
        [-next_page_size=extents|A3|A4|letter] ...
        [-next_orientation=portrait|landscape] [-next_scale_to_fit] ...
@@ -47,6 +48,9 @@ The -strokes2fills option converts all strokes to fills for the next
 file, thereby converting outlines to areas.  It resets to default
 after that file.
 
+The -name_is_filename option forces the PDF bookmarks to use
+the filename instead of the IN or LN commands.
+
 The -page_size option takes global effect and can have one of 4 values:
   "extents", "A3", "A4" or "letter"
 

Engine/Engine.cpp

@@ -25,8 +25,7 @@ using namespace std;
 //------------------------------------------------------------------------------
 
 ENGINE::COLOUR::COLOUR(){
-    UseCMYK = false;
-    R = G = B = A = 0;
+    R = G = B = 0;
     C = M = Y = K = 0;
 }
 //------------------------------------------------------------------------------
@@ -74,8 +73,6 @@ ENGINE::OPAQUE_STACK::~OPAQUE_STACK(){
 //------------------------------------------------------------------------------
 
 ENGINE::LEVEL_FORM::LEVEL_FORM(){
-    Level = 0;
-    Next  = 0;
 }
 //------------------------------------------------------------------------------
 
@@ -86,10 +83,6 @@ ENGINE::LEVEL_FORM::~LEVEL_FORM(){
 //------------------------------------------------------------------------------
 
 ENGINE::LAYER::LAYER(){
-    Filename              = 0;
-    ConvertStrokesToFills = false;
-    Form                  = 0;
-    Next                  = 0;
 }
 //------------------------------------------------------------------------------
 
@@ -127,62 +120,10 @@ ENGINE::OUTLINE::~OUTLINE(){
 //------------------------------------------------------------------------------
 
 ENGINE::ENGINE(){
-    ConvertStrokesToFills = false;
-    ScaleToFit            = false;
-    NextScaleToFit        = false;
-    UseCMYK               = false;
-
-    PageSize    = PS_Tight;
-    Orientation = PO_Auto;
-
-    NextPageSize    = PS_Tight;
-    NextOrientation = PO_Auto;
-
-    OpaqueCount = 0;
-    OpaqueStack = 0;
-
-    Layers = 0;
-
-    Mirror   = false;
-    Negative = false;
-
     Light.R = 1.0; Light.G = 1.0; Light.B = 1.0; Light.A = 0.0;
     Dark .R = 0.0; Dark .G = 0.0; Dark .B = 0.0; Dark .A = 1.0;
 
-    ApertureStack = 0;
-
-    ApertureCount   = 0;
-    CurrentAperture = 0;
-
-    SolidCircle    = false;
-    SolidRectangle = false;
-    OutlinePath    = false;
-    LineWidth      = 0.0;
-    RectW          = 0.0;
-    RectH          = 0.0;
-    RectX          = 0.0;
-    RectY          = 0.0;
-
     Opaque = new pdfOpaque("Opaque");
-
-    PageCount     = 0;
-    Combine       = false;
-    NewPage       = true;
-    ThePageUsed   = false;
-    ThePageLeft   =  1e100;
-    ThePageBottom =  1e100;
-    ThePageRight  = -1e100;
-    ThePageTop    = -1e100;
-
-    LevelStack = 0;
-    LevelCount = 0;
-
-    ThePage     = 0;
-    TheContents = 0;
-
-    Page     = 0;
-    Outline  = 0;
-
     Opaque->Opacity(1.0);
     pdf.AddIndirect(Opaque);
 }
@@ -787,7 +728,7 @@ int ENGINE::Run(const char* FileName, const char* Title){
             ConvertStrokesToFills = false;
             return 0;
         }
-        if(Gerber.Name){
+        if(!NameIsFilename && Gerber.Name){
             Layer->Title.assign(Gerber.Name);
         }else{
             for(
@@ -949,7 +890,7 @@ int ENGINE::Run(const char* FileName, const char* Title){
 
                 LevelStack->Level->Resources.AddOpaque(Opaque);
                 Apertures.clear();
-                Result = RenderLayer(LevelStack->Level, LevelStack->Level, Level);
+                int Result = RenderLayer(LevelStack->Level, LevelStack->Level, Level);
                 if(Result) return Result;
 
                 Layer->Form->Push();
@@ -975,7 +916,7 @@ int ENGINE::Run(const char* FileName, const char* Title){
 
             }else{
                 Layer->Form->Resources.AddOpaque(Opaque);
-                Result = RenderLayer(Layer->Form, Layer->Form, Level);
+                int Result = RenderLayer(Layer->Form, Layer->Form, Level);
                 if(Result) return Result;
             }
 

Engine/Engine.h

@@ -43,66 +43,71 @@ struct ENGINE{
             PS_A3,
             PS_A4,
             PS_Letter
-        } PageSize, NextPageSize;
+        };
+        PAGE_SIZE PageSize     = PS_Tight;
+        PAGE_SIZE NextPageSize = PS_Tight;
 
         enum PAGE_ORIENTATION{
             PO_Auto = 0,
             PO_Portrait,
             PO_Landscape
-        } Orientation, NextOrientation;
+        };
+        PAGE_ORIENTATION Orientation     = PO_Auto;
+        PAGE_ORIENTATION NextOrientation = PO_Auto;
 
-        bool Mirror;
-        bool Combine;
-        bool NewPage;
+        bool Mirror  = false;
+        bool Combine = false;
+        bool NewPage = true;
 
         struct COLOUR{
-            bool UseCMYK;
+            bool UseCMYK = false;
             union{
                 struct{ double R, G, B; };
                 struct{ double C, M, Y, K; };
             };
-            double A;
+            double A = 0;
             COLOUR();
             void operator=  (COLOUR& Colour);
             bool operator== (COLOUR& Colour);
         } Light, Dark;
 
-        bool ConvertStrokesToFills;
-        bool ScaleToFit;
-        bool NextScaleToFit;
-        bool UseCMYK;
-//------------------------------------------------------------------------------
+        bool ConvertStrokesToFills = false;
+        bool ScaleToFit            = false;
+        bool NextScaleToFit        = false;
+        bool UseCMYK               = false;
+        bool NameIsFilename        = false;
+    //--------------------------------------------------------------------------
 
     private: // Internal structures
-        int OpaqueCount;
+        int OpaqueCount = 0;
         struct OPAQUE_STACK{
             pdfOpaque*    Opaque;
             OPAQUE_STACK* Next;
 
             OPAQUE_STACK(double Value, int& OpaqueCount);
            ~OPAQUE_STACK();
         };
-        OPAQUE_STACK* OpaqueStack;
+        OPAQUE_STACK* OpaqueStack = 0;
 
         struct APERTURE{
             pdfForm*  Aperture;
             APERTURE* Next;
         };
 
         struct LEVEL_FORM{
-            pdfForm*    Level;
-            LEVEL_FORM* Next;
+            pdfForm*    Level = 0;
+            LEVEL_FORM* Next  = 0;
 
             LEVEL_FORM();
            ~LEVEL_FORM();
         };
 
         struct LAYER{
-            char*    Filename;
-            bool     ConvertStrokesToFills;
+            char*    Filename = 0;
+            bool     ConvertStrokesToFills = false;
             COLOUR   Light;
-            pdfForm* Form;
-            LAYER*   Next;
+            pdfForm* Form = 0;
+            LAYER*   Next = 0;
 
             bool        Negative;
             double      Left, Bottom, Right, Top;
@@ -111,7 +116,7 @@ struct ENGINE{
             LAYER();
            ~LAYER();
         };
-        LAYER* Layers; // Stack of layer XObjects
+        LAYER* Layers = 0; // Stack of layer XObjects
 
         // These stacks keep track of objects to be deleted at the end
         struct PAGE{
@@ -125,7 +130,7 @@ struct ENGINE{
             PAGE(PAGE* Next, bool UseCMYK);
            ~PAGE();
         };
-        PAGE* Page;
+        PAGE* Page = 0;
 
         struct OUTLINE{
             pdfOutlineItems* Item;
@@ -134,50 +139,49 @@ struct ENGINE{
             OUTLINE(OUTLINE* Next);
            ~OUTLINE();
         };
-        OUTLINE* Outline;
-//------------------------------------------------------------------------------
+        OUTLINE* Outline = 0;
+    //--------------------------------------------------------------------------
 
     private: // Internal State
         JPDF pdf;
 
         // Use an associative array because the Gerber apertures need not be contiguous
         typedef std::map<int, pdfForm*> pdfFormArray;
 
-        APERTURE*    ApertureStack;
-        int          ApertureCount;
+        APERTURE*    ApertureStack   = 0;
+        int          ApertureCount   = 0;
         pdfFormArray Apertures;
-        pdfForm*     CurrentAperture;
+        pdfForm*     CurrentAperture = 0;
 
         pdfOpaque* Opaque;
 
-        bool   Negative;
-        bool   SolidCircle;
-        bool   SolidRectangle;
-        bool   OutlinePath;
-        double LineWidth;
-        double RectW;
-        double RectH;
-        double RectX;
-        double RectY;
-
-        int     PageCount;
-        int     Result;
-        bool    ThePageUsed;
-        double  ThePageLeft;
-        double  ThePageBottom;
-        double  ThePageRight;
-        double  ThePageTop;
+        bool   Negative       = false;
+        bool   SolidCircle    = false;
+        bool   SolidRectangle = false;
+        bool   OutlinePath    = false;
+        double LineWidth      = 0.0;
+        double RectW          = 0.0;
+        double RectH          = 0.0;
+        double RectX          = 0.0;
+        double RectY          = 0.0;
+
+        int     PageCount     = 0;
+        bool    ThePageUsed   = false;
+        double  ThePageLeft   =  1e100;
+        double  ThePageBottom =  1e100;
+        double  ThePageRight  = -1e100;
+        double  ThePageTop    = -1e100;
 
         // PDF Variables and Structures
         pdfPages    Pages;    // Single level page tree
         pdfOutlines Outlines; // Single level outline tree
 
-        LEVEL_FORM* LevelStack;
-        int         LevelCount;
+        LEVEL_FORM* LevelStack = 0;
+        int         LevelCount = 0;
 
-        pdfPage*     ThePage;     // Page on which to combine outputs
-        pdfContents* TheContents; // Contents of ThePage
-//------------------------------------------------------------------------------
+        pdfPage*     ThePage     = 0; // Page on which to combine outputs
+        pdfContents* TheContents = 0; // Contents of ThePage
+    //--------------------------------------------------------------------------
 
     private: // Functions
         void DrawAperture(
@@ -213,7 +217,7 @@ struct ENGINE{
             PAGE*  Page,
             double Left,  double Bottom, double Right, double Top
         );
-//------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------
 
     public: // Functions
         ENGINE();

Engine/Makefile

@@ -27,7 +27,7 @@ Libraries  =
 LibInclude =
 #-------------------------------------------------------------------------------
 
-Version = -DMAJOR_VERSION=1 -DMINOR_VERSION=12
+Version = -DMAJOR_VERSION=1 -DMINOR_VERSION=13
 
 Objects  = $(shell find Tools       -iname "*.cpp")
 Objects += $(shell find Toolbox/Cpp -iname "*.cpp")

Engine/Toolbox

@@ -1,5 +1,3 @@
-#define DEBUG
-
 //==============================================================================
 // Copyright (C) John-Philip Taylor
 // jpt13653903@gmail.com

Engine/Tools/Gerber/JGerber.cpp

@@ -87,7 +87,8 @@ static bool StringStart(const char* String, const char* Start){
     int main(int argc, const char** argv){
 #endif
 
-    setupTerminal();
+    // No longer required on newer Windows terminals
+    // setupTerminal();
 
     ENGINE Engine;
 
@@ -123,7 +124,8 @@ static bool StringStart(const char* String, const char* Start){
             "Usage: Gerber2pdf [-silentexit] [-nowarnings] [-CMYK] ...\n"
             "       [-output=output_file_name] ...\n"
             "       [-background=R,G,B[,A]] [-backgroundCMYK=C,M,Y,K[,A]] ...\n"
-            "       [-strokes2fills] [-page_size=extents|A3|A4|letter] ...\n"
+            "       [-strokes2fills] [-name_is_filename] ...\n"
+            "       [-page_size=extents|A3|A4|letter] ...\n"
             "       [-orientation=portrait|landscape] [-scale_to_fit] ...\n"
             "       [-next_page_size=extents|A3|A4|letter] ...\n"
             "       [-next_orientation=portrait|landscape] [-next_scale_to_fit] ...\n"
@@ -166,6 +168,9 @@ static bool StringStart(const char* String, const char* Start){
             "file, thereby converting outlines to areas.  It resets to default\n"
             "after that file.\n"
             "\n"
+            "The -name_is_filename option forces the PDF bookmarks to use\n"
+            "the filename instead of the IN or LN commands.\n"
+            "\n"
             "The -page_size option takes global effect and can have one of 4 values:\n"
             "  \"extents\", \"A3\", \"A4\" or \"letter\"\n"
             "\n"
@@ -338,6 +343,9 @@ static bool StringStart(const char* String, const char* Start){
             }else if(!strcmp(argv[arg]+1, "strokes2fills")){
                 Engine.ConvertStrokesToFills = true;
 
+            }else if(!strcmp(argv[arg]+1, "name_is_filename")){
+                Engine.NameIsFilename = true;
+
             }else if(StringStart(argv[arg]+1, "page_size=")){
                 if     (!strcmp(argv[arg]+11, "extents")) Engine.PageSize = ENGINE::PS_Extents;
                 else if(!strcmp(argv[arg]+11, "A3"     )) Engine.PageSize = ENGINE::PS_A3;