Support multiline strings in wxPostScriptDC::DrawText() and DrawRotatedText()
'show' operator in PostScript doesn't support printing newlines, so we need to split the string into lines manually and print each line separately. Closes #17798.
This commit is contained in:
@@ -138,7 +138,7 @@ protected:
|
|||||||
void DoGetSizeMM(int *width, int *height) const wxOVERRIDE;
|
void DoGetSizeMM(int *width, int *height) const wxOVERRIDE;
|
||||||
|
|
||||||
// Common part of DoDrawText() and DoDrawRotatedText()
|
// Common part of DoDrawText() and DoDrawRotatedText()
|
||||||
void DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord testDescent);
|
void DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord testDescent, double lineHeight);
|
||||||
|
|
||||||
FILE* m_pstream; // PostScript output stream
|
FILE* m_pstream; // PostScript output stream
|
||||||
unsigned char m_currentRed;
|
unsigned char m_currentRed;
|
||||||
|
@@ -230,6 +230,19 @@ static const char wxPostScriptHeaderReencodeISO2[] =
|
|||||||
"/yacute/thorn/ydieresis\n"
|
"/yacute/thorn/ydieresis\n"
|
||||||
"] def\n\n";
|
"] def\n\n";
|
||||||
|
|
||||||
|
// Split multiline string and store each line in the array.
|
||||||
|
static const char *wxPostScriptHeaderStrSplit =
|
||||||
|
"/strsplit {\n" // str delim
|
||||||
|
" [ 3 1 roll\n" // [ str delim
|
||||||
|
" {\n" // [ str-items str delim
|
||||||
|
" search {\n" // [ str-items post match pre
|
||||||
|
" 3 1 roll\n" // [ str-items pre post match => [ str-items new-item remaining-str delim
|
||||||
|
" }{\n" // [ str-items str
|
||||||
|
" exit\n" // [ str-items str => exit from loop
|
||||||
|
" }ifelse\n"
|
||||||
|
" }loop\n" // [ str-items
|
||||||
|
" ]\n" // [ str-items ]
|
||||||
|
"} def\n";
|
||||||
//-------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------
|
||||||
// wxPostScriptDC
|
// wxPostScriptDC
|
||||||
//-------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------
|
||||||
@@ -1310,7 +1323,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Common part of DoDrawText() and DoDrawRotatedText()
|
// Common part of DoDrawText() and DoDrawRotatedText()
|
||||||
void wxPostScriptDCImpl::DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord textDescent)
|
void wxPostScriptDCImpl::DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord textDescent, double lineHeight)
|
||||||
{
|
{
|
||||||
wxCHECK_RET( textbuf, wxS("Invalid text buffer") );
|
wxCHECK_RET( textbuf, wxS("Invalid text buffer") );
|
||||||
|
|
||||||
@@ -1373,8 +1386,15 @@ void wxPostScriptDCImpl::DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord textDesc
|
|||||||
PsPrint( (char) c );
|
PsPrint( (char) c );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PsPrint( ")\n" );
|
PsPrint( ")" );
|
||||||
|
|
||||||
|
// Split multiline text and store individual lines in the array.
|
||||||
|
PsPrint( " (\\n) strsplit\n" );
|
||||||
|
|
||||||
|
// Print each line individually by fetching lines from the array
|
||||||
|
PsPrint( "{\n" );
|
||||||
|
// Preserve current point.
|
||||||
|
PsPrint( " currentpoint 3 -1 roll\n" ); // x y (str)
|
||||||
if (m_font.GetUnderlined())
|
if (m_font.GetUnderlined())
|
||||||
{
|
{
|
||||||
// We need relative underline position
|
// We need relative underline position
|
||||||
@@ -1394,8 +1414,13 @@ void wxPostScriptDCImpl::DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord textDesc
|
|||||||
buffer.Replace( ",", "." );
|
buffer.Replace( ",", "." );
|
||||||
PsPrint( buffer );
|
PsPrint( buffer );
|
||||||
}
|
}
|
||||||
|
PsPrint( " show\n" ); // x y
|
||||||
PsPrint("show\n");
|
// Advance to the beginning of th next line.
|
||||||
|
buffer.Printf( " %f add moveto\n", -YLOG2DEVREL(lineHeight) );
|
||||||
|
buffer.Replace( ",", "." );
|
||||||
|
PsPrint( buffer );
|
||||||
|
// Execute above statements for all elements of the array
|
||||||
|
PsPrint( "} forall\n" );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
|
void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
|
||||||
@@ -1422,7 +1447,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
|
|||||||
buffer.Replace( ",", "." );
|
buffer.Replace( ",", "." );
|
||||||
PsPrint( buffer );
|
PsPrint( buffer );
|
||||||
|
|
||||||
DrawAnyText(textbuf, text_descent);
|
DrawAnyText(textbuf, text_descent, size);
|
||||||
|
|
||||||
CalcBoundingBox( x, y );
|
CalcBoundingBox( x, y );
|
||||||
CalcBoundingBox( x + size * text.length() * 2/3 , y );
|
CalcBoundingBox( x + size * text.length() * 2/3 , y );
|
||||||
@@ -1461,7 +1486,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
|
|||||||
buffer.Replace( ",", "." );
|
buffer.Replace( ",", "." );
|
||||||
PsPrint( buffer );
|
PsPrint( buffer );
|
||||||
|
|
||||||
DrawAnyText(textbuf, text_descent);
|
DrawAnyText(textbuf, text_descent, size);
|
||||||
|
|
||||||
buffer.Printf( "%f rotate\n", -angle );
|
buffer.Printf( "%f rotate\n", -angle );
|
||||||
buffer.Replace( ",", "." );
|
buffer.Replace( ",", "." );
|
||||||
@@ -1737,6 +1762,7 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
|
|||||||
PsPrint( wxPostScriptHeaderReencodeISO2 );
|
PsPrint( wxPostScriptHeaderReencodeISO2 );
|
||||||
if (wxPostScriptHeaderSpline)
|
if (wxPostScriptHeaderSpline)
|
||||||
PsPrint( wxPostScriptHeaderSpline );
|
PsPrint( wxPostScriptHeaderSpline );
|
||||||
|
PsPrint( wxPostScriptHeaderStrSplit );
|
||||||
PsPrint( "%%EndProlog\n" );
|
PsPrint( "%%EndProlog\n" );
|
||||||
|
|
||||||
SetBrush( *wxBLACK_BRUSH );
|
SetBrush( *wxBLACK_BRUSH );
|
||||||
|
Reference in New Issue
Block a user