Skip to content

pstext -D[j|J] is broken #8921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chuan1937 wants to merge 5 commits into
base: master
Choose a base branch
from
+22 −6
Open

pstext -D[j|J] is broken #8921

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19b3ca3
add additional check for MC position in gmt_support
Chuan1937 Mar 12, 2026
5ae0e83
Merge branch 'master' into fix
Chuan1937 Mar 12, 2026
5edc4a6
Add proprietary judgments for MC
Chuan1937 Mar 13, 2026
0b4d662
Merge branch 'master' into fix
Chuan1937 Mar 13, 2026
68001cd
Add check for MC case
Chuan1937 Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/pstext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,12 @@ GMT_LOCAL void pstext_output_words (struct GMT_CTRL *GMT, struct PSL_CTRL *PSL,
gmt_setpen (GMT, &(T->vecpen));
PSL_plotsegment (PSL, x, y, x + T->x_offset, y + T->y_offset);
}
if (Ctrl->D.justify) /* Smart offset according to justification (from Dave Huang) */
gmt_smart_justify (GMT, T->block_justify, T->paragraph_angle, T->x_offset, T->y_offset, &x, &y, Ctrl->D.justify);
if (Ctrl->D.justify) { /* Smart offset according to justification (from Dave Huang) */
if (T->block_justify == PSL_MC) /* MC gives zero shift in smart justify, use simple offset */
x += T->x_offset, y += T->y_offset;
else
gmt_smart_justify (GMT, T->block_justify, T->paragraph_angle, T->x_offset, T->y_offset, &x, &y, Ctrl->D.justify);
}
else
x += T->x_offset, y += T->y_offset; /* Move to the actual reference point */
if (T->boxflag) { /* Need to lay down the box first, then place text */
Expand Down Expand Up @@ -937,8 +941,14 @@ EXTERN_MSC int GMT_pstext (void *V_API, int mode, void *args) {
else if (T.paragraph_angle < -90.0) T.paragraph_angle += 180.0;
}
if (add) {
if (Ctrl->D.justify) /* Smart offset according to justification (from Dave Huang) */
gmt_smart_justify (GMT, T.block_justify, T.paragraph_angle, T.x_offset, T.y_offset, &plot_x, &plot_y, Ctrl->D.justify);
if (Ctrl->D.justify) { /* Smart offset according to justification (from Dave Huang) */
if (T.block_justify == PSL_MC) { /* MC gives zero shift in smart justify, use simple offset */
plot_x += T.x_offset;
plot_y += T.y_offset;
}
else
gmt_smart_justify (GMT, T.block_justify, T.paragraph_angle, T.x_offset, T.y_offset, &plot_x, &plot_y, Ctrl->D.justify);
}
else { /* Default hard offset */
plot_x += T.x_offset;
plot_y += T.y_offset;
Expand Down Expand Up @@ -1350,8 +1360,14 @@ EXTERN_MSC int GMT_pstext (void *V_API, int mode, void *args) {
else if (T.paragraph_angle < -90.0) T.paragraph_angle += 180.0;
}
if (add) {
if (Ctrl->D.justify) /* Smart offset according to justification (from Dave Huang) */
gmt_smart_justify (GMT, T.block_justify, T.paragraph_angle, T.x_offset, T.y_offset, &plot_x, &plot_y, Ctrl->D.justify);
if (Ctrl->D.justify) { /* Smart offset according to justification (from Dave Huang) */
if (T.block_justify == PSL_MC) { /* MC gives zero shift in smart justify, use simple offset */
plot_x += T.x_offset;
plot_y += T.y_offset;
}
else
gmt_smart_justify (GMT, T.block_justify, T.paragraph_angle, T.x_offset, T.y_offset, &plot_x, &plot_y, Ctrl->D.justify);
}
else { /* Default hard offset */
plot_x += T.x_offset;
plot_y += T.y_offset;
Expand Down
Loading