Skip to content

Commit

Permalink
JSesh 7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rosmord committed Feb 17, 2023
1 parent 822db2b commit 51d7e3f
Show file tree
Hide file tree
Showing 153 changed files with 3,432 additions and 329 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ nb-configuration.xml
/signInfoAppli/target/
target
nbactions.xml
.sdkmanrc
18 changes: 18 additions & 0 deletions NEW.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# What's new in JSesh 7.6.1

- Fix a "bug" : on some recent screens, the "Edit" menu was too large
- Fix visual bug on high-resolution display for Mac
- Fix bug for Turkish locale
- added texts : Amduat from Thutmosis III's tomb (Thanks to Jean-Yves Barré and his students)
- added texts : Youth of Thutmosis III (J-Y Barré)
- added texts : Papyrus Chester Beatty IV (**not proofread yet**)


## About the signs from J-Y Barré's texts

There are many sign variants included in Jean-Yves Barré's texts.
You might have noticed that I'm a bit conservative as far as sign list extension go.
Most of those signs are perfectly legitimate, but I'd rather take some time before adding them.
The signs are included in the text library.
You can set the folder `texts/KV34/Complements-KV34` as Hieroglyphic folder in JSesh preferences to display them.

14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Interaction between VSCode and Maven is not that easy (again, because of generat
## Building distributions

Due to changes in Java distribution and on Windows and Mac OS X as platform
(with a strong bias against softwares not distributed through their respective
(with a strong bias against software not distributed through their respective
stores), the previous java-only distribution system has changed.

JSesh will now embed its own version of Java
Expand All @@ -85,6 +85,18 @@ JSesh distribution.

I will probably try to automate everything at some point, this being said.

### Updating data

This is only done if you are in charge of updating the JSesh text base or the JSesh sign base.
That is, you most probably don't need to do it.

To update the JSesh external data, go to the `utils` folder and type :

~~~bash
ant -f copyData.xml
~~~


------------------------------------
### Building a Mac Distribution:

Expand Down
2 changes: 1 addition & 1 deletion cupAndlex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>7.6.1</version>
</parent>
<artifactId>cupAndlex</artifactId>
<description>
Expand Down
2 changes: 1 addition & 1 deletion cupruntime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>7.6.1</version>
</parent>
<artifactId>cupruntime</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jhotdrawfw/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.6.0-SNAPSHOT</version>
<version>7.6.1</version>
</parent>
<artifactId>jhotdrawfw</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jsesh-installer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>JSesh-all</artifactId>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<version>7.6.0-SNAPSHOT</version>
<version>7.6.1</version>
</parent>
<description>
New JSesh installer builder.
Expand Down
47 changes: 36 additions & 11 deletions jsesh-installer/src/binary/texts/A_demonstration_of_the_mdc.gly
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
++JSesh_Info 1.0 +s
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_direction LEFT_TO_RIGHT +s
++JSesh_page_orientation HORIZONTAL +s
++JSesh_standard_sign_height 18.0 +s
++JSesh_line_skip 6.0 +s
++JSesh_max_quadrant_width 22.0 +s
++JSesh_use_lines_for_shading false +s
++JSesh_max_quadrant_width 22.0 +s
++JSesh_line_skip 6.0 +s
++JSesh_small_skip 2.0 +s
++JSesh_column_skip 8.0 +s
++JSesh_standard_sign_height 18.0 +s
++JSesh_small_body_scale_limit 12.0 +s
++JSesh_cartouche_line_width 1.0 +s
++JSesh_small_sign_centered false +s
++JSesh_page_direction LEFT_TO_RIGHT +s
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_orientation HORIZONTAL +s
+bJSesh Demonstration File+s-!
+lThis file (allmdc.gly) demonstrates Jsesh capabilities +s-!
+las far as the Manuel de Codage is concerned+s-!
Expand All @@ -31,7 +32,7 @@
!
+lNow, when you have a sign, should you look for the most precise variant for it, or use +s-!
+la somehow standardised one? To answer this, you should wonder if this variant is+s-!
+lrelevant, in the text, and in the use you intend to make of it. For instance, in the Kanaïs texts+s-!
+lrelevant, in the text, and in the use you intend to make of it. For instance, in the Kanaïs texts+s-!
+lby Sethi the Ist, the first person pronoun uses many variants of A40 (+s-A40-+l). If you intend the+s-!
+ltext to be for grammatical study, it's not very relevant. If you wonder whether it's a free play+s-!
+lto add diversity to the text, then you may take the time to use code the variants. As a rule,+s-!
Expand Down Expand Up @@ -291,7 +292,7 @@ xA\50-xA\50\R45-xA\\R45-xA\\50\R45-!
?800-+l<H-Z3-A19->+s-!
?800-<H-Z3-A19->-!
!
+lEnclosure (not yet drawn, but correctly read)+s-!
+lEnclosure+s-!
?800-+l<F-bA-A-y:r-i-i-Aa18-Z1-mr:r-W:t-A2-r-D:t:N17->+s-!
?800-<F-bA-A-y:r-i-i-Aa18-Z1-mr:r-W:t-A2-r-D:t:N17->-!
!
Expand All @@ -301,9 +302,13 @@ xA\50-xA\50\R45-xA\\R45-xA\\50\R45-!
+lcartouche : nothing = 0 ; no-knot : 1 ; knot : 2+s-!
?800-+l<1-ra-mn:n-xpr-1>+s-!
?800-<1-ra-mn:n-xpr-1>-!
?800-+l<1-ra-mn:n-xpr-0>-!
?800<1-ra-mn:n-xpr-0>!
?800+s-+l<2-ra-mn:n-xpr-1>+s-!
?800-+l<1-ra-mn:n-xpr-0>+s-!
?800-<1-ra-mn:n-xpr-0>-!
?800-+l<0-ra-mn:n-xpr-1>+s-!
?800-<0-ra-mn:n-xpr-1>-!
?800-+l<0-ra-mn:n-xpr-0>+s-!
?800-<0-ra-mn:n-xpr-0>-!
?800-+l<2-ra-mn:n-xpr-1>+s-!
?800-<2-ra-mn:n-xpr-1>-!
!
+lhut-sign : 0: nothing, 1: no square, 2: square in the bottom; 3: square in the top.+s-!
Expand Down Expand Up @@ -340,6 +345,8 @@ xA\50-xA\50\R45-xA\\R45-xA\\50\R45-!
?2000-+i"^pAnb" for "P+s-+tAnb+s-+i".+s-!
?2000-+iAvoid at all the direct use of the codes supported by your particular font+s-!
?2000-+i(except probably when the unicode standard for translitteration appears).+s-!
?2000-+iNote that uppercase letter in translitteration is handled in JSesh only with Unicode+s-!
?2000-+itranslitteration fonts.+s-!
!
+lExempli gratia :+s-!
?800-+l\+l this is a text \+iwith italics and \+s nTr-md-Z3A\+\+ and a comment\+s-!+s-!
Expand Down Expand Up @@ -381,6 +388,11 @@ xA\50-xA\50\R45-xA\\R45-xA\\50\R45-!
?800-+l?400-A1-?100-A2-+s-!
?400-A1-?100-A2-!
!
+bDemonstration for synoptic edition+s-+l (from Koch, Sinuhe, p. 8)+s-!
+lR+s-?500-mn:n-mn:n-t-E1:Z2-nb:t-D35:n#12-Dr:r#34-W-N31:Z2-s-?2800-|17-s-U23-m:r-W-sr-A1:Z2-nw*1-stp:z-pr-!
+lAn+s-?500-..-..-..-..-.-#b-Dr:r-rw-.-#e-+lEnde+s-!
+lAOS+s-?500-mn:n-mn:n-E1-Z3A-nb:t-Dr:r-W-W-N31:Z2-O:.-?2800-s-U23-m:r-sr-G7&&&"sic"-nw*1-stp:t*p-Y1:Z2-O:.-!
!
!!
+bEcdotic codes+s-!
+lAdded+s-!
Expand Down Expand Up @@ -415,6 +427,19 @@ xA\50-xA\50\R45-xA\\R45-xA\\50\R45-!
?800-+lp*[[*t*]]:pt_-p*[[*t:pt-]]+s-!
?800-p*[[*t*]]:pt_-p*[[*t:pt-]]-!
!
+bNotation for glyph orientation+s-!
+lIn traditional printed edition, signs are often oriented left-to-right.+s-!
+lIn this case, there are a number of specific typographical annotation to +s-!
+lindicate the original glyph layout.+s-!
?800-PF1-..-+lline of +s-+lglyphs looking toward the left (+s-A-+l)+s-!
?800-PF2-..-+lline of glyphs looking toward the right (+s-A\-+l)+s-!
?800-PF4-..-+lcolumn of glyphs looking toward the left+s-!
?800-PF5-..-+lcolumn of glyphs looking toward the right+s-!
!
+lThus, a line like :+s-!
.\0:PF2:.\0-i-w-r:a-C1-m-p*t:pt-!
+lcorresponds to an original which would be :+s-!
t*p:pt\-m\-C1\-r:a\-w\-i\-!
+bSupport for deprecated +s-+iManuel+s-+b practices+s-!
+lJSesh is able to read texts that don't follow the exact manuel de codage.+s-!
+lFor instance, it's quite forgiving about spaces.+s-!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bAbydos temple of Ramesses II. KRI II, p. 531-532.+s-!
+iTyped by S. Rosmorduc+s-!
+bLicence : Creative commons CC-BY+s-!
anx-G5&&&N6-E1:D40-C10A:N36-sw:t-bit:t-nb:N16:N16:N21*N21-nb:ir:t*x*t-<-ra-wsr-C10A-stp&n&ra->-zA&ra-nb:xa*1*1*1-<-i-mn:n:N36-C2-ms-s-s->-ir:st*A40-nb:Ab*(Dw:niwt)-U6-i-i-di-anx-!
D&&&(md*md*md)-i-A26-i-t:f:A40#12-nb:nTrw-ir:st*A40-W18-imnt-tyw&&&(1*1*1)-k:A*A2-n:t*Z4A:Y1:3-S24:z:W^^^D40-E9:t:a-Y1:3:N16:N16:N21*N21-nTr-A40E-//{{106,0,46}}**//{{98,444,55}}**[[\70**]]{{616,0,38}}**n{{96,438,66}}**]]{{464,354,35}}-//-wr:r:n-!
A40E-A40E-A40E-B7B-B7B-E9:iwa:a-mn:n:x*mnx-h/:r:pt-+lVery long lacuna+s-!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
+bAutobiography of +s-+bIneni+s-!
+bUrk. IV, 53-62+s-!
+iTyped by S. Rosmorduc+s-!
+bLicence : Creative commons CC-BY+s-!
#b-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-#e-!
#b-.-.-.-.-.-.-#e-<H-nbw->-!
s-aHa-w-O31:3-f-m-N34:N33A-!
Expand Down
2 changes: 1 addition & 1 deletion jsesh-installer/src/binary/texts/Balat 3686.gly
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
++JSesh_page_direction RIGHT_TO_LEFT +s
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_orientation VERTICAL +s
+bBalat letter 3686+s-+iTyped by S. Rosmorduc+s-+bBIFAO 98, p. 307.+s-!
+bBalat letter 3686+s-+iTyped by S. Rosmorduc+s-+bLicence : Creative commons CC-BY+s-+bBIFAO 98, p. 307.+s-!
D&d-bA:V31A-A1-i*m-di-r:x-r-Y2-t*A1-n-t*m-!
DA-D:nw*t-iw-A1*Z3A-wn-n-t-i*M40-d-nw*w-A376-D35-s-p:r:t-spr-N31*f-!
r-rwd-t-niwt-r-ir-t-wA-t-N31:t*1-HqA*A1-n-d-mi*i-E9-W-iw-!
Expand Down
12 changes: 11 additions & 1 deletion jsesh-installer/src/binary/texts/Bryce tablet.gly
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
++JSesh_Info 1.0 +s
++JSesh_use_lines_for_shading false +s
++JSesh_max_quadrant_width 22.0 +s
++JSesh_line_skip 6.0 +s
++JSesh_small_skip 2.0 +s
++JSesh_column_skip 8.0 +s
++JSesh_standard_sign_height 18.0 +s
++JSesh_small_body_scale_limit 12.0 +s
++JSesh_cartouche_line_width 1.0 +s
++JSesh_small_sign_centered false +s
++JSesh_page_direction LEFT_TO_RIGHT +s
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_orientation HORIZONTAL +s
++JSesh_small_sign_centered 0 +s
+bBryce Tablet+s-!
+bLicence : Creative commons CC-BY+s-!
+lGriffith, +s-+iPSBA +s-+lXXX, p. 272-275 and XXXI p.42+s-!
+l(note especially the Amenophis II dating in PSBA XXXI).+s-!
|1-M4-t:ra-3:Z4A-Abd:Ff304-S:mw*ra-10\R270:10\R270-3\R270-Z4A\R270-x:r-Hm-1:n-sw:t-bit:t-<-ra-aA\R90-xpr-Z3->-anx-DA-s-zA&&&sic-<-i-mn:n-Htp:t-p-nTr-HqA-iwn->-anx-D&&&(t:tA)-r:n-H-ra-H-!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_orientation HORIZONTAL +s
+bCairo, CGC 25515 (extracts)+s-++TKSESH DATABASE FILE+s-++NAME CGC 25515 (extraits)+s-++SCRIBE Serge Rosmorduc+s-++COMMENT CGC, Cerny +s-++SCRCOD 1+s-++COORDSYS $2, $1+s-!
+bLicence : Creative commons CC-BY+s-!
M4-t:zp-1-Abd:1-pr-r:t*ra-10\R270-10\R270-1*1*1:1*1*1:1*1*1-!
ii-i-i-y:D54-ir:n-pt-m:a-DA-A-i-i-W-qmA-A1:3-n:xt:x*t-A24-R22:R12-i-A1-H-n:a-x:n-sw-W-m-H-b-Hb:ra#12-#b-A1-#e-!
m-D&d-b-i-W:V31A-G6-T:z-i-i-t-rd-D54-r-t:A-p-t:pt-n-<-E21-i-i->-#b-G7-#e-!
Expand Down
2 changes: 1 addition & 1 deletion jsesh-installer/src/binary/texts/Cairo JE 67573.gly
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
++JSesh_max_quadrantHeight 18.0 +s
++JSesh_page_orientation VERTICAL +s
!
+bCairo JE 67573+s-!
+bCairo JE 67573+s-+bLicence : Creative commons CC-BY+s-!
T-z-m-E14-M42*(n:n)-stp-V16-r-Hm-#b-f-#e-!
a-b*w-A-E14-r:n-f-!
wD*w-Hm-f-q-r-s*T19-qrs-#b-f-#e-!
Expand Down
1 change: 1 addition & 0 deletions jsesh-installer/src/binary/texts/Coffin Text 160s2p.gly
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bCT 160, S2P+s-!
+ityped by S. Rosmorduc+s-!
+bLicence : Creative commons CC-BY+s-!
wA-A-H-wAH-tp*Z1:tA-t:tm-m-q:q-A2-H*s-N33-m-R10-xAst-tA:tA-t:tm-m-m-t:Z6-n-H-f-A-w-I14-!
DA-w-Y2-tp*Z1-tA:N23-aq-D54-pr:r:t-D54-m-s*b-sbA-pr:N33A-iAb*b-tyw-nw*Z1-p:t:pt-!
r:x-G30-imnt-tyw-A40:Z2-iw-r:x-k-i*A1-Dw*Z1:xAst-p:w-n-b-bA-X:w-D5:xAst-!
Expand Down
1 change: 1 addition & 0 deletions jsesh-installer/src/binary/texts/Coffin Text 404b5c.gly
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bCT404B5C+s-!
+iSerge ROSMORDUC+s-!
+bLicence : Creative commons CC-BY+s-!
r*Z1-n-z-pr:r-spr:D54-r-D54-r-s*b-sbA*pr-T8*(pr:n)-sxt:t*N23-i*A-r-w*Hn-N33*N33*N33-pt-D&d:t-n-i*r-iry-O31-A40-!
wn:n-g:S-g:S-A40-O50-y-r:n:V31A-i*nD-V31A-Hr*Z1-i*(M:m)-H-nb-A40-ir-st-t:pr-V31A-r-A50-!
w-DA*A-#b-D54-r:V31A-ii*i-#e-Ax-x-Y1-M22*(n:A50)-A50-r-b*w-r:x-Y1:n:V31A-i*m-!
Expand Down
1 change: 1 addition & 0 deletions jsesh-installer/src/binary/texts/Coffin Text 885.gly
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bCT Spell 885. S14 C+s-!
+iSerge ROSMORDUC+s-!
+bLicence : Creative commons CC-BY+s-!
x-s-U35-A24-r:r-k:I14-xa:a-I12-ra-A40-!
Ax-x:t-I12-f-tp:p-w-f-s-T:p-stp-mA-d:t-F27-!
#b-r:n-.-.-t:H8-.-#e-n-W25-n-a:f-A40-!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+bDestruction of Mankind+s-!
+ityped by Serge ROSMORDUC+s-!
+iFrom the adaptation proposed by M. Wilson+s-!
++SCRCOD 1+s-++COORDSYS $2, $1+s-#b-.-#e-nTr-A40-xpr-r-D&z:f-m-xt:x*(t:D54)-wn:n-n:f-M-sw-t:n-i&t&i:Y1-!
++SCRCOD 1+s-++COORDSYS $2, $1+s-#b-.-#e-nTr-A40-xpr-r-D&z:f-m-xt:x*(t:D54)-wn:n-n:f-M-sw-t:n-i\98**t{{276,768,100}}**i{{687,4,98}}:Y1-!
r:T-A1-B1-Z3-nTr-nTr-nTr-M-x*t:Y1:3-wa:a-t:y-A40-wn:n-i-S3-r-T:3-!
Hr:1-k-A-t-A2-md-d:t-A2-Z3-r:x*t-f:N33*3-r:a-C1-!
i-s-t:Z7-r:f-Hm-1-A40-f-anx-DA-s-i-A-G43-G43-A19-!
Expand Down
1 change: 1 addition & 0 deletions jsesh-installer/src/binary/texts/Graffito Hammamat 19v.gly
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bHammamat 19, V+s-!
+ityped by Serge ROSMORDUC+s-!
+bLicence : Creative commons CC-BY+s-!
M4-t:zp-10-Z1*Z1*Z1*Z1*Z1:Z1*Z1*Z1*Z1*Z1-x:r-Hm-n:Z1-sw:t-bit:t-<-(ra:n)*U4*(a:t)->-zA-ra-<-i*(mn:n)*m*(HAt:t)->-di-anx-Dd-wAs-ra-mi-!
wD-w-Y1v-Hm-Z1:f-ini-n:t-n:f-mn:n:nw*nw*nw-m-Dw-p:n-Q2-!
s-Z1:Y1-R14-t-i-in-xAst:t-wn:n-i:n-Z1:n-Hr:Z1-h:d-D41-!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
++JSesh_page_orientation HORIZONTAL +s
+bGraffito M. Thébaine 1400+s-!
+ityped by Serge Rosmorduc+s-!
+bLicence : Creative commons CC-BY+s-!
+i= KRI III, 641+s-!
t:A-s-st-t:pr-A1-n-Y3-k:n-A24-xpS:D40-f-!
1 change: 1 addition & 0 deletions jsesh-installer/src/binary/texts/Graffito tombe 321.gly
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
++JSesh_page_orientation HORIZONTAL +s
+bGraffito Tombe 321 DEM+s-!
+ityped by Serge Rosmorduc+s-!
+bLicence : Creative commons CC-BY+s-!
+iKRI VII, 368+s-!
rnp-t:zp-Z1-Z1-Z1-Z1-Abd:Z1-S-mw-ra-10\R270-p:S-Z9:D40-t:A-st-[[-t:O1-q:r-s-Z9:D40-n-]]-r:T-A1:3-M40-t:Z1-A1:3-#b-.-.-.-A1-H-n:a-#e-r:T-A1:3-M40-t:Z1-A1:3-xa:a\60*Y1\60-m-i-p-t:O1-A1-!
r-D37-t-W-s-t-#b-n-#e-wr:r-t-h-r:Y1-ib-Z1-ti-i-B1-M17-#b-n-#e-Y3-G5-S:r-M17-G37:A1-!
Loading

0 comments on commit 51d7e3f

Please sign in to comment.