colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-09 12:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: rtf roundtrip with baseline stuff

Browse Source
This commit is contained in:
daboe01
2026-06-19 08:48:17 +02:00
parent d40a151e05
commit c187f5de1d
2 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/_CPRTFParser.j
+50
View File
@@ -38,6 +38,8 @@
@global CPParagraphStyleAttributeName
@global CPAttachmentAttributeName
@global CPUnderlineStyleAttributeName
@global CPBaselineOffsetAttributeName
@global CPSuperscriptAttributeName
@global CPLeftTabStopType
@global CPRightTabStopType
@@ -72,6 +74,8 @@ var cp1252Map = {
BOOL script;
BOOL _tabChanged;
CPTabStopType _nextTabType;
int superscript;
float baselineOffset;
}
- (id)init
@@ -104,6 +108,8 @@ var cp1252Map = {
mynew.ulColour = ulColour;
mynew._tabChanged = _tabChanged;
mynew._nextTabType = _nextTabType;
mynew.superscript = superscript;
mynew.baselineOffset = baselineOffset;
return mynew;
}
@@ -169,6 +175,8 @@ var cp1252Map = {
underline = 0;
strikethrough = 0;
script = 0;
superscript = 0;
baselineOffset = 0.0;
}
- (void)addTab:(float)location type:(CPTextTabType)type
@@ -212,6 +220,12 @@ var cp1252Map = {
if (underline)
[ret setObject:[CPNumber numberWithInt:1] forKey:CPUnderlineStyleAttributeName];
if (superscript !== 0)
[ret setObject:[CPNumber numberWithInt:superscript] forKey:CPSuperscriptAttributeName];
if (baselineOffset !== 0.0)
[ret setObject:[CPNumber numberWithFloat:baselineOffset] forKey:CPBaselineOffsetAttributeName];
return ret;
}
@end
@@ -226,6 +240,12 @@ var kRgsymRtf = {
"b" : [ "b", 1, false, kRTFParserType_prop, "propBold"],
"ul" : [ "ul", 1, false, kRTFParserType_prop, "propUnderline"],
"i" : [ "i", 1, false, kRTFParserType_prop, "propItalic"],
"super" : [ "super", 1, true, kRTFParserType_prop, "propSuper"],
"sub" : [ "sub", 1, true, kRTFParserType_prop, "propSub"],
"nosupersub" : [ "nosupersub",1, true, kRTFParserType_prop, "propNoSuperSub"],
"up" : [ "up", 6, false, kRTFParserType_prop, "propUp"],
"dn" : [ "dn", 6, false, kRTFParserType_prop, "propDn"],
"plain" : [ "plain", 0, false, kRTFParserType_prop, "propPlain"],
"pgnucltr" : [ "pgnucltr", "pgULtr", true, kRTFParserType_prop, "propPgnFormat"],
"pgnlcltr" : [ "pgnlcltr", "pgLLtr", true, kRTFParserType_prop, "propPgnFormat"],
"qc" : [ "qc", "justC", true, kRTFParserType_prop, "propJust"],
@@ -621,6 +641,36 @@ var kRgsymRtf = {
}
break;
case "super":
[self _flushCurrentRun];
_currentRun.superscript = 1;
break;
case "sub":
[self _flushCurrentRun];
_currentRun.superscript = -1;
break;
case "nosupersub":
[self _flushCurrentRun];
_currentRun.superscript = 0;
break;
case "up":
[self _flushCurrentRun];
_currentRun.baselineOffset = parseFloat(param) / 2.0;
break;
case "dn":
[self _flushCurrentRun];
_currentRun.baselineOffset = -parseFloat(param) / 2.0;
break;
case "plain":
[self _flushCurrentRun];
[_currentRun resetFont];
break;
case "qc": // paragraph center
[_currentRun.paragraph setAlignment:CPCenterTextAlignment];
break;
AppKit/CPTextView/_CPRTFProducer.j
+12 -10
View File
@@ -646,28 +646,29 @@ function _points2twips(a) { return (a) * 20.0; }
else if ([currAttrib isEqualToString:CPUnderlineStyleAttributeName])
{
headerString += @"\\ul";
trailerString += @"\\ulnone";
trailerString += @"\\ulnone "; // trailing space important!
}
else if ([currAttrib isEqualToString:CPSuperscriptAttributeName])
{
var value = [attributes objectForKey:CPSuperscriptAttributeName],
svalue = [value intValue] * 6;
ivalue = [value intValue];
if (svalue > 0)
if (ivalue > 0)
{
headerString += [CPString stringWithFormat:@"\\up%d", svalue];
trailerString += @"\\up0";
headerString += @"\\super";
trailerString += @"\\nosupersub "; // trailing space important!
}
else if (svalue < 0)
else if (ivalue < 0)
{
headerString += [CPString stringWithFormat:@"\\dn-%d", svalue];
trailerString += @"\\dn0";
headerString += @"\\sub";
trailerString += @"\\nosupersub "; // trailing space important!
}
}
else if ([currAttrib isEqualToString:CPBaselineOffsetAttributeName])
{
var value = [attributes objectForKey:CPBaselineOffsetAttributeName],
svalue = [value floatValue] * 2;
fvalue = [value floatValue],
svalue = Math.round(fvalue * 2.0); // Convert standard points to RTF half-points
if (svalue > 0)
{
@@ -676,7 +677,8 @@ function _points2twips(a) { return (a) * 20.0; }
}
else if (svalue < 0)
{
headerString += [CPString stringWithFormat:@"\\dn-%d", svalue];
// Correct negative formatting using safe positive boundary
headerString += [CPString stringWithFormat:@"\\dn%d", Math.abs(svalue)];
trailerString += @"\\dn0";
}
}