ipeattributes.h   ipeattributes.h 
skipping to change at line 202 skipping to change at line 202
//! Origin of the Ipe coordinate system relative to the paper. //! Origin of the Ipe coordinate system relative to the paper.
Vector iOrigin; Vector iOrigin;
//! Size of the frame (the drawing area). //! Size of the frame (the drawing area).
Vector iFrameSize; Vector iFrameSize;
//! Paragraph skip (between textboxes). //! Paragraph skip (between textboxes).
double iParagraphSkip; double iParagraphSkip;
//! Crop paper to drawing. //! Crop paper to drawing.
bool iCrop; bool iCrop;
}; };
//! Padding for text bounding box.
/*! \ingroup attr */
struct TextPadding {
public:
double iLeft, iRight, iTop, iBottom;
};
struct Effect { struct Effect {
public: public:
//! The various fancy effects that Acrobat Reader will show. //! The various fancy effects that Acrobat Reader will show.
enum TEffect { enum TEffect {
ENormal, ESplitHI, ESplitHO, ESplitVI, ESplitVO, ENormal, ESplitHI, ESplitHO, ESplitVI, ESplitVO,
EBlindsH, EBlindsV, EBoxI, EBoxO, EBlindsH, EBlindsV, EBoxI, EBoxO,
EWipeLR, EWipeBT, EWipeRL, EWipeTB, EWipeLR, EWipeBT, EWipeRL, EWipeTB,
EDissolve, EGlitterLR, EGlitterTB, EGlitterD }; EDissolve, EGlitterLR, EGlitterTB, EGlitterD };
Effect(); Effect();
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 ipebase.h   ipebase.h 
skipping to change at line 77 skipping to change at line 77
T *ptr() { return iPtr; } T *ptr() { return iPtr; }
T *take() { T *p = iPtr; iPtr = 0; return p; } T *take() { T *p = iPtr; iPtr = 0; return p; }
private: private:
T *iPtr; T *iPtr;
}; };
namespace ipe { namespace ipe {
//! Ipelib version. //! Ipelib version.
/*! \ingroup base */ /*! \ingroup base */
const int IPELIB_VERSION = 70100; const int IPELIB_VERSION = 70101;
//! Oldest readable file format version. //! Oldest readable file format version.
/*! \ingroup base */ /*! \ingroup base */
const int OLDEST_FILE_FORMAT = 70000; const int OLDEST_FILE_FORMAT = 70000;
//! Current file format version. //! Current file format version.
/*! \ingroup base */ /*! \ingroup base */
const int FILE_FORMAT = 70005; const int FILE_FORMAT = 70005;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ipecanvas.h   ipecanvas.h 
skipping to change at line 58 skipping to change at line 58
class Tool; class Tool;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
class CanvasObserver { class CanvasObserver {
public: public:
virtual void canvasObserverWheelMoved(int degrees); virtual void canvasObserverWheelMoved(int degrees);
virtual void canvasObserverMouseAction(int button); virtual void canvasObserverMouseAction(int button);
virtual void canvasObserverPositionChanged(); virtual void canvasObserverPositionChanged();
virtual void canvasObserverToolChanged(bool hasTool); virtual void canvasObserverToolChanged(bool hasTool);
virtual void canvasObserverSizeChanged();
}; };
class CanvasBase { class CanvasBase {
public: public:
//! Keyboard modifiers //! Keyboard modifiers
enum TModifiers { EShift = 0x100, EControl = 0x200, enum TModifiers { EShift = 0x100, EControl = 0x200,
EAlt = 0x400, EMeta = 0x800 }; EAlt = 0x400, EMeta = 0x800 };
enum TCursor { EStandardCursor, EHandCursor, ECrossCursor, enum TCursor { EStandardCursor, EHandCursor, ECrossCursor,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ipepage.h   ipepage.h 
skipping to change at line 42 skipping to change at line 42
#ifndef IPEPAGE_H #ifndef IPEPAGE_H
#define IPEPAGE_H #define IPEPAGE_H
#include "ipetext.h" #include "ipetext.h"
// -------------------------------------------------------------------- // --------------------------------------------------------------------
namespace ipe { namespace ipe {
class StyleSheet; class StyleSheet;
// class DataSource;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
class Page { class Page {
public: public:
explicit Page(); explicit Page();
static Page *basic(); static Page *basic();
void saveAsXml(Stream &stream) const; void saveAsXml(Stream &stream) const;
skipping to change at line 71 skipping to change at line 70
//! Is layer \a i locked? //! Is layer \a i locked?
inline bool isLocked(int i) const { inline bool isLocked(int i) const {
return !!(iLayers[i].iFlags & ELocked); } return !!(iLayers[i].iFlags & ELocked); }
//! Does layer \a i have active snapping? //! Does layer \a i have active snapping?
inline bool hasSnapping(int i) const { inline bool hasSnapping(int i) const {
return !(iLayers[i].iFlags & ENoSnapping); } return !(iLayers[i].iFlags & ENoSnapping); }
void setLocked(int i, bool flag); void setLocked(int i, bool flag);
void setSnapping(int i, bool flag); void setSnapping(int i, bool flag);
void moveLayer(int index, int newIndex);
int findLayer(String name) const; int findLayer(String name) const;
void addLayer(String name); void addLayer(String name);
void addLayer(); void addLayer();
void removeLayer(String name); void removeLayer(String name);
void renameLayer(String oldName, String newName); void renameLayer(String oldName, String newName);
//! Return number of views. //! Return number of views.
inline int countViews() const { return iViews.size(); } inline int countViews() const { return iViews.size(); }
int countMarkedViews() const; int countMarkedViews() const;
//! Return effect of view. //! Return effect of view.
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ipestyle.h   ipestyle.h 
skipping to change at line 124 skipping to change at line 124
//! Set LaTeX preamble. //! Set LaTeX preamble.
inline void setPreamble(const String &str) { iPreamble = str; } inline void setPreamble(const String &str) { iPreamble = str; }
//! Return Latex encoding. //! Return Latex encoding.
inline String encoding() const { return iEncoding; } inline String encoding() const { return iEncoding; }
//! Set Latex encoding //! Set Latex encoding
inline void setEncoding(const String &enc) { iEncoding = enc; } inline void setEncoding(const String &enc) { iEncoding = enc; }
const Layout *layout() const; const Layout *layout() const;
void setLayout(const Layout &margins); void setLayout(const Layout &margins);
const TextPadding *textPadding() const;
void setTextPadding(const TextPadding &pad);
const TitleStyle *titleStyle() const; const TitleStyle *titleStyle() const;
void setTitleStyle(const TitleStyle &ts); void setTitleStyle(const TitleStyle &ts);
const PageNumberStyle *pageNumberStyle(); const PageNumberStyle *pageNumberStyle();
void setPageNumberStyle(const PageNumberStyle &pns); void setPageNumberStyle(const PageNumberStyle &pns);
void addCMap(String s); void addCMap(String s);
void allCMaps(std::vector<String> &seq) const; void allCMaps(std::vector<String> &seq) const;
void setLineCap(TLineCap s); void setLineCap(TLineCap s);
skipping to change at line 165 skipping to change at line 168
bool iStandard; bool iStandard;
String iName; String iName;
SymbolMap iSymbols; SymbolMap iSymbols;
GradientMap iGradients; GradientMap iGradients;
TilingMap iTilings; TilingMap iTilings;
EffectMap iEffects; EffectMap iEffects;
Map iMap; Map iMap;
String iEncoding; String iEncoding;
String iPreamble; String iPreamble;
Layout iLayout; Layout iLayout;
TextPadding iTextPadding;
TitleStyle iTitleStyle; TitleStyle iTitleStyle;
PageNumberStyle iPageNumberStyle; PageNumberStyle iPageNumberStyle;
TLineJoin iLineJoin; TLineJoin iLineJoin;
TLineCap iLineCap; TLineCap iLineCap;
TFillRule iFillRule; TFillRule iFillRule;
std::vector<String> iCMaps; std::vector<String> iCMaps;
}; };
skipping to change at line 199 skipping to change at line 203
void saveAsXml(Stream &stream) const; void saveAsXml(Stream &stream) const;
bool has(Kind kind, Attribute sym) const; bool has(Kind kind, Attribute sym) const;
Attribute find(Kind, Attribute sym) const; Attribute find(Kind, Attribute sym) const;
const Symbol *findSymbol(Attribute sym) const; const Symbol *findSymbol(Attribute sym) const;
const Gradient *findGradient(Attribute sym) const; const Gradient *findGradient(Attribute sym) const;
const Tiling *findTiling(Attribute sym) const; const Tiling *findTiling(Attribute sym) const;
const Effect *findEffect(Attribute sym) const; const Effect *findEffect(Attribute sym) const;
const Layout *findLayout() const; const Layout *findLayout() const;
const TextPadding *findTextPadding() const;
const StyleSheet::TitleStyle *findTitleStyle() const; const StyleSheet::TitleStyle *findTitleStyle() const;
const StyleSheet::PageNumberStyle *findPageNumberStyle() const; const StyleSheet::PageNumberStyle *findPageNumberStyle() const;
String findPreamble() const; String findPreamble() const;
String findEncoding() const; String findEncoding() const;
TLineCap lineCap() const; TLineCap lineCap() const;
TLineJoin lineJoin() const; TLineJoin lineJoin() const;
TFillRule fillRule() const; TFillRule fillRule() const;
void allNames(Kind kind, AttributeSeq &seq) const; void allNames(Kind kind, AttributeSeq &seq) const;
int findDefinition(Kind kind, Attribute sym) const; int findDefinition(Kind kind, Attribute sym) const;
void allCMaps(std::vector<String> &seq) const; void allCMaps(std::vector<String> &seq) const;
String update(String dir);
private: private:
std::vector<StyleSheet *> iSheets; std::vector<StyleSheet *> iSheets;
}; };
} // namespace } // namespace
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/