Skip to content

Commit 57e4d74

Browse files
delphidabblerdelphidabbler
committed
Turn on scoped enums for TRTFControls & rename elems
The elements of TRTFControls in URTFUtils were stripped of their leading "rc" characters. The scoped enumeration compiler directive was switched on for TRTFControls so that the elements now have to be prefixed with the type name. Modified all affected code in URTFBuilder and URTFUtils.
1 parent 36b0342 commit 57e4d74

File tree

2 files changed

+88
-74
lines changed

2 files changed

+88
-74
lines changed

‎Src/URTFBuilder.pas‎

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ procedure TRTFBuilder.BeginGroup;
269269

270270
procedure TRTFBuilder.ClearParaFormatting;
271271
begin
272-
AddControl(TRTF.ControlWord(rcPard));
272+
AddControl(TRTF.ControlWord(TRTFControl.Pard));
273273
end;
274274

275275
constructor TRTFBuilder.Create(const CodePage: Integer);
@@ -296,11 +296,11 @@ destructor TRTFBuilder.Destroy;
296296

297297
function TRTFBuilder.DocHeader: ASCIIString;
298298
begin
299-
Result := TRTF.ControlWord(rcRTF, TRTF.Version)
300-
+ TRTF.ControlWord(rcAnsi)
301-
+ TRTF.ControlWord(rcAnsiCodePage, fCodePage)
302-
+ TRTF.ControlWord(rcDefFontNum, DefaultFontIdx)
303-
+ TRTF.ControlWord(rcDefLanguage, DefaultLanguageID)
299+
Result := TRTF.ControlWord(TRTFControl.RTF, TRTF.Version)
300+
+ TRTF.ControlWord(TRTFControl.Ansi)
301+
+ TRTF.ControlWord(TRTFControl.AnsiCodePage, fCodePage)
302+
+ TRTF.ControlWord(TRTFControl.DefFontNum, DefaultFontIdx)
303+
+ TRTF.ControlWord(TRTFControl.DefLanguage, DefaultLanguageID)
304304
+ fFontTable.AsString
305305
+ fColourTable.AsString
306306
+ fDocProperties.AsString
@@ -315,7 +315,7 @@ procedure TRTFBuilder.EndGroup;
315315

316316
procedure TRTFBuilder.EndPara;
317317
begin
318-
AddControl(TRTF.ControlWord(rcPar));
318+
AddControl(TRTF.ControlWord(TRTFControl.Par));
319319
AppendBody(EOL);
320320
fInControls := False;
321321
end;
@@ -327,12 +327,14 @@ function TRTFBuilder.Render: TRTFMarkup;
327327

328328
procedure TRTFBuilder.ResetCharStyle;
329329
begin
330-
AddControl(TRTF.ControlWord(rcPlain));
330+
AddControl(TRTF.ControlWord(TRTFControl.Plain));
331331
end;
332332

333333
procedure TRTFBuilder.SetColour(const Colour: TColor);
334334
begin
335-
AddControl(TRTF.ControlWord(rcForeColorNum, fColourTable.ColourRef(Colour)));
335+
AddControl(
336+
TRTF.ControlWord(TRTFControl.ForeColorNum, fColourTable.ColourRef(Colour))
337+
);
336338
end;
337339

338340
procedure TRTFBuilder.SetFont(const FontName: string);
@@ -342,39 +344,43 @@ procedure TRTFBuilder.SetFont(const FontName: string);
342344
// We don't emit control if this is default font
343345
FontIdx := fFontTable.FontRef(FontName);
344346
if FontIdx <> DefaultFontIdx then
345-
AddControl(TRTF.ControlWord(rcFontNum, FontIdx));
347+
AddControl(TRTF.ControlWord(TRTFControl.FontNum, FontIdx));
346348
end;
347349

348350
procedure TRTFBuilder.SetFontSize(const Points: Double);
349351
begin
350-
AddControl(TRTF.ControlWord(rcFontSize, FloatToInt(2 * Points)));
352+
AddControl(TRTF.ControlWord(TRTFControl.FontSize, FloatToInt(2 * Points)));
351353
end;
352354

353355
procedure TRTFBuilder.SetFontStyle(const Style: TFontStyles);
354356
begin
355357
if fsBold in Style then
356-
AddControl(TRTF.ControlWord(rcBold));
358+
AddControl(TRTF.ControlWord(TRTFControl.Bold));
357359
if fsItalic in Style then
358-
AddControl(TRTF.ControlWord(rcItalic));
360+
AddControl(TRTF.ControlWord(TRTFControl.Italic));
359361
if fsUnderline in Style then
360-
AddControl(TRTF.ControlWord(rcUnderline));
362+
AddControl(TRTF.ControlWord(TRTFControl.Underline));
361363
end;
362364

363365
procedure TRTFBuilder.SetIndents(const LeftIndent, FirstLineOffset: SmallInt);
364366
begin
365-
AddControl(TRTF.ControlWord(rcLeftIndent, LeftIndent));
366-
AddControl(TRTF.ControlWord(rcFirstLineOffset, FirstLineOffset));
367+
AddControl(TRTF.ControlWord(TRTFControl.LeftIndent, LeftIndent));
368+
AddControl(TRTF.ControlWord(TRTFControl.FirstLineOffset, FirstLineOffset));
367369
end;
368370

369371
procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
370372
const
371373
TwipsPerPoint = 20; // Note: 20 Twips in a point
372374
begin
373375
AddControl(
374-
TRTF.ControlWord(rcSpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before))
376+
TRTF.ControlWord(
377+
TRTFControl.SpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before)
378+
)
375379
);
376380
AddControl(
377-
TRTF.ControlWord(rcSpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After))
381+
TRTF.ControlWord(
382+
TRTFControl.SpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After)
383+
)
378384
);
379385
end;
380386

@@ -383,7 +389,7 @@ procedure TRTFBuilder.SetTabStops(const TabStops: array of SmallInt);
383389
Tab: SmallInt;
384390
begin
385391
for Tab in TabStops do
386-
AddControl(TRTF.ControlWord(rcTabStop, Tab));
392+
AddControl(TRTF.ControlWord(TRTFControl.TabStop, Tab));
387393
end;
388394

389395
{ TRTFFontTable }
@@ -413,22 +419,27 @@ function TRTFFontTable.AsString: ASCIIString;
413419
const
414420
// Map of generic font families to RTF controls
415421
cGenericFonts: array[TRTFGenericFont] of TRTFControl = (
416-
rcFontFamilyNil, rcFontFamilyRoman, rcFontFamilySwiss, rcFontFamilyModern,
417-
rcFontFamilyScript, rcFontFamilyDecor, rcFontFamilyTech
422+
TRTFControl.FontFamilyNil, // rgfDontCare
423+
TRTFControl.FontFamilyRoman, // rgfRoman
424+
TRTFControl.FontFamilySwiss, // rgfSwiss
425+
TRTFControl.FontFamilyModern, // rgfModern
426+
TRTFControl.FontFamilyScript, // rgfScript
427+
TRTFControl.FontFamilyDecor, // rgfDecorative
428+
TRTFControl.FontFamilyTech // rgfTechnical
418429
);
419430
var
420431
Idx: Integer; // loops thru fonts in table
421432
Font: TRTFFont; // reference to a font in table
422433
begin
423-
Result := '{' + TRTF.ControlWord(rcFontTable);
434+
Result := '{' + TRTF.ControlWord(TRTFControl.FontTable);
424435
for Idx := 0 to Pred(fFonts.Count) do
425436
begin
426437
Font := fFonts[Idx];
427438
Result := Result + '{'
428-
+ TRTF.ControlWord(rcFontNum, Idx)
429-
+ TRTF.ControlWord(rcFontPitch, 1)
439+
+ TRTF.ControlWord(TRTFControl.FontNum, Idx)
440+
+ TRTF.ControlWord(TRTFControl.FontPitch, 1)
430441
+ TRTF.ControlWord(cGenericFonts[Font.Generic])
431-
+ TRTF.ControlWord(rcFontCharset, Font.Charset)
442+
+ TRTF.ControlWord(TRTFControl.FontCharset, Font.Charset)
432443
+ ' '
433444
+ StringToASCIIString(Font.Name)
434445
+ '}';
@@ -488,7 +499,7 @@ function TRTFColourTable.AsString: ASCIIString;
488499
begin
489500
// Begin table
490501
Result := '{'
491-
+ TRTF.ControlWord(rcColorTable)
502+
+ TRTF.ControlWord(TRTFControl.ColorTable)
492503
+ ' ';
493504
// Add entry for each colour
494505
for Colour in fColours do
@@ -497,9 +508,9 @@ function TRTFColourTable.AsString: ASCIIString;
497508
begin
498509
RGB := ColorToRGB(Colour);
499510
Result := Result
500-
+ TRTF.ControlWord(rcRed, GetRValue(RGB))
501-
+ TRTF.ControlWord(rcGreen, GetGValue(RGB))
502-
+ TRTF.ControlWord(rcBlue, GetBValue(RGB))
511+
+ TRTF.ControlWord(TRTFControl.Red, GetRValue(RGB))
512+
+ TRTF.ControlWord(TRTFControl.Green, GetGValue(RGB))
513+
+ TRTF.ControlWord(TRTFControl.Blue, GetBValue(RGB))
503514
+ ';'
504515
end
505516
else
@@ -540,9 +551,10 @@ function TRTFDocProperties.AsString: ASCIIString;
540551
Exit;
541552
end;
542553
// Start with \info control word in group
543-
Result := '{' + TRTF.ControlWord(rcInfo);
554+
Result := '{' + TRTF.ControlWord(TRTFControl.Info);
544555
if fTitle <> '' then
545-
Result := Result + TRTF.UnicodeSafeDestination(rcTitle, fTitle, fCodePage);
556+
Result := Result
557+
+ TRTF.UnicodeSafeDestination(TRTFControl.Title, fTitle, fCodePage);
546558
// Close \info group
547559
Result := Result + '}';
548560
end;

‎Src/URTFUtils.pas‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,49 +23,51 @@ interface
2323

2424

2525
type
26+
{$ScopedEnums On}
2627
/// <summary>Enumeration containing identifiers for each supported RTF
2728
/// control word.</summary>
2829
TRTFControl = (
29-
rcRTF, // RTF version
30-
rcAnsi, // use ANSI character set
31-
rcAnsiCodePage, // specifies ANSI code page
32-
rcDefFontNum, // default font number
33-
rcDefLanguage, // default language
34-
rcFontTable, // introduces font table
35-
rcFontPitch, // font pitch
36-
rcFontCharset, // font character set
37-
rcFontFamilyNil, // unknown font family
38-
rcFontFamilyRoman, // serif, proportional fonts
39-
rcFontFamilySwiss, // sans-serif, proportional fonts
40-
rcFontFamilyModern, // fixed pitch serif and sans-serif fonts
41-
rcFontFamilyScript, // script fonts
42-
rcFontFamilyDecor, // decorative fonts
43-
rcFontFamilyTech, // technical, symbol and maths fonts
44-
rcColorTable, // introduces colour table
45-
rcRed, // defines red colour component
46-
rcGreen, // defines gree colour component
47-
rcBlue, // defines blue colour component
48-
rcInfo, // introduces information group
49-
rcTitle, // sets document title
50-
rcPard, // resets to default paragraph format
51-
rcPar, // begins new paragraph
52-
rcPlain, // reset font (character) formatting properties
53-
rcFontNum, // font number (index to font table)
54-
rcForeColorNum, // foreground colour number (index to colour table)
55-
rcBold, // sets or toggles bold style
56-
rcItalic, // sets or toggles italic style
57-
rcUnderline, // sets or toggles underline style
58-
rcFontSize, // font size in 1/2 points
59-
rcSpaceBefore, // space before paragraphs in twips
60-
rcSpaceAfter, // space after paragraph in twips
61-
rcUnicodeChar, // defines a Unicode character as signed 16bit value
62-
rcUnicodePair, // introduces pair of ANSI and Unicode destinations
63-
rcUnicodeDest, // introduces Unicode destination
64-
rcIgnore, // denotes following control can be ignored
65-
rcFirstLineOffset, // first line indent in twips (relative to \li)
66-
rcLeftIndent, // left indent in twips
67-
rcTabStop // sets a tab stop in twips
30+
RTF, // RTF version
31+
Ansi, // use ANSI character set
32+
AnsiCodePage, // specifies ANSI code page
33+
DefFontNum, // default font number
34+
DefLanguage, // default language
35+
FontTable, // introduces font table
36+
FontPitch, // font pitch
37+
FontCharset, // font character set
38+
FontFamilyNil, // unknown font family
39+
FontFamilyRoman, // serif, proportional fonts
40+
FontFamilySwiss, // sans-serif, proportional fonts
41+
FontFamilyModern, // fixed pitch serif and sans-serif fonts
42+
FontFamilyScript, // script fonts
43+
FontFamilyDecor, // decorative fonts
44+
FontFamilyTech, // technical, symbol and maths fonts
45+
ColorTable, // introduces colour table
46+
Red, // defines red colour component
47+
Green, // defines gree colour component
48+
Blue, // defines blue colour component
49+
Info, // introduces information group
50+
Title, // sets document title
51+
Pard, // resets to default paragraph format
52+
Par, // begins new paragraph
53+
Plain, // reset font (character) formatting properties
54+
FontNum, // font number (index to font table)
55+
ForeColorNum, // foreground colour number (index to colour table)
56+
Bold, // sets or toggles bold style
57+
Italic, // sets or toggles italic style
58+
Underline, // sets or toggles underline style
59+
FontSize, // font size in 1/2 points
60+
SpaceBefore, // space before paragraphs in twips
61+
SpaceAfter, // space after paragraph in twips
62+
UnicodeChar, // defines a Unicode character as signed 16bit value
63+
UnicodePair, // introduces pair of ANSI and Unicode destinations
64+
UnicodeDest, // introduces Unicode destination
65+
Ignore, // denotes following control can be ignored
66+
FirstLineOffset, // first line indent in twips (relative to \li)
67+
LeftIndent, // left indent in twips
68+
TabStop // sets a tab stop in twips
6869
);
70+
{$ScopedEnums off}
6971

7072
type
7173
/// <summary>Container for related methods for generating valid RTF control
@@ -277,7 +279,7 @@ class function TRTF.MakeSafeText(const AText: string; const ACodePage: Integer):
277279
else
278280
// Conversion failed: we store Unicode char in a Unicode control word
279281
Result := Result
280-
+ ControlWord(rcUnicodeChar, SmallInt(Ord(Ch)))
282+
+ ControlWord(TRTFControl.UnicodeChar, SmallInt(Ord(Ch)))
281283
+ ' ?'; // fallback "unprintable" value
282284
end;
283285
end;
@@ -317,11 +319,11 @@ class function TRTF.UnicodeSafeDestination(const ADestCtrl: TRTFControl;
317319
Encoding.Free;
318320
end;
319321
Result := '{'
320-
+ ControlWord(rcUnicodePair)
322+
+ ControlWord(TRTFControl.UnicodePair)
321323
+ MakeDestination(AnsiStr) // ANSI only destination
322324
+ '{'
323-
+ ControlWord(rcIgnore)
324-
+ ControlWord(rcUnicodeDest)
325+
+ ControlWord(TRTFControl.Ignore)
326+
+ ControlWord(TRTFControl.UnicodeDest)
325327
+ MakeDestination(ADestText) // Unicode destinatation
326328
+ '}'
327329
+ '}';

0 commit comments

Comments
 (0)