Changeset 61


Ignore:
Timestamp:
Jul 1, 2006, 7:09:21 AM (15 years ago)
Author:
Eugene Romanenko
Message:

interface changes as per Heiko Nitzsche suggestions, compatibility changes

Location:
trunk/Lucide/SOURCE
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/SOURCE/gui/docViewer.cpp

    r59 r61  
    104104    VScrollStep = 1;
    105105    WinSetRectEmpty( hab, &savedRcl );
     106    drawPS = false;
    106107    // asynch draw
    107108    abortAsynch = false;
     
    136137    hWndVscroll = WinWindowFromID( hWndDocFrame, FID_VERTSCROLL );
    137138
    138     drawThreadId = _beginthread( drawthread, NULL, 65536, this );
     139    drawThreadId = _beginthread( drawthread, NULL, 262144, this );
    139140}
    140141
     
    206207        memset( selection, 0, sizeof( LuRectangle ) * totalpages );
    207208
    208         enableAsynchDraw = doc->isAsynchRenderingSupported( ev );
     209        drawPS = doc->isRenderIntoPS( ev );
     210        if ( drawPS ) {
     211            enableAsynchDraw = false;
     212        }
     213        else {
     214            enableAsynchDraw = doc->isAsynchRenderingSupported( ev );
     215        }
    209216        goToPage( 0 );
    210217
     
    971978            LONG rcly = rclDraw.yTop - rclDraw.yBottom;
    972979
    973             pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
    974             POINTL aptlPoints[4]={ rclDraw.xLeft, rclDraw.yBottom,
    975                                    rclDraw.xRight-1, rclDraw.yTop-1,
    976                                    0, 0, rclx, rcly };
    977 
    978             doc->renderPageToPixbuf( ev, currentpage, spos_x, spos_y,
    979                                      rclx, rcly, realzoom, rotation, pixbuf );
    980             LONG lRop = ROP_SRCCOPY;
    981             BITMAPINFO2 pbmi;
    982             pbmi.cbFix = 16L;
    983             pbmi.cx = rclx;
    984             pbmi.cy = rcly;
    985             pbmi.cPlanes = 1;
    986             pbmi.cBitCount = bpp * 8;
    987             GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
    988                          aptlPoints, lRop, BBO_IGNORE );
     980            if ( drawPS )
     981            {
     982                doc->renderPageToPS( ev, currentpage, spos_x, spos_y, rclx, rcly,
     983                                     realzoom, rotation, hpsBuffer, &rclDraw );
     984            }
     985            else
     986            {
     987                pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
     988                POINTL aptlPoints[4]={ rclDraw.xLeft, rclDraw.yBottom,
     989                                       rclDraw.xRight-1, rclDraw.yTop-1,
     990                                       0, 0, rclx, rcly };
     991
     992                doc->renderPageToPixbuf( ev, currentpage, spos_x, spos_y,
     993                                         rclx, rcly, realzoom, rotation, pixbuf );
     994                LONG lRop = ROP_SRCCOPY;
     995                BITMAPINFO2 pbmi;
     996                pbmi.cbFix = 16L;
     997                pbmi.cx = rclx;
     998                pbmi.cy = rcly;
     999                pbmi.cPlanes = 1;
     1000                pbmi.cBitCount = bpp * 8;
     1001                GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
     1002                             aptlPoints, lRop, BBO_IGNORE );
     1003                delete pixbuf;
     1004                pixbuf = NULL;
     1005            }
    9891006
    9901007            drawSelection( currentpage, hpsBuffer, &rclDraw );
     
    9921009
    9931010            BlitGraphicsBuffer( hps, hpsBuffer, &rcl );
    994             delete pixbuf;
    995             pixbuf = NULL;
    9961011        }
    9971012    }
     
    11211136            LONG rcly = pda->drawrect.yTop - pda->drawrect.yBottom;
    11221137
    1123             pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
    1124             POINTL aptlPoints[4]={ pda->drawrect.xLeft, pda->drawrect.yBottom,
    1125                                    pda->drawrect.xRight-1, pda->drawrect.yTop-1,
    1126                                    0, 0, rclx, rcly };
    1127 
    1128             doc->renderPageToPixbuf( ev, pda->pagenum, spos_x, spos_y,
    1129                                      rclx, rcly, realzoom, rotation, pixbuf );
    1130             LONG lRop = ROP_SRCCOPY;
    1131             BITMAPINFO2 pbmi;
    1132             pbmi.cbFix = 16L;
    1133             pbmi.cx = rclx;
    1134             pbmi.cy = rcly;
    1135             pbmi.cPlanes = 1;
    1136             pbmi.cBitCount = bpp * 8;
    1137             GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
    1138                          aptlPoints, lRop, BBO_IGNORE );
     1138            if ( drawPS )
     1139            {
     1140                doc->renderPageToPS( ev, pda->pagenum, spos_x, spos_y, rclx, rcly,
     1141                                     realzoom, rotation, hpsBuffer, &(pda->drawrect) );
     1142            }
     1143            else
     1144            {
     1145                pixbuf = new LuPixbuf( ev, rclx, rcly, bpp );
     1146                POINTL aptlPoints[4]={ pda->drawrect.xLeft, pda->drawrect.yBottom,
     1147                                       pda->drawrect.xRight-1, pda->drawrect.yTop-1,
     1148                                       0, 0, rclx, rcly };
     1149                doc->renderPageToPixbuf( ev, pda->pagenum, spos_x, spos_y,
     1150                                         rclx, rcly, realzoom, rotation, pixbuf );
     1151                LONG lRop = ROP_SRCCOPY;
     1152                BITMAPINFO2 pbmi;
     1153                pbmi.cbFix = 16L;
     1154                pbmi.cx = rclx;
     1155                pbmi.cy = rcly;
     1156                pbmi.cPlanes = 1;
     1157                pbmi.cBitCount = bpp * 8;
     1158                GpiDrawBits( hpsBuffer, pixbuf->getDataPtr( ev ), &pbmi, 4L,
     1159                             aptlPoints, lRop, BBO_IGNORE );
     1160                delete pixbuf;
     1161                pixbuf = NULL;
     1162            }
    11391163
    11401164            drawSelection( pda->pagenum, hpsBuffer, &pda->drawrect );
    11411165            drawFound( pda->pagenum, hpsBuffer, &pda->drawrect );
    1142 
    1143             delete pixbuf;
    1144             pixbuf = NULL;
    11451166        }
    11461167        delete drawareas;
  • trunk/Lucide/SOURCE/gui/docViewer.h

    r59 r61  
    153153        int drawareaIndex;
    154154        bool closed;
     155        bool drawPS;
    155156
    156157        // continuous view
  • trunk/Lucide/SOURCE/gui/makefile

    r59 r61  
    6868lib ..\plugins\ludoc\ludoc
    6969lib somtk
     70import _LuDocumentClassData ludoc.LuDocumentClassData
     71import _LuPixbufClassData ludoc.LuPixbufClassData
     72import _LuIndexNodeClassData ludoc.LuIndexNodeClassData
     73
    7074| tmpmake.lnk >NUL
    7175    wlink @tmpmake.lnk
  • trunk/Lucide/SOURCE/gui/progressDlg.cpp

    r50 r61  
    142142            WinStartTimer( hBarHab, hBar, TID_PAINT, 1 );
    143143           
    144             _beginthread( _this->threadFn, NULL, 65536, _this->threadData );
     144            _beginthread( _this->threadFn, NULL, 262144, _this->threadData );
    145145
    146146            return (MRESULT)FALSE;
  • trunk/Lucide/SOURCE/plugins/ludjvu/ludjvu.xh

    r27 r61  
    110110                somToken fndata);
    111111typedef somTP_LuDjvuDocument_renderPageToPixbufAsynch *somTD_LuDjvuDocument_renderPageToPixbufAsynch;
     112typedef boolean   SOMLINK somTP_LuDjvuDocument_isRenderIntoPS(LuDjvuDocument *somSelf, Environment *ev);
     113typedef somTP_LuDjvuDocument_isRenderIntoPS *somTD_LuDjvuDocument_isRenderIntoPS;
     114typedef void   SOMLINK somTP_LuDjvuDocument_renderPageToPS(LuDjvuDocument *somSelf, Environment *ev,
     115                long pagenum,
     116                long src_x,
     117                long src_y,
     118                long src_width,
     119                long src_height,
     120                double scale,
     121                long rotation,
     122                unsigned long hps,
     123                somMToken rect);
     124typedef somTP_LuDjvuDocument_renderPageToPS *somTD_LuDjvuDocument_renderPageToPS;
    112125typedef boolean   SOMLINK somTP_LuDjvuDocument_isHaveText(LuDjvuDocument *somSelf, Environment *ev);
    113126typedef somTP_LuDjvuDocument_isHaveText *somTD_LuDjvuDocument_isHaveText;
    114127typedef LuDocument_LuRectSequence*   SOMLINK somTP_LuDjvuDocument_getSelectionRectangles(LuDjvuDocument *somSelf, Environment *ev,
    115128                long pagenum,
    116                 double scale,
    117129                LuRectangle* selection);
    118130typedef somTP_LuDjvuDocument_getSelectionRectangles *somTD_LuDjvuDocument_getSelectionRectangles;
     
    137149                string filename);
    138150typedef somTP_LuDjvuDocument_saveAs *somTD_LuDjvuDocument_saveAs;
    139 typedef boolean   SOMLINK somTP_LuDjvuDocument_isPSExportable(LuDjvuDocument *somSelf, Environment *ev);
    140 typedef somTP_LuDjvuDocument_isPSExportable *somTD_LuDjvuDocument_isPSExportable;
    141 typedef void   SOMLINK somTP_LuDjvuDocument_exportToPS(LuDjvuDocument *somSelf, Environment *ev,
     151typedef boolean   SOMLINK somTP_LuDjvuDocument_isPostScriptExportable(LuDjvuDocument *somSelf, Environment *ev);
     152typedef somTP_LuDjvuDocument_isPostScriptExportable *somTD_LuDjvuDocument_isPostScriptExportable;
     153typedef void   SOMLINK somTP_LuDjvuDocument_exportToPostScript(LuDjvuDocument *somSelf, Environment *ev,
    142154                string filename,
    143155                long first_page,
     
    146158                double height,
    147159                boolean duplex);
    148 typedef somTP_LuDjvuDocument_exportToPS *somTD_LuDjvuDocument_exportToPS;
     160typedef somTP_LuDjvuDocument_exportToPostScript *somTD_LuDjvuDocument_exportToPostScript;
    149161typedef boolean   SOMLINK somTP_LuDjvuDocument_isHaveFontInfo(LuDjvuDocument *somSelf, Environment *ev);
    150162typedef somTP_LuDjvuDocument_isHaveFontInfo *somTD_LuDjvuDocument_isHaveFontInfo;
     
    461473
    462474
     475/* method: isRenderIntoPS */
     476boolean   isRenderIntoPS(Environment *ev)
     477{
     478   return SOM_ResolveD(this,LuDjvuDocument,LuDocument,isRenderIntoPS)
     479        (this, ev);
     480}
     481
     482
     483/* method: renderPageToPS */
     484void   renderPageToPS(Environment *ev,
     485                long pagenum,
     486                long src_x,
     487                long src_y,
     488                long src_width,
     489                long src_height,
     490                double scale,
     491                long rotation,
     492                unsigned long hps,
     493                somMToken rect)
     494{
     495   SOM_ResolveD(this,LuDjvuDocument,LuDocument,renderPageToPS)
     496        (this, ev,pagenum,src_x,src_y,src_width,src_height,scale,rotation,hps,rect);
     497}
     498
     499
    463500/* method: isHaveText */
    464501boolean   isHaveText(Environment *ev)
     
    472509LuDocument_LuRectSequence*   getSelectionRectangles(Environment *ev,
    473510                long pagenum,
    474                 double scale,
    475511                LuRectangle* selection)
    476512{
    477513   return SOM_ResolveD(this,LuDjvuDocument,LuDocument,getSelectionRectangles)
    478         (this, ev,pagenum,scale,selection);
     514        (this, ev,pagenum,selection);
    479515}
    480516
     
    542578
    543579
    544 /* method: isPSExportable */
    545 boolean   isPSExportable(Environment *ev)
    546 {
    547    return SOM_ResolveD(this,LuDjvuDocument,LuDocument,isPSExportable)
    548         (this, ev);
    549 }
    550 
    551 
    552 /* method: exportToPS */
    553 void   exportToPS(Environment *ev,
     580/* method: isPostScriptExportable */
     581boolean   isPostScriptExportable(Environment *ev)
     582{
     583   return SOM_ResolveD(this,LuDjvuDocument,LuDocument,isPostScriptExportable)
     584        (this, ev);
     585}
     586
     587
     588/* method: exportToPostScript */
     589void   exportToPostScript(Environment *ev,
    554590                string filename,
    555591                long first_page,
     
    559595                boolean duplex)
    560596{
    561    SOM_ResolveD(this,LuDjvuDocument,LuDocument,exportToPS)
     597   SOM_ResolveD(this,LuDjvuDocument,LuDocument,exportToPostScript)
    562598        (this, ev,filename,first_page,last_page,width,height,duplex);
    563599}
  • trunk/Lucide/SOURCE/plugins/ludjvu/ludjvu.xih

    r27 r61  
    8686  #define _isAsynchRenderingSupported somSelf->isAsynchRenderingSupported
    8787  #define _renderPageToPixbufAsynch somSelf->renderPageToPixbufAsynch
     88  #define _isRenderIntoPS somSelf->isRenderIntoPS
     89  #define _renderPageToPS somSelf->renderPageToPS
    8890  #define _isHaveText somSelf->isHaveText
    8991  #define _getSelectionRectangles somSelf->getSelectionRectangles
     
    9597  #define _isSaveable somSelf->isSaveable
    9698  #define _saveAs somSelf->saveAs
    97   #define _isPSExportable somSelf->isPSExportable
    98   #define _exportToPS somSelf->exportToPS
     99  #define _isPostScriptExportable somSelf->isPostScriptExportable
     100  #define _exportToPostScript somSelf->exportToPostScript
    99101  #define _isHaveFontInfo somSelf->isHaveFontInfo
    100102  #define _getFontInfo somSelf->getFontInfo
  • trunk/Lucide/SOURCE/plugins/ludjvu/makefile

    r17 r61  
    3232lib ..\ludoc\ludoc
    3333lib somtk
     34import _LuPixbufClassData ludoc.LuPixbufClassData
     35import _LuIndexNodeClassData ludoc.LuIndexNodeClassData
     36import _LuDocumentClassData ludoc.LuDocumentClassData
     37import _LuDocumentCClassData ludoc.LuDocumentCClassData
    3438export LuDjvuDocumentNewClass
    35 export _LuDjvuDocumentClassData
    36 export _LuDjvuDocumentCClassData
     39export LuDjvuDocumentClassData=_LuDjvuDocumentClassData
     40export LuDjvuDocumentCClassData=_LuDjvuDocumentCClassData
    3741export createObject
    3842export getSupportedExtensions
  • trunk/Lucide/SOURCE/plugins/ludoc/ludoc.cpp

    r59 r61  
     1
     2/*
     3 *  This file was generated by the SOM Compiler.
     4 *  Generated using:
     5 *     SOM incremental update: 2.24
     6 */
     7
    18/* ***** BEGIN LICENSE BLOCK *****
    29 * Version: CDDL 1.0/LGPL 2.1
     
    3239 * ***** END LICENSE BLOCK ***** */
    3340
    34 
    35 
    36 /*
    37  *  This file was generated by the SOM Compiler.
    38  *  Generated using:
    39  *     SOM incremental update: 2.24
    40  */
    4141
    4242
     
    156156    // Abstract method does nothing
    157157}
     158
     159
     160SOM_Scope boolean  SOMLINK isRenderIntoPS(LuDocument *somSelf,
     161                                           Environment *ev)
     162{
     163    return FALSE;
     164}
     165
     166SOM_Scope void  SOMLINK renderPageToPS(LuDocument *somSelf,  Environment *ev,
     167                                       long pagenum, long src_x,
     168                                       long src_y, long src_width,
     169                                       long src_height, double scale,
     170                                       long rotation, unsigned long hps,
     171                                       somMToken rect)
     172{
     173    // Abstract method does nothing
     174}
     175
    158176
    159177SOM_Scope boolean  SOMLINK isHaveText(LuDocument *somSelf,
     
    253271
    254272
    255 SOM_Scope boolean  SOMLINK isPSExportable(LuDocument *somSelf,
     273SOM_Scope boolean  SOMLINK isPostScriptExportable(LuDocument *somSelf,
    256274                                           Environment *ev)
    257275{
     
    260278
    261279
    262 SOM_Scope void  SOMLINK exportToPS(LuDocument *somSelf,  Environment *ev,
     280SOM_Scope void  SOMLINK exportToPostScript(LuDocument *somSelf, 
     281                                   Environment *ev,
    263282                                   string filename, long first_page,
    264283                                   long last_page, double width,
  • trunk/Lucide/SOURCE/plugins/ludoc/ludoc.idl

    r59 r61  
    136136
    137137    /**
     138     * isRenderIntoPS
     139     *
     140     * See renderPageToPS()
     141     *
     142     * Return value: TRUE if document will render directly into
     143     *               presentation space.
     144     **/
     145    boolean isRenderIntoPS();
     146   
     147   
     148    /**
     149     * renderPageToPS
     150     * pagenum: the page to render from
     151     * src_x: x coordinate of upper left corner
     152     * src_y: y coordinate of upper left corner
     153     * src_width: width of rectangle to render
     154     * src_height: height of rectangle to render
     155     * scale: scale specified as pixels per point
     156     *        (if isScalable() is FALSE, scale ignored and assumed 1.0)
     157     * rotation: rotate the document by the specified degree
     158     *        (if isRotable() is FALSE, rotation ignored and assumed 0)
     159     * hps: handle of presentation space to render into
     160     * rect: pointer to RECTL structure, defines render area on HPS
     161     *
     162     * First scale the document to match the specified pixels per point,
     163     * then render the rectangle given by the upper left corner at
     164     * (src_x, src_y) and src_width and src_height.
     165     **/
     166    void renderPageToPS( in long pagenum, in long src_x, in long src_y,
     167                   in long src_width, in long src_height,
     168                   in double scale, in long rotation,
     169                   in unsigned long hps, in somMToken rect );
     170
     171
     172    /**
    138173     * isHaveText
    139174     *
     
    251286
    252287    /**
    253      * isPSExportable
     288     * isPostScriptExportable
    254289     *
    255290     * Return value: TRUE if document can be exported to
    256291     *               PostScript, FALSE otherwise.
    257292     **/
    258     boolean isPSExportable();
    259 
    260 
    261     /**
    262      * exportToPS
     293    boolean isPostScriptExportable();
     294
     295
     296    /**
     297     * exportToPostScript
    263298     * filename: the path of the output filename
    264299     * first_page: the first page to print
     
    274309     * Create a new postscript file and render document to.
    275310     **/
    276     void exportToPS( in string filename, in long first_page, in long last_page,
     311    void exportToPostScript( in string filename,
     312                     in long first_page, in long last_page,
    277313                     in double width, in double height, in boolean duplex );
    278314
     
    430466                      getPageCount, getPageSize, renderPageToPixbuf,
    431467                      isAsynchRenderingSupported, renderPageToPixbufAsynch,
     468                      isRenderIntoPS, renderPageToPS,
    432469                      isHaveText, getSelectionRectangles, freeRectangles,
    433470                      getText, isHaveLinks, getLinkMapping, freeLinkMapping,
    434                       isSaveable, saveAs, isPSExportable, exportToPS,
     471                      isSaveable, saveAs,
     472                      isPostScriptExportable, exportToPostScript,
    435473                      isHaveFontInfo, getFontInfo, freeFontInfo,
    436474                      isHaveIndex, getIndex, getDocumentInfo,
  • trunk/Lucide/SOURCE/plugins/ludoc/ludoc.xh

    r59 r61  
    151151        somMToken isAsynchRenderingSupported;
    152152        somMToken renderPageToPixbufAsynch;
     153        somMToken isRenderIntoPS;
     154        somMToken renderPageToPS;
    153155        somMToken isHaveText;
    154156        somMToken getSelectionRectangles;
     
    160162        somMToken isSaveable;
    161163        somMToken saveAs;
    162         somMToken isPSExportable;
    163         somMToken exportToPS;
     164        somMToken isPostScriptExportable;
     165        somMToken exportToPostScript;
    164166        somMToken isHaveFontInfo;
    165167        somMToken getFontInfo;
     
    228230                somToken fndata);
    229231typedef somTP_LuDocument_renderPageToPixbufAsynch *somTD_LuDocument_renderPageToPixbufAsynch;
     232typedef boolean   SOMLINK somTP_LuDocument_isRenderIntoPS(LuDocument *somSelf, Environment *ev);
     233typedef somTP_LuDocument_isRenderIntoPS *somTD_LuDocument_isRenderIntoPS;
     234typedef void   SOMLINK somTP_LuDocument_renderPageToPS(LuDocument *somSelf, Environment *ev,
     235                long pagenum,
     236                long src_x,
     237                long src_y,
     238                long src_width,
     239                long src_height,
     240                double scale,
     241                long rotation,
     242                unsigned long hps,
     243                somMToken rect);
     244typedef somTP_LuDocument_renderPageToPS *somTD_LuDocument_renderPageToPS;
    230245typedef boolean   SOMLINK somTP_LuDocument_isHaveText(LuDocument *somSelf, Environment *ev);
    231246typedef somTP_LuDocument_isHaveText *somTD_LuDocument_isHaveText;
     
    254269                string filename);
    255270typedef somTP_LuDocument_saveAs *somTD_LuDocument_saveAs;
    256 typedef boolean   SOMLINK somTP_LuDocument_isPSExportable(LuDocument *somSelf, Environment *ev);
    257 typedef somTP_LuDocument_isPSExportable *somTD_LuDocument_isPSExportable;
    258 typedef void   SOMLINK somTP_LuDocument_exportToPS(LuDocument *somSelf, Environment *ev,
     271typedef boolean   SOMLINK somTP_LuDocument_isPostScriptExportable(LuDocument *somSelf, Environment *ev);
     272typedef somTP_LuDocument_isPostScriptExportable *somTD_LuDocument_isPostScriptExportable;
     273typedef void   SOMLINK somTP_LuDocument_exportToPostScript(LuDocument *somSelf, Environment *ev,
    259274                string filename,
    260275                long first_page,
     
    263278                double height,
    264279                boolean duplex);
    265 typedef somTP_LuDocument_exportToPS *somTD_LuDocument_exportToPS;
     280typedef somTP_LuDocument_exportToPostScript *somTD_LuDocument_exportToPostScript;
    266281typedef boolean   SOMLINK somTP_LuDocument_isHaveFontInfo(LuDocument *somSelf, Environment *ev);
    267282typedef somTP_LuDocument_isHaveFontInfo *somTD_LuDocument_isHaveFontInfo;
     
    578593
    579594
     595/* method: isRenderIntoPS */
     596boolean   isRenderIntoPS(Environment *ev)
     597{
     598   return SOM_ResolveD(this,LuDocument,LuDocument,isRenderIntoPS)
     599        (this, ev);
     600}
     601
     602
     603/* method: renderPageToPS */
     604void   renderPageToPS(Environment *ev,
     605                long pagenum,
     606                long src_x,
     607                long src_y,
     608                long src_width,
     609                long src_height,
     610                double scale,
     611                long rotation,
     612                unsigned long hps,
     613                somMToken rect)
     614{
     615   SOM_ResolveD(this,LuDocument,LuDocument,renderPageToPS)
     616        (this, ev,pagenum,src_x,src_y,src_width,src_height,scale,rotation,hps,rect);
     617}
     618
     619
    580620/* method: isHaveText */
    581621boolean   isHaveText(Environment *ev)
     
    658698
    659699
    660 /* method: isPSExportable */
    661 boolean   isPSExportable(Environment *ev)
    662 {
    663    return SOM_ResolveD(this,LuDocument,LuDocument,isPSExportable)
    664         (this, ev);
    665 }
    666 
    667 
    668 /* method: exportToPS */
    669 void   exportToPS(Environment *ev,
     700/* method: isPostScriptExportable */
     701boolean   isPostScriptExportable(Environment *ev)
     702{
     703   return SOM_ResolveD(this,LuDocument,LuDocument,isPostScriptExportable)
     704        (this, ev);
     705}
     706
     707
     708/* method: exportToPostScript */
     709void   exportToPostScript(Environment *ev,
    670710                string filename,
    671711                long first_page,
     
    675715                boolean duplex)
    676716{
    677    SOM_ResolveD(this,LuDocument,LuDocument,exportToPS)
     717   SOM_ResolveD(this,LuDocument,LuDocument,exportToPostScript)
    678718        (this, ev,filename,first_page,last_page,width,height,duplex);
    679719}
  • trunk/Lucide/SOURCE/plugins/ludoc/ludoc.xih

    r59 r61  
    3232#endif
    3333
    34 #define LuDocument_MaxNoMethods 30
     34#define LuDocument_MaxNoMethods 32
    3535
    3636/*
     
    9898  #define _isAsynchRenderingSupported somSelf->isAsynchRenderingSupported
    9999  #define _renderPageToPixbufAsynch somSelf->renderPageToPixbufAsynch
     100  #define _isRenderIntoPS somSelf->isRenderIntoPS
     101  #define _renderPageToPS somSelf->renderPageToPS
    100102  #define _isHaveText somSelf->isHaveText
    101103  #define _getSelectionRectangles somSelf->getSelectionRectangles
     
    107109  #define _isSaveable somSelf->isSaveable
    108110  #define _saveAs somSelf->saveAs
    109   #define _isPSExportable somSelf->isPSExportable
    110   #define _exportToPS somSelf->exportToPS
     111  #define _isPostScriptExportable somSelf->isPostScriptExportable
     112  #define _exportToPostScript somSelf->exportToPostScript
    111113  #define _isHaveFontInfo somSelf->isHaveFontInfo
    112114  #define _getFontInfo somSelf->getFontInfo
     
    334336
    335337/*
     338 * New Method: isRenderIntoPS
     339 */
     340SOM_Scope boolean  SOMLINK isRenderIntoPS(LuDocument *somSelf, Environment *ev);
     341#ifndef somMN_isRenderIntoPS_defined
     342#define somMN_isRenderIntoPS_defined
     343static char *somMN_isRenderIntoPS = "isRenderIntoPS";
     344static somId somId_isRenderIntoPS = &somMN_isRenderIntoPS;
     345#endif  /* somMN_isRenderIntoPS_defined */
     346#ifndef somDS_isRenderIntoPS_defined
     347#define somDS_isRenderIntoPS_defined
     348static char *somDS_isRenderIntoPS = "::LuDocument::isRenderIntoPS";
     349static somId somDI_isRenderIntoPS = &somDS_isRenderIntoPS;
     350#endif  /* somDS_isRenderIntoPS_defined */
     351
     352static somMethodInfo isRenderIntoPSMethodInfo = {10, 8, 0};
     353
     354static somApRdInfo isRenderIntoPSStubs = {0, 0, &isRenderIntoPSMethodInfo};
     355
     356/*
     357 * New Method: renderPageToPS
     358 */
     359SOM_Scope void  SOMLINK renderPageToPS(LuDocument *somSelf, Environment *ev,
     360                long pagenum,
     361                long src_x,
     362                long src_y,
     363                long src_width,
     364                long src_height,
     365                double scale,
     366                long rotation,
     367                unsigned long hps,
     368                somMToken rect);
     369#ifndef somMN_renderPageToPS_defined
     370#define somMN_renderPageToPS_defined
     371static char *somMN_renderPageToPS = "renderPageToPS";
     372static somId somId_renderPageToPS = &somMN_renderPageToPS;
     373#endif  /* somMN_renderPageToPS_defined */
     374#ifndef somDS_renderPageToPS_defined
     375#define somDS_renderPageToPS_defined
     376static char *somDS_renderPageToPS = "::LuDocument::renderPageToPS";
     377static somId somDI_renderPageToPS = &somDS_renderPageToPS;
     378#endif  /* somDS_renderPageToPS_defined */
     379
     380static somFloatMap renderPageToPSFloatMap = {
     38130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
     382
     383static somMethodInfo renderPageToPSMethodInfo = {1, 48, &renderPageToPSFloatMap};
     384
     385static somApRdInfo renderPageToPSStubs = {0, 0, &renderPageToPSMethodInfo};
     386
     387/*
    336388 * New Method: isHaveText
    337389 */
     
    476528
    477529/*
    478  * New Method: isPSExportable
    479  */
    480 SOM_Scope boolean  SOMLINK isPSExportable(LuDocument *somSelf, Environment *ev);
    481 #ifndef somMN_isPSExportable_defined
    482 #define somMN_isPSExportable_defined
    483 static char *somMN_isPSExportable = "isPSExportable";
    484 static somId somId_isPSExportable = &somMN_isPSExportable;
    485 #endif  /* somMN_isPSExportable_defined */
    486 #ifndef somDS_isPSExportable_defined
    487 #define somDS_isPSExportable_defined
    488 static char *somDS_isPSExportable = "::LuDocument::isPSExportable";
    489 static somId somDI_isPSExportable = &somDS_isPSExportable;
    490 #endif  /* somDS_isPSExportable_defined */
    491 
    492 static somMethodInfo isPSExportableMethodInfo = {10, 8, 0};
    493 
    494 static somApRdInfo isPSExportableStubs = {0, 0, &isPSExportableMethodInfo};
    495 
    496 /*
    497  * New Method: exportToPS
    498  */
    499 SOM_Scope void  SOMLINK exportToPS(LuDocument *somSelf, Environment *ev,
     530 * New Method: isPostScriptExportable
     531 */
     532SOM_Scope boolean  SOMLINK isPostScriptExportable(LuDocument *somSelf, Environment *ev);
     533#ifndef somMN_isPostScriptExportable_defined
     534#define somMN_isPostScriptExportable_defined
     535static char *somMN_isPostScriptExportable = "isPostScriptExportable";
     536static somId somId_isPostScriptExportable = &somMN_isPostScriptExportable;
     537#endif  /* somMN_isPostScriptExportable_defined */
     538#ifndef somDS_isPostScriptExportable_defined
     539#define somDS_isPostScriptExportable_defined
     540static char *somDS_isPostScriptExportable = "::LuDocument::isPostScriptExportable";
     541static somId somDI_isPostScriptExportable = &somDS_isPostScriptExportable;
     542#endif  /* somDS_isPostScriptExportable_defined */
     543
     544static somMethodInfo isPostScriptExportableMethodInfo = {10, 8, 0};
     545
     546static somApRdInfo isPostScriptExportableStubs = {0, 0, &isPostScriptExportableMethodInfo};
     547
     548/*
     549 * New Method: exportToPostScript
     550 */
     551SOM_Scope void  SOMLINK exportToPostScript(LuDocument *somSelf, Environment *ev,
    500552                string filename,
    501553                long first_page,
     
    504556                double height,
    505557                boolean duplex);
    506 #ifndef somMN_exportToPS_defined
    507 #define somMN_exportToPS_defined
    508 static char *somMN_exportToPS = "exportToPS";
    509 static somId somId_exportToPS = &somMN_exportToPS;
    510 #endif  /* somMN_exportToPS_defined */
    511 #ifndef somDS_exportToPS_defined
    512 #define somDS_exportToPS_defined
    513 static char *somDS_exportToPS = "::LuDocument::exportToPS";
    514 static somId somDI_exportToPS = &somDS_exportToPS;
    515 #endif  /* somDS_exportToPS_defined */
    516 
    517 static somFloatMap exportToPSFloatMap = {
     558#ifndef somMN_exportToPostScript_defined
     559#define somMN_exportToPostScript_defined
     560static char *somMN_exportToPostScript = "exportToPostScript";
     561static somId somId_exportToPostScript = &somMN_exportToPostScript;
     562#endif  /* somMN_exportToPostScript_defined */
     563#ifndef somDS_exportToPostScript_defined
     564#define somDS_exportToPostScript_defined
     565static char *somDS_exportToPostScript = "::LuDocument::exportToPostScript";
     566static somId somDI_exportToPostScript = &somDS_exportToPostScript;
     567#endif  /* somDS_exportToPostScript_defined */
     568
     569static somFloatMap exportToPostScriptFloatMap = {
    51857020, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
    519571
    520 static somMethodInfo exportToPSMethodInfo = {1, 40, &exportToPSFloatMap};
    521 
    522 static somApRdInfo exportToPSStubs = {0, 0, &exportToPSMethodInfo};
     572static somMethodInfo exportToPostScriptMethodInfo = {1, 40, &exportToPostScriptFloatMap};
     573
     574static somApRdInfo exportToPostScriptStubs = {0, 0, &exportToPostScriptMethodInfo};
    523575
    524576/*
     
    792844         (somMethodProc *) ((void*) &renderPageToPixbufAsynchStubs) },
    793845#endif
     846    {    &LuDocumentClassData.isRenderIntoPS,
     847         &somId_isRenderIntoPS,
     848         &somDI_isRenderIntoPS,
     849         (somMethodProc *) isRenderIntoPS,
     850         (somMethodProc *)((void*)-1),
     851#ifdef isRenderIntoPS_somApRdDefault
     852         0},
     853#else
     854         (somMethodProc *) ((void*) &isRenderIntoPSStubs) },
     855#endif
     856    {    &LuDocumentClassData.renderPageToPS,
     857         &somId_renderPageToPS,
     858         &somDI_renderPageToPS,
     859         (somMethodProc *) renderPageToPS,
     860         (somMethodProc *)((void*)-1),
     861#ifdef renderPageToPS_somApRdDefault
     862         0},
     863#else
     864         (somMethodProc *) ((void*) &renderPageToPSStubs) },
     865#endif
    794866    {    &LuDocumentClassData.isHaveText,
    795867         &somId_isHaveText,
     
    862934         (somMethodProc *) ((void*) &saveAsStubs) },
    863935#endif
    864     {    &LuDocumentClassData.isPSExportable,
    865          &somId_isPSExportable,
    866          &somDI_isPSExportable,
    867          (somMethodProc *) isPSExportable,
    868          (somMethodProc *)((void*)-1),
    869 #ifdef isPSExportable_somApRdDefault
    870          0},
    871 #else
    872          (somMethodProc *) ((void*) &isPSExportableStubs) },
    873 #endif
    874     {    &LuDocumentClassData.exportToPS,
    875          &somId_exportToPS,
    876          &somDI_exportToPS,
    877          (somMethodProc *) exportToPS,
    878          (somMethodProc *)((void*)-1),
    879 #ifdef exportToPS_somApRdDefault
    880          0},
    881 #else
    882          (somMethodProc *) ((void*) &exportToPSStubs) },
     936    {    &LuDocumentClassData.isPostScriptExportable,
     937         &somId_isPostScriptExportable,
     938         &somDI_isPostScriptExportable,
     939         (somMethodProc *) isPostScriptExportable,
     940         (somMethodProc *)((void*)-1),
     941#ifdef isPostScriptExportable_somApRdDefault
     942         0},
     943#else
     944         (somMethodProc *) ((void*) &isPostScriptExportableStubs) },
     945#endif
     946    {    &LuDocumentClassData.exportToPostScript,
     947         &somId_exportToPostScript,
     948         &somDI_exportToPostScript,
     949         (somMethodProc *) exportToPostScript,
     950         (somMethodProc *)((void*)-1),
     951#ifdef exportToPostScript_somApRdDefault
     952         0},
     953#else
     954         (somMethodProc *) ((void*) &exportToPostScriptStubs) },
    883955#endif
    884956    {    &LuDocumentClassData.isHaveFontInfo,
     
    9951067
    9961068static somStaticClassInfo LuDocumentSCI = {
    997     4, 26, 1, 0, 4, 0, /* layout version 4 */
     1069    4, 28, 1, 0, 4, 0, /* layout version 4 */
    9981070    LuDocument_MajorVersion, LuDocument_MinorVersion,
    9991071    0, LuDocument_MaxNoMethods, 1,
     
    10181090    0, /* number of SelectInheritedMethods */
    10191091    0, /* no SelectInheritedMethods */
    1020     30, /* number of classdata entries */
     1092    32, /* number of classdata entries */
    10211093    0, /* no list provided currently */
    10221094    0, /* number of migrated methods */
  • trunk/Lucide/SOURCE/plugins/ludoc/makefile

    r17 r61  
    3434lib libconv
    3535export LuDocumentNewClass
    36 export _LuDocumentClassData
    37 export _LuDocumentCClassData
     36export LuDocumentClassData=_LuDocumentClassData
     37export LuDocumentCClassData=_LuDocumentCClassData
    3838export LuPixbufNewClass
    39 export _LuPixbufClassData
    40 export _LuPixbufCClassData
     39export LuPixbufClassData=_LuPixbufClassData
     40export LuPixbufCClassData=_LuPixbufCClassData
    4141export LuIndexNodeNewClass
    42 export _LuIndexNodeClassData
    43 export _LuIndexNodeCClassData
     42export LuIndexNodeClassData=_LuIndexNodeClassData
     43export LuIndexNodeCClassData=_LuIndexNodeCClassData
    4444export createObject
    4545export getSupportedExtensions
  • trunk/Lucide/SOURCE/plugins/lujpeg/lujpeg.xh

    r27 r61  
    110110                somToken fndata);
    111111typedef somTP_LuJpegDocument_renderPageToPixbufAsynch *somTD_LuJpegDocument_renderPageToPixbufAsynch;
     112typedef boolean   SOMLINK somTP_LuJpegDocument_isRenderIntoPS(LuJpegDocument *somSelf, Environment *ev);
     113typedef somTP_LuJpegDocument_isRenderIntoPS *somTD_LuJpegDocument_isRenderIntoPS;
     114typedef void   SOMLINK somTP_LuJpegDocument_renderPageToPS(LuJpegDocument *somSelf, Environment *ev,
     115                long pagenum,
     116                long src_x,
     117                long src_y,
     118                long src_width,
     119                long src_height,
     120                double scale,
     121                long rotation,
     122                unsigned long hps,
     123                somMToken rect);
     124typedef somTP_LuJpegDocument_renderPageToPS *somTD_LuJpegDocument_renderPageToPS;
    112125typedef boolean   SOMLINK somTP_LuJpegDocument_isHaveText(LuJpegDocument *somSelf, Environment *ev);
    113126typedef somTP_LuJpegDocument_isHaveText *somTD_LuJpegDocument_isHaveText;
    114127typedef LuDocument_LuRectSequence*   SOMLINK somTP_LuJpegDocument_getSelectionRectangles(LuJpegDocument *somSelf, Environment *ev,
    115128                long pagenum,
    116                 double scale,
    117129                LuRectangle* selection);
    118130typedef somTP_LuJpegDocument_getSelectionRectangles *somTD_LuJpegDocument_getSelectionRectangles;
     
    137149                string filename);
    138150typedef somTP_LuJpegDocument_saveAs *somTD_LuJpegDocument_saveAs;
    139 typedef boolean   SOMLINK somTP_LuJpegDocument_isPSExportable(LuJpegDocument *somSelf, Environment *ev);
    140 typedef somTP_LuJpegDocument_isPSExportable *somTD_LuJpegDocument_isPSExportable;
    141 typedef void   SOMLINK somTP_LuJpegDocument_exportToPS(LuJpegDocument *somSelf, Environment *ev,
     151typedef boolean   SOMLINK somTP_LuJpegDocument_isPostScriptExportable(LuJpegDocument *somSelf, Environment *ev);
     152typedef somTP_LuJpegDocument_isPostScriptExportable *somTD_LuJpegDocument_isPostScriptExportable;
     153typedef void   SOMLINK somTP_LuJpegDocument_exportToPostScript(LuJpegDocument *somSelf, Environment *ev,
    142154                string filename,
    143155                long first_page,
     
    146158                double height,
    147159                boolean duplex);
    148 typedef somTP_LuJpegDocument_exportToPS *somTD_LuJpegDocument_exportToPS;
     160typedef somTP_LuJpegDocument_exportToPostScript *somTD_LuJpegDocument_exportToPostScript;
    149161typedef boolean   SOMLINK somTP_LuJpegDocument_isHaveFontInfo(LuJpegDocument *somSelf, Environment *ev);
    150162typedef somTP_LuJpegDocument_isHaveFontInfo *somTD_LuJpegDocument_isHaveFontInfo;
     
    461473
    462474
     475/* method: isRenderIntoPS */
     476boolean   isRenderIntoPS(Environment *ev)
     477{
     478   return SOM_ResolveD(this,LuJpegDocument,LuDocument,isRenderIntoPS)
     479        (this, ev);
     480}
     481
     482
     483/* method: renderPageToPS */
     484void   renderPageToPS(Environment *ev,
     485                long pagenum,
     486                long src_x,
     487                long src_y,
     488                long src_width,
     489                long src_height,
     490                double scale,
     491                long rotation,
     492                unsigned long hps,
     493                somMToken rect)
     494{
     495   SOM_ResolveD(this,LuJpegDocument,LuDocument,renderPageToPS)
     496        (this, ev,pagenum,src_x,src_y,src_width,src_height,scale,rotation,hps,rect);
     497}
     498
     499
    463500/* method: isHaveText */
    464501boolean   isHaveText(Environment *ev)
     
    472509LuDocument_LuRectSequence*   getSelectionRectangles(Environment *ev,
    473510                long pagenum,
    474                 double scale,
    475511                LuRectangle* selection)
    476512{
    477513   return SOM_ResolveD(this,LuJpegDocument,LuDocument,getSelectionRectangles)
    478         (this, ev,pagenum,scale,selection);
     514        (this, ev,pagenum,selection);
    479515}
    480516
     
    542578
    543579
    544 /* method: isPSExportable */
    545 boolean   isPSExportable(Environment *ev)
    546 {
    547    return SOM_ResolveD(this,LuJpegDocument,LuDocument,isPSExportable)
    548         (this, ev);
    549 }
    550 
    551 
    552 /* method: exportToPS */
    553 void   exportToPS(Environment *ev,
     580/* method: isPostScriptExportable */
     581boolean   isPostScriptExportable(Environment *ev)
     582{
     583   return SOM_ResolveD(this,LuJpegDocument,LuDocument,isPostScriptExportable)
     584        (this, ev);
     585}
     586
     587
     588/* method: exportToPostScript */
     589void   exportToPostScript(Environment *ev,
    554590                string filename,
    555591                long first_page,
     
    559595                boolean duplex)
    560596{
    561    SOM_ResolveD(this,LuJpegDocument,LuDocument,exportToPS)
     597   SOM_ResolveD(this,LuJpegDocument,LuDocument,exportToPostScript)
    562598        (this, ev,filename,first_page,last_page,width,height,duplex);
    563599}
  • trunk/Lucide/SOURCE/plugins/lujpeg/lujpeg.xih

    r27 r61  
    8686  #define _isAsynchRenderingSupported somSelf->isAsynchRenderingSupported
    8787  #define _renderPageToPixbufAsynch somSelf->renderPageToPixbufAsynch
     88  #define _isRenderIntoPS somSelf->isRenderIntoPS
     89  #define _renderPageToPS somSelf->renderPageToPS
    8890  #define _isHaveText somSelf->isHaveText
    8991  #define _getSelectionRectangles somSelf->getSelectionRectangles
     
    9597  #define _isSaveable somSelf->isSaveable
    9698  #define _saveAs somSelf->saveAs
    97   #define _isPSExportable somSelf->isPSExportable
    98   #define _exportToPS somSelf->exportToPS
     99  #define _isPostScriptExportable somSelf->isPostScriptExportable
     100  #define _exportToPostScript somSelf->exportToPostScript
    99101  #define _isHaveFontInfo somSelf->isHaveFontInfo
    100102  #define _getFontInfo somSelf->getFontInfo
  • trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp

    r59 r61  
    676676
    677677
    678 SOM_Scope boolean  SOMLINK isPSExportable(LuPopplerDocument *somSelf,
     678SOM_Scope boolean  SOMLINK isPostScriptExportable(LuPopplerDocument *somSelf,
    679679                                           Environment *ev)
    680680{
     
    683683
    684684
    685 SOM_Scope void  SOMLINK exportToPS(LuPopplerDocument *somSelf,
     685SOM_Scope void  SOMLINK exportToPostScript(LuPopplerDocument *somSelf,
    686686                                    Environment *ev, string filename,
    687687                                   long first_page, long last_page,
  • trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.idl

    r27 r61  
    4040        isSaveable: override;
    4141        saveAs: override;
    42         isPSExportable: override;
    43         exportToPS: override;
     42        isPostScriptExportable: override;
     43        exportToPostScript: override;
    4444        isHaveFontInfo: override;
    4545        getFontInfo: override;
  • trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.xh

    r59 r61  
    110110                somToken fndata);
    111111typedef somTP_LuPopplerDocument_renderPageToPixbufAsynch *somTD_LuPopplerDocument_renderPageToPixbufAsynch;
     112typedef boolean   SOMLINK somTP_LuPopplerDocument_isRenderIntoPS(LuPopplerDocument *somSelf, Environment *ev);
     113typedef somTP_LuPopplerDocument_isRenderIntoPS *somTD_LuPopplerDocument_isRenderIntoPS;
     114typedef void   SOMLINK somTP_LuPopplerDocument_renderPageToPS(LuPopplerDocument *somSelf, Environment *ev,
     115                long pagenum,
     116                long src_x,
     117                long src_y,
     118                long src_width,
     119                long src_height,
     120                double scale,
     121                long rotation,
     122                unsigned long hps,
     123                somMToken rect);
     124typedef somTP_LuPopplerDocument_renderPageToPS *somTD_LuPopplerDocument_renderPageToPS;
    112125typedef boolean   SOMLINK somTP_LuPopplerDocument_isHaveText(LuPopplerDocument *somSelf, Environment *ev);
    113126typedef somTP_LuPopplerDocument_isHaveText *somTD_LuPopplerDocument_isHaveText;
     
    136149                string filename);
    137150typedef somTP_LuPopplerDocument_saveAs *somTD_LuPopplerDocument_saveAs;
    138 typedef boolean   SOMLINK somTP_LuPopplerDocument_isPSExportable(LuPopplerDocument *somSelf, Environment *ev);
    139 typedef somTP_LuPopplerDocument_isPSExportable *somTD_LuPopplerDocument_isPSExportable;
    140 typedef void   SOMLINK somTP_LuPopplerDocument_exportToPS(LuPopplerDocument *somSelf, Environment *ev,
     151typedef boolean   SOMLINK somTP_LuPopplerDocument_isPostScriptExportable(LuPopplerDocument *somSelf, Environment *ev);
     152typedef somTP_LuPopplerDocument_isPostScriptExportable *somTD_LuPopplerDocument_isPostScriptExportable;
     153typedef void   SOMLINK somTP_LuPopplerDocument_exportToPostScript(LuPopplerDocument *somSelf, Environment *ev,
    141154                string filename,
    142155                long first_page,
     
    145158                double height,
    146159                boolean duplex);
    147 typedef somTP_LuPopplerDocument_exportToPS *somTD_LuPopplerDocument_exportToPS;
     160typedef somTP_LuPopplerDocument_exportToPostScript *somTD_LuPopplerDocument_exportToPostScript;
    148161typedef boolean   SOMLINK somTP_LuPopplerDocument_isHaveFontInfo(LuPopplerDocument *somSelf, Environment *ev);
    149162typedef somTP_LuPopplerDocument_isHaveFontInfo *somTD_LuPopplerDocument_isHaveFontInfo;
     
    460473
    461474
     475/* method: isRenderIntoPS */
     476boolean   isRenderIntoPS(Environment *ev)
     477{
     478   return SOM_ResolveD(this,LuPopplerDocument,LuDocument,isRenderIntoPS)
     479        (this, ev);
     480}
     481
     482
     483/* method: renderPageToPS */
     484void   renderPageToPS(Environment *ev,
     485                long pagenum,
     486                long src_x,
     487                long src_y,
     488                long src_width,
     489                long src_height,
     490                double scale,
     491                long rotation,
     492                unsigned long hps,
     493                somMToken rect)
     494{
     495   SOM_ResolveD(this,LuPopplerDocument,LuDocument,renderPageToPS)
     496        (this, ev,pagenum,src_x,src_y,src_width,src_height,scale,rotation,hps,rect);
     497}
     498
     499
    462500/* method: isHaveText */
    463501boolean   isHaveText(Environment *ev)
     
    540578
    541579
    542 /* method: isPSExportable */
    543 boolean   isPSExportable(Environment *ev)
    544 {
    545    return SOM_ResolveD(this,LuPopplerDocument,LuDocument,isPSExportable)
    546         (this, ev);
    547 }
    548 
    549 
    550 /* method: exportToPS */
    551 void   exportToPS(Environment *ev,
     580/* method: isPostScriptExportable */
     581boolean   isPostScriptExportable(Environment *ev)
     582{
     583   return SOM_ResolveD(this,LuPopplerDocument,LuDocument,isPostScriptExportable)
     584        (this, ev);
     585}
     586
     587
     588/* method: exportToPostScript */
     589void   exportToPostScript(Environment *ev,
    552590                string filename,
    553591                long first_page,
     
    557595                boolean duplex)
    558596{
    559    SOM_ResolveD(this,LuPopplerDocument,LuDocument,exportToPS)
     597   SOM_ResolveD(this,LuPopplerDocument,LuDocument,exportToPostScript)
    560598        (this, ev,filename,first_page,last_page,width,height,duplex);
    561599}
  • trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.xih

    r59 r61  
    8686  #define _isAsynchRenderingSupported somSelf->isAsynchRenderingSupported
    8787  #define _renderPageToPixbufAsynch somSelf->renderPageToPixbufAsynch
     88  #define _isRenderIntoPS somSelf->isRenderIntoPS
     89  #define _renderPageToPS somSelf->renderPageToPS
    8890  #define _isHaveText somSelf->isHaveText
    8991  #define _getSelectionRectangles somSelf->getSelectionRectangles
     
    9597  #define _isSaveable somSelf->isSaveable
    9698  #define _saveAs somSelf->saveAs
    97   #define _isPSExportable somSelf->isPSExportable
    98   #define _exportToPS somSelf->exportToPS
     99  #define _isPostScriptExportable somSelf->isPostScriptExportable
     100  #define _exportToPostScript somSelf->exportToPostScript
    99101  #define _isHaveFontInfo somSelf->isHaveFontInfo
    100102  #define _getFontInfo somSelf->getFontInfo
     
    153155  #define _isSaveable somSelf->isSaveable
    154156  #define _saveAs somSelf->saveAs
    155   #define _isPSExportable somSelf->isPSExportable
    156   #define _exportToPS somSelf->exportToPS
     157  #define _isPostScriptExportable somSelf->isPostScriptExportable
     158  #define _exportToPostScript somSelf->exportToPostScript
    157159  #define _isHaveFontInfo somSelf->isHaveFontInfo
    158160  #define _getFontInfo somSelf->getFontInfo
     
    866868
    867869/*
    868  * Overridden method: isPSExportable
    869  */
    870 SOM_Scope boolean  SOMLINK isPSExportable(LuPopplerDocument *somSelf, Environment *ev);
    871 static char *somMN_LuPopplerDocumentisPSExportable = "LuDocument::isPSExportable";
    872 static somId somId_LuPopplerDocumentisPSExportable = &somMN_LuPopplerDocumentisPSExportable;
    873 #ifdef somId_isPSExportable
    874 #undef somId_isPSExportable
    875 #else
    876 #define somId_isPSExportable somId_LuPopplerDocumentisPSExportable
    877 #endif
    878 typedef boolean   SOMLINK somTP_xih_LuPopplerDocument_isPSExportable(LuPopplerDocument *somSelf, Environment *ev);
    879 typedef somTP_xih_LuPopplerDocument_isPSExportable *somTD_xih_LuPopplerDocument_isPSExportable;
    880 /* define the parent method call macro */
    881 static somMethodProc* LuPopplerDocument_parent_LuDocument_isPSExportable_resolved;
    882 #define LuPopplerDocument_parent_LuDocument_isPSExportable(somSelf,ev) \
    883   ((( somTD_xih_LuPopplerDocument_isPSExportable ) \
    884       LuPopplerDocument_parent_LuDocument_isPSExportable_resolved) \
     870 * Overridden method: isPostScriptExportable
     871 */
     872SOM_Scope boolean  SOMLINK isPostScriptExportable(LuPopplerDocument *somSelf, Environment *ev);
     873static char *somMN_LuPopplerDocumentisPostScriptExportable = "LuDocument::isPostScriptExportable";
     874static somId somId_LuPopplerDocumentisPostScriptExportable = &somMN_LuPopplerDocumentisPostScriptExportable;
     875#ifdef somId_isPostScriptExportable
     876#undef somId_isPostScriptExportable
     877#else
     878#define somId_isPostScriptExportable somId_LuPopplerDocumentisPostScriptExportable
     879#endif
     880typedef boolean   SOMLINK somTP_xih_LuPopplerDocument_isPostScriptExportable(LuPopplerDocument *somSelf, Environment *ev);
     881typedef somTP_xih_LuPopplerDocument_isPostScriptExportable *somTD_xih_LuPopplerDocument_isPostScriptExportable;
     882/* define the parent method call macro */
     883static somMethodProc* LuPopplerDocument_parent_LuDocument_isPostScriptExportable_resolved;
     884#define LuPopplerDocument_parent_LuDocument_isPostScriptExportable(somSelf,ev) \
     885  ((( somTD_xih_LuPopplerDocument_isPostScriptExportable ) \
     886      LuPopplerDocument_parent_LuDocument_isPostScriptExportable_resolved) \
    885887        (somSelf,ev))
    886888/* define a variety of (possibly ambiguous) short forms */
    887 #ifndef SOMGD_pmc_parent_isPSExportable
    888   #ifdef parent_isPSExportable
    889     #define SOMGD_pmc_parent_isPSExportable
    890     #undef parent_isPSExportable
    891   #else
    892 #define parent_isPSExportable LuPopplerDocument_parent_LuDocument_isPSExportable
    893   #endif
    894 #endif
    895 #ifndef SOMGD_pmc_parent_LuDocument_isPSExportable
    896   #ifdef parent_LuDocument_isPSExportable
    897     #define SOMGD_pmc_parent_LuDocument_isPSExportable
    898     #undef parent_LuDocument_isPSExportable
    899   #else
    900     #define parent_LuDocument_isPSExportable LuPopplerDocument_parent_LuDocument_isPSExportable
    901   #endif
    902 #endif
    903 #define LuPopplerDocument_parents_isPSExportable(somSelf,ev) (\
    904    LuPopplerDocument_parent_LuDocument_isPSExportable(somSelf,ev))
    905 
    906 /*
    907  * Overridden method: exportToPS
    908  */
    909 SOM_Scope void  SOMLINK exportToPS(LuPopplerDocument *somSelf, Environment *ev,
     889#ifndef SOMGD_pmc_parent_isPostScriptExportable
     890  #ifdef parent_isPostScriptExportable
     891    #define SOMGD_pmc_parent_isPostScriptExportable
     892    #undef parent_isPostScriptExportable
     893  #else
     894#define parent_isPostScriptExportable LuPopplerDocument_parent_LuDocument_isPostScriptExportable
     895  #endif
     896#endif
     897#ifndef SOMGD_pmc_parent_LuDocument_isPostScriptExportable
     898  #ifdef parent_LuDocument_isPostScriptExportable
     899    #define SOMGD_pmc_parent_LuDocument_isPostScriptExportable
     900    #undef parent_LuDocument_isPostScriptExportable
     901  #else
     902    #define parent_LuDocument_isPostScriptExportable LuPopplerDocument_parent_LuDocument_isPostScriptExportable
     903  #endif
     904#endif
     905#define LuPopplerDocument_parents_isPostScriptExportable(somSelf,ev) (\
     906   LuPopplerDocument_parent_LuDocument_isPostScriptExportable(somSelf,ev))
     907
     908/*
     909 * Overridden method: exportToPostScript
     910 */
     911SOM_Scope void  SOMLINK exportToPostScript(LuPopplerDocument *somSelf, Environment *ev,
    910912                string filename,
    911913                long first_page,
     
    914916                double height,
    915917                boolean duplex);
    916 static char *somMN_LuPopplerDocumentexportToPS = "LuDocument::exportToPS";
    917 static somId somId_LuPopplerDocumentexportToPS = &somMN_LuPopplerDocumentexportToPS;
    918 #ifdef somId_exportToPS
    919 #undef somId_exportToPS
    920 #else
    921 #define somId_exportToPS somId_LuPopplerDocumentexportToPS
    922 #endif
    923 typedef void   SOMLINK somTP_xih_LuPopplerDocument_exportToPS(LuPopplerDocument *somSelf, Environment *ev,
     918static char *somMN_LuPopplerDocumentexportToPostScript = "LuDocument::exportToPostScript";
     919static somId somId_LuPopplerDocumentexportToPostScript = &somMN_LuPopplerDocumentexportToPostScript;
     920#ifdef somId_exportToPostScript
     921#undef somId_exportToPostScript
     922#else
     923#define somId_exportToPostScript somId_LuPopplerDocumentexportToPostScript
     924#endif
     925typedef void   SOMLINK somTP_xih_LuPopplerDocument_exportToPostScript(LuPopplerDocument *somSelf, Environment *ev,
    924926                string filename,
    925927                long first_page,
     
    928930                double height,
    929931                boolean duplex);
    930 typedef somTP_xih_LuPopplerDocument_exportToPS *somTD_xih_LuPopplerDocument_exportToPS;
    931 /* define the parent method call macro */
    932 static somMethodProc* LuPopplerDocument_parent_LuDocument_exportToPS_resolved;
    933 #define LuPopplerDocument_parent_LuDocument_exportToPS(somSelf,ev,filename,first_page,last_page,width,height,duplex) \
    934   ((( somTD_xih_LuPopplerDocument_exportToPS ) \
    935       LuPopplerDocument_parent_LuDocument_exportToPS_resolved) \
     932typedef somTP_xih_LuPopplerDocument_exportToPostScript *somTD_xih_LuPopplerDocument_exportToPostScript;
     933/* define the parent method call macro */
     934static somMethodProc* LuPopplerDocument_parent_LuDocument_exportToPostScript_resolved;
     935#define LuPopplerDocument_parent_LuDocument_exportToPostScript(somSelf,ev,filename,first_page,last_page,width,height,duplex) \
     936  ((( somTD_xih_LuPopplerDocument_exportToPostScript ) \
     937      LuPopplerDocument_parent_LuDocument_exportToPostScript_resolved) \
    936938        (somSelf,ev,filename,first_page,last_page,width,height,duplex))
    937939/* define a variety of (possibly ambiguous) short forms */
    938 #ifndef SOMGD_pmc_parent_exportToPS
    939   #ifdef parent_exportToPS
    940     #define SOMGD_pmc_parent_exportToPS
    941     #undef parent_exportToPS
    942   #else
    943 #define parent_exportToPS LuPopplerDocument_parent_LuDocument_exportToPS
    944   #endif
    945 #endif
    946 #ifndef SOMGD_pmc_parent_LuDocument_exportToPS
    947   #ifdef parent_LuDocument_exportToPS
    948     #define SOMGD_pmc_parent_LuDocument_exportToPS
    949     #undef parent_LuDocument_exportToPS
    950   #else
    951     #define parent_LuDocument_exportToPS LuPopplerDocument_parent_LuDocument_exportToPS
    952   #endif
    953 #endif
    954 #define LuPopplerDocument_parents_exportToPS(somSelf,ev,filename,first_page,last_page,width,height,duplex) (\
    955    LuPopplerDocument_parent_LuDocument_exportToPS(somSelf,ev,filename,first_page,last_page,width,height,duplex))
     940#ifndef SOMGD_pmc_parent_exportToPostScript
     941  #ifdef parent_exportToPostScript
     942    #define SOMGD_pmc_parent_exportToPostScript
     943    #undef parent_exportToPostScript
     944  #else
     945#define parent_exportToPostScript LuPopplerDocument_parent_LuDocument_exportToPostScript
     946  #endif
     947#endif
     948#ifndef SOMGD_pmc_parent_LuDocument_exportToPostScript
     949  #ifdef parent_LuDocument_exportToPostScript
     950    #define SOMGD_pmc_parent_LuDocument_exportToPostScript
     951    #undef parent_LuDocument_exportToPostScript
     952  #else
     953    #define parent_LuDocument_exportToPostScript LuPopplerDocument_parent_LuDocument_exportToPostScript
     954  #endif
     955#endif
     956#define LuPopplerDocument_parents_exportToPostScript(somSelf,ev,filename,first_page,last_page,width,height,duplex) (\
     957   LuPopplerDocument_parent_LuDocument_exportToPostScript(somSelf,ev,filename,first_page,last_page,width,height,duplex))
    956958
    957959/*
     
    13531355    {    &somId_LuPopplerDocumentsaveAs,
    13541356         (somMethodProc *) saveAs  },
    1355     {    &somId_LuPopplerDocumentisPSExportable,
    1356          (somMethodProc *) isPSExportable  },
    1357     {    &somId_LuPopplerDocumentexportToPS,
    1358          (somMethodProc *) exportToPS  },
     1357    {    &somId_LuPopplerDocumentisPostScriptExportable,
     1358         (somMethodProc *) isPostScriptExportable  },
     1359    {    &somId_LuPopplerDocumentexportToPostScript,
     1360         (somMethodProc *) exportToPostScript  },
    13591361    {    &somId_LuPopplerDocumentisHaveFontInfo,
    13601362         (somMethodProc *) isHaveFontInfo  },
     
    14531455    LuPopplerDocument_parent_LuDocument_isHaveFontInfo_resolved =
    14541456        somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.isHaveFontInfo);
    1455     LuPopplerDocument_parent_LuDocument_exportToPS_resolved =
    1456         somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.exportToPS);
    1457     LuPopplerDocument_parent_LuDocument_isPSExportable_resolved =
    1458         somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.isPSExportable);
     1457    LuPopplerDocument_parent_LuDocument_exportToPostScript_resolved =
     1458        somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.exportToPostScript);
     1459    LuPopplerDocument_parent_LuDocument_isPostScriptExportable_resolved =
     1460        somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.isPostScriptExportable);
    14591461    LuPopplerDocument_parent_LuDocument_saveAs_resolved =
    14601462        somParentNumResolve(LuPopplerDocumentCClassData.parentMtab, 1, LuDocumentClassData.saveAs);
  • trunk/Lucide/SOURCE/plugins/lupoppler/makefile

    r50 r61  
    3232lib ..\ludoc\ludoc
    3333lib somtk
     34import _LuPixbufClassData ludoc.LuPixbufClassData
     35import _LuIndexNodeClassData ludoc.LuIndexNodeClassData
     36import _LuDocumentClassData ludoc.LuDocumentClassData
     37import _LuDocumentCClassData ludoc.LuDocumentCClassData
    3438export LuPopplerDocumentNewClass
    35 export _LuPopplerDocumentClassData
    36 export _LuPopplerDocumentCClassData
     39export LuPopplerDocumentClassData=_LuPopplerDocumentClassData
     40export LuPopplerDocumentCClassData=_LuPopplerDocumentCClassData
    3741export createObject
    3842export getSupportedExtensions
Note: See TracChangeset for help on using the changeset viewer.