Fossil SCM
New Pikchr that fixes text positioning on negative thickness lines.
Commit
2bdd36e4adf88b172302697840b29a406552c12055cb75bb9a5bda3ded469622
Parent
8ed25a31b41326e…
2 files changed
+4
-3
+4
-3
| --- extsrc/pikchr.c | ||
| +++ extsrc/pikchr.c | ||
| @@ -4909,10 +4909,11 @@ | ||
| 4909 | 4909 | PNum ha1 = 0.0; /* Height of the second "above" row */ |
| 4910 | 4910 | PNum hc = 0.0; /* Height of the center row */ |
| 4911 | 4911 | PNum hb1 = 0.0; /* Height of the first "below" row of text */ |
| 4912 | 4912 | PNum hb2 = 0.0; /* Height of the second "below" row */ |
| 4913 | 4913 | PNum yBase = 0.0; |
| 4914 | + PNum sw = pObj->sw>=0.0 ? pObj->sw : 0; | |
| 4914 | 4915 | int n, i, nz; |
| 4915 | 4916 | PNum x, y, orig_y, s; |
| 4916 | 4917 | const char *z; |
| 4917 | 4918 | PToken *aTxt; |
| 4918 | 4919 | unsigned allMask = 0; |
| @@ -4923,11 +4924,11 @@ | ||
| 4923 | 4924 | n = pObj->nTxt; |
| 4924 | 4925 | pik_txt_vertical_layout(pObj); |
| 4925 | 4926 | x = pObj->ptAt.x; |
| 4926 | 4927 | for(i=0; i<n; i++) allMask |= pObj->aTxt[i].eCode; |
| 4927 | 4928 | if( pObj->type->isLine ){ |
| 4928 | - hc = pObj->sw*1.5; | |
| 4929 | + hc = sw*1.5; | |
| 4929 | 4930 | }else if( pObj->rad>0.0 && pObj->type->xInit==cylinderInit ){ |
| 4930 | 4931 | yBase = -0.75*pObj->rad; |
| 4931 | 4932 | } |
| 4932 | 4933 | if( allMask & TP_CENTER ){ |
| 4933 | 4934 | for(i=0; i<n; i++){ |
| @@ -4968,11 +4969,11 @@ | ||
| 4968 | 4969 | } |
| 4969 | 4970 | } |
| 4970 | 4971 | } |
| 4971 | 4972 | } |
| 4972 | 4973 | if( pObj->type->eJust==1 ){ |
| 4973 | - jw = 0.5*(pObj->w - 0.5*(p->charWidth + pObj->sw)); | |
| 4974 | + jw = 0.5*(pObj->w - 0.5*(p->charWidth + sw)); | |
| 4974 | 4975 | }else{ |
| 4975 | 4976 | jw = 0.0; |
| 4976 | 4977 | } |
| 4977 | 4978 | for(i=0; i<n; i++){ |
| 4978 | 4979 | PToken *t = &aTxt[i]; |
| @@ -8142,6 +8143,6 @@ | ||
| 8142 | 8143 | |
| 8143 | 8144 | |
| 8144 | 8145 | #endif /* PIKCHR_TCL */ |
| 8145 | 8146 | |
| 8146 | 8147 | |
| 8147 | -#line 8172 "pikchr.c" | |
| 8148 | +#line 8173 "pikchr.c" | |
| 8148 | 8149 |
| --- extsrc/pikchr.c | |
| +++ extsrc/pikchr.c | |
| @@ -4909,10 +4909,11 @@ | |
| 4909 | PNum ha1 = 0.0; /* Height of the second "above" row */ |
| 4910 | PNum hc = 0.0; /* Height of the center row */ |
| 4911 | PNum hb1 = 0.0; /* Height of the first "below" row of text */ |
| 4912 | PNum hb2 = 0.0; /* Height of the second "below" row */ |
| 4913 | PNum yBase = 0.0; |
| 4914 | int n, i, nz; |
| 4915 | PNum x, y, orig_y, s; |
| 4916 | const char *z; |
| 4917 | PToken *aTxt; |
| 4918 | unsigned allMask = 0; |
| @@ -4923,11 +4924,11 @@ | |
| 4923 | n = pObj->nTxt; |
| 4924 | pik_txt_vertical_layout(pObj); |
| 4925 | x = pObj->ptAt.x; |
| 4926 | for(i=0; i<n; i++) allMask |= pObj->aTxt[i].eCode; |
| 4927 | if( pObj->type->isLine ){ |
| 4928 | hc = pObj->sw*1.5; |
| 4929 | }else if( pObj->rad>0.0 && pObj->type->xInit==cylinderInit ){ |
| 4930 | yBase = -0.75*pObj->rad; |
| 4931 | } |
| 4932 | if( allMask & TP_CENTER ){ |
| 4933 | for(i=0; i<n; i++){ |
| @@ -4968,11 +4969,11 @@ | |
| 4968 | } |
| 4969 | } |
| 4970 | } |
| 4971 | } |
| 4972 | if( pObj->type->eJust==1 ){ |
| 4973 | jw = 0.5*(pObj->w - 0.5*(p->charWidth + pObj->sw)); |
| 4974 | }else{ |
| 4975 | jw = 0.0; |
| 4976 | } |
| 4977 | for(i=0; i<n; i++){ |
| 4978 | PToken *t = &aTxt[i]; |
| @@ -8142,6 +8143,6 @@ | |
| 8142 | |
| 8143 | |
| 8144 | #endif /* PIKCHR_TCL */ |
| 8145 | |
| 8146 | |
| 8147 | #line 8172 "pikchr.c" |
| 8148 |
| --- extsrc/pikchr.c | |
| +++ extsrc/pikchr.c | |
| @@ -4909,10 +4909,11 @@ | |
| 4909 | PNum ha1 = 0.0; /* Height of the second "above" row */ |
| 4910 | PNum hc = 0.0; /* Height of the center row */ |
| 4911 | PNum hb1 = 0.0; /* Height of the first "below" row of text */ |
| 4912 | PNum hb2 = 0.0; /* Height of the second "below" row */ |
| 4913 | PNum yBase = 0.0; |
| 4914 | PNum sw = pObj->sw>=0.0 ? pObj->sw : 0; |
| 4915 | int n, i, nz; |
| 4916 | PNum x, y, orig_y, s; |
| 4917 | const char *z; |
| 4918 | PToken *aTxt; |
| 4919 | unsigned allMask = 0; |
| @@ -4923,11 +4924,11 @@ | |
| 4924 | n = pObj->nTxt; |
| 4925 | pik_txt_vertical_layout(pObj); |
| 4926 | x = pObj->ptAt.x; |
| 4927 | for(i=0; i<n; i++) allMask |= pObj->aTxt[i].eCode; |
| 4928 | if( pObj->type->isLine ){ |
| 4929 | hc = sw*1.5; |
| 4930 | }else if( pObj->rad>0.0 && pObj->type->xInit==cylinderInit ){ |
| 4931 | yBase = -0.75*pObj->rad; |
| 4932 | } |
| 4933 | if( allMask & TP_CENTER ){ |
| 4934 | for(i=0; i<n; i++){ |
| @@ -4968,11 +4969,11 @@ | |
| 4969 | } |
| 4970 | } |
| 4971 | } |
| 4972 | } |
| 4973 | if( pObj->type->eJust==1 ){ |
| 4974 | jw = 0.5*(pObj->w - 0.5*(p->charWidth + sw)); |
| 4975 | }else{ |
| 4976 | jw = 0.0; |
| 4977 | } |
| 4978 | for(i=0; i<n; i++){ |
| 4979 | PToken *t = &aTxt[i]; |
| @@ -8142,6 +8143,6 @@ | |
| 8143 | |
| 8144 | |
| 8145 | #endif /* PIKCHR_TCL */ |
| 8146 | |
| 8147 | |
| 8148 | #line 8173 "pikchr.c" |
| 8149 |
| --- extsrc/pikchr.wasm | ||
| +++ extsrc/pikchr.wasm | ||
| cannot compute difference between binary files | ||
| 1 | 1 |
| --- extsrc/pikchr.wasm | |
| +++ extsrc/pikchr.wasm | |
| 0 | annot compute difference between binary files |
| 1 |
| --- extsrc/pikchr.wasm | |
| +++ extsrc/pikchr.wasm | |
| 0 | annot compute difference between binary files |
| 1 |