lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 14:56:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source 
Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: David Eränen <deranen@gmail.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: Lowell <lowell@mcneel.com>
Co-authored-by: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: wfcook <wfcook@mcneel.com>
This commit is contained in:
Bozo The Builder
2021-10-14 07:57:14 -07:00
parent 2b96cf3142
commit 95dde7ec84
50 changed files with 21418 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opennurbs_textiterator.cpp
View File

@@ -3291,8 +3291,9 @@ bool RtfComposer::Compose(
run_strings += L" ";
}
if (run->IsStacked() == ON_TextRun::Stacked::kStacked && run->m_stacked_text != 0)
if (ON_TextRun::RunType::kField != run->Type() && run->IsStacked() == ON_TextRun::Stacked::kStacked && run->m_stacked_text != 0)
{
// RH-64720 - Only do this if the stack isn't from a field
run_strings += L"[[";
run_strings += run->m_stacked_text->m_separator;
GetRunText(run->m_stacked_text->m_top_run, run_strings, make_rtf);
@@ -3302,9 +3303,9 @@ bool RtfComposer::Compose(
}
else if (ON_TextRun::RunType::kField == run->Type())
{
run_strings += L"%<";
GetRunText(run, run_strings, make_rtf);
run_strings += L">%";
//run_strings += L"%<";
//GetRunText(run, run_strings, make_rtf);
//run_strings += L">%";
}
else
{