Skip to content

Commit d61ce31

Browse files
committed
Merged revisions 8826 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8826 | mdboom | 2010-12-10 13:13:22 -0500 (Fri, 10 Dec 2010) | 2 lines Improve indentation in ttconv. ........ svn path=/trunk/matplotlib/; revision=8827
1 parent aaa6f4c commit d61ce31

File tree

3 files changed

+864
-664
lines changed

3 files changed

+864
-664
lines changed

ttconv/pprdrv.h

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,50 +29,56 @@
2929
* function. This both removes the hardcoding of output to go to stdout
3030
* and makes output thread-safe. Michael Droettboom [06-07-07]
3131
*/
32-
class TTStreamWriter {
32+
class TTStreamWriter
33+
{
3334
private:
34-
// Private copy and assignment
35-
TTStreamWriter& operator=(const TTStreamWriter& other);
36-
TTStreamWriter(const TTStreamWriter& other);
35+
// Private copy and assignment
36+
TTStreamWriter& operator=(const TTStreamWriter& other);
37+
TTStreamWriter(const TTStreamWriter& other);
3738

3839
public:
39-
TTStreamWriter() { }
40-
virtual ~TTStreamWriter() { }
40+
TTStreamWriter() { }
41+
virtual ~TTStreamWriter() { }
4142

42-
virtual void write(const char*) = 0;
43+
virtual void write(const char*) = 0;
4344

44-
virtual void printf(const char* format, ...);
45-
virtual void put_char(int val);
46-
virtual void puts(const char* a);
47-
virtual void putline(const char* a);
45+
virtual void printf(const char* format, ...);
46+
virtual void put_char(int val);
47+
virtual void puts(const char* a);
48+
virtual void putline(const char* a);
4849
};
4950

50-
class TTDictionaryCallback {
51-
private:
52-
// Private copy and assignment
53-
TTDictionaryCallback& operator=(const TTStreamWriter& other);
54-
TTDictionaryCallback(const TTStreamWriter& other);
51+
class TTDictionaryCallback
52+
{
53+
private:
54+
// Private copy and assignment
55+
TTDictionaryCallback& operator=(const TTStreamWriter& other);
56+
TTDictionaryCallback(const TTStreamWriter& other);
5557

56-
public:
57-
TTDictionaryCallback() { }
58-
virtual ~TTDictionaryCallback() { }
58+
public:
59+
TTDictionaryCallback() { }
60+
virtual ~TTDictionaryCallback() { }
5961

60-
virtual void add_pair(const char* key, const char* value) = 0;
62+
virtual void add_pair(const char* key, const char* value) = 0;
6163
};
6264

6365
void replace_newlines_with_spaces(char* a);
6466

6567
/*
6668
* A simple class for all ttconv exceptions.
6769
*/
68-
class TTException {
69-
const char* message;
70-
TTException& operator=(const TTStreamWriter& other);
71-
TTException(const TTStreamWriter& other);
72-
73-
public:
74-
TTException(const char* message_) : message(message_) { }
75-
const char* getMessage() { return message; }
70+
class TTException
71+
{
72+
const char* message;
73+
TTException& operator=(const TTStreamWriter& other);
74+
TTException(const TTStreamWriter& other);
75+
76+
public:
77+
TTException(const char* message_) : message(message_) { }
78+
const char* getMessage()
79+
{
80+
return message;
81+
}
7682
};
7783

7884
/*
@@ -91,11 +97,12 @@ class TTException {
9197

9298
/* Do not change anything below this line. */
9399

94-
enum font_type_enum {
95-
PS_TYPE_3 = 3,
96-
PS_TYPE_42 = 42,
97-
PS_TYPE_42_3_HYBRID = 43,
98-
PDF_TYPE_3 = -3
100+
enum font_type_enum
101+
{
102+
PS_TYPE_3 = 3,
103+
PS_TYPE_42 = 42,
104+
PS_TYPE_42_3_HYBRID = 43,
105+
PDF_TYPE_3 = -3
99106
};
100107

101108
/* routines in pprdrv_tt.c */

0 commit comments

Comments
 (0)