Merge lp:~stellarium/stellarium/star-names-scheme-v2 into lp:stellarium

Proposed by Alexander Wolf
Status: Merged
Merged at revision: 8681
Proposed branch: lp:~stellarium/stellarium/star-names-scheme-v2
Merge into: lp:stellarium
Diff against target: 1511 lines (+943/-351)
9 files modified
skycultures/western/CMakeLists.txt (+3/-3)
skycultures/western/reference.fab (+14/-0)
skycultures/western/star_names.fab (+765/-333)
src/core/StelSkyCultureMgr.cpp (+15/-4)
src/core/StelSkyCultureMgr.hpp (+1/-1)
src/core/modules/StarMgr.cpp (+122/-9)
src/core/modules/StarMgr.hpp (+19/-0)
src/core/modules/StarWrapper.cpp (+4/-0)
stars/default/name.fab (+0/-1)
To merge this branch: bzr merge lp:~stellarium/stellarium/star-names-scheme-v2
Reviewer Review Type Date Requested Status
gzotti Pending
Stellarium Pending
Review via email: mp+305733@code.launchpad.net

Commit message

Implementation for support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.

Description of the change

Current branch has implementation support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'skycultures/western/CMakeLists.txt'
--- skycultures/western/CMakeLists.txt 2013-04-24 06:43:39 +0000
+++ skycultures/western/CMakeLists.txt 2016-09-14 16:38:20 +0000
@@ -1,12 +1,12 @@
11
2########### install files ###############2########### install files ###############
33
4# install info.ini and star_names.fab4# install info.ini
5INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/western )5INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/western )
66
7# install constellations data, artwork and descriptions7# install constellations data, artwork and descriptions
8INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western8INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western
9 FILES_MATCHING PATTERN "constellation*" 9 FILES_MATCHING PATTERN "*.fab"
10 PATTERN "*.png" 10 PATTERN "*.png"
11 PATTERN "description.*.utf8" 11 PATTERN "description.*.utf8"
12 PATTERN "CMakeFiles" EXCLUDE )12 PATTERN "CMakeFiles" EXCLUDE )
1313
=== added file 'skycultures/western/reference.fab'
--- skycultures/western/reference.fab 1970-01-01 00:00:00 +0000
+++ skycultures/western/reference.fab 2016-09-14 16:38:20 +0000
@@ -0,0 +1,14 @@
1# Reference file for Western skyculture
2# Format:
3# Link number | Description (Link name) | URL (if exists)
4 1|Kunitzsch, P.; Smart T. (2006). "A Dictionary of Modern star Names: A Short Guide to 254 Star Names and Their Derivations" (2nd rev. ed.). Cambridge, MA: Sky Pub. ISBN 978-1-931559-44-7.|
5 2|Allen, R. H. (1963). "Star Names: Their Lore and Meaning" (rep. ed.). New York, NY: Dover Publications Inc. ISBN 0-486-21079-0.|
6 3|2000, A&AS, 143, 9, "The SIMBAD astronomical database", Wenger et al.|http://adsabs.harvard.edu/abs/2000A%26AS..143....9W
7 4|Final Results of NameExoWorlds Public Vote Released|http://www.iau.org/news/pressreleases/detail/iau1514/
8 5|STARS by Jim Kaler, Prof. Emeritus of Astronomy, University of Illinois|http://stars.astro.illinois.edu/sow/sowlist.html
9 6|IAU Catalog of Star Names (IAU-CSN)|http://www.pas.rochester.edu/~emamajek/WGSN/IAU-CSN.txt
10 7|Covington, Michael (2002). Celestial Objects for Modern Telescopes: Practical Amateur Astronomy. Cambridge University Press.|https://books.google.com/books?id=ql7wLq1fP5QC&pg=PA209
11 8|"61 Cyg (Piazzi's Flying Star)". Science&Space News. Retrieved June 1, 2015.|http://news.sky-map.org/starview?object_type=1&object_id=2282&object_name=HD+201091&locale=EN
12 9|Kruger 60|https://en.wikipedia.org/wiki/Kruger_60
13 10|List of Named Stars in Alphabetical Order|http://www.astro.wisc.edu/~dolan/constellations/starname_list.html
14 11|Jack W. Rhoads - Technical Memorandum 33-507-A Reduced Star Catalog Containing 537 Named Stars, Jet Propulsion Laboratory, California Institute of Technology; November 15, 1971|http://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19720005197_1972005197.pdf
015
=== modified file 'skycultures/western/star_names.fab'
--- skycultures/western/star_names.fab 2016-02-27 05:39:35 +0000
+++ skycultures/western/star_names.fab 2016-09-14 16:38:20 +0000
@@ -1,339 +1,771 @@
1 677|_("Alpheratz")1# star names by constellation
2 746|_("Caph")2# Andromeda (And)
3 1067|_("Algenib")3 677|_("Alpheratz") 1,2,5,6,11
4 1562|_("Deneb Kaitos Shemali")4 677|_("Sirrah")
5 2081|_("Ankaa")5 5447|_("Mirach") 1,2,5,6,11
6 9640|_("Almach") 1,2,5,6,11
7 9640|_("Almaak")
8 6411|_("Adhil") 1,2,6,11
9 7607|_("Nembus") 2,11
10 7513|_("Titawin") 4,6
11116076|_("Veritate") 4,6
12 6999|_("Thail") 11
13# Aquarius (Aqr)
14109074|_("Sadalmelik") 1,2,6,11
15106278|_("Sadalsuud") 1,2,6,11
16110395|_("Sadachbia") 1,2,6,11
17113136|_("Skat") 1,2,6,11
18102618|_("Albali") 1,2,11
19110003|_("Ancha") 1,2,11
20111710|_("Situla") 1,2,11
21110960|_("Sadaltager") 2,11
22110960|_("Alsad")
23112961|_("Hydor") 5
24104459|_("Albulan II") 2,11
25104459|_("Albulaan") 2,11
26103045|_("Albulan I") 2,11
27103045|_("Albulaan") 2,11
28106786|_("Bunda") 2
29108874|_("Sadalmulk") 2,11
30108874|_("Al Sa'd al Mulk")
31110672|_("Seat") 2,11
32# Aquila (Aql)
33 97649|_("Altair") 1,2,6,11
34 98036|_("Alshain") 1,2,6,11
35 97278|_("Tarazed") 1,2,6,11
36 97278|_("Reda")
37 97938|_("Libertas") 4,6
38 93805|_("Al Thalimain Prior") 2,5,11
39 93805|_("Al Thalimain I")
40 96468|_("Al Thalimain Posterior") 2,5,11
41 96468|_("Al Thalimain II")
42 93747|_("Deneb al Okab Australis") 5,10
43 93747|_("Deneb el Okab")
44 93244|_("Deneb al Okab Borealis") 5,10
45 93244|_("Deneb el Okab")
46 95501|_("Almizan I") 11
47 97804|_("Almizan II") 11
48 99473|_("Almizan III") 11
49# Ara (Ara)
50 86796|_("Cervantes") 4,6
51# Aries (Ari)
52 9884|_("Hamal") 1,2,6,11
53 8903|_("Sheratan") 1,2,6,11
54 8832|_("Mesarthim") 1,2,6,11
55 14838|_("Botein") 1,2,11
56 12489|_("Barani I") 11
57 12719|_("Barani II") 11
58 13061|_("Barani III") 11
59 13209|_("Nair al Butain") 11
60 13914|_("Al Butain III") 11
61 15110|_("Al Butain IV") 11
62 12640|_("Koleon") 11
63 13165|_("Al Butain I") 11
64 13702|_("Al Butain II") 11
65# Auriga (Aur)
66 24608|_("Capella") 1,2,6,11
67 28360|_("Menkalinan") 1,2,6,11
68 23015|_("Hassaleh") 1,11
69 23015|_("Kabalinan")
70 23453|_("Haedus") 2,5,11
71 23453|_("Haedus I")
72 23416|_("Almaaz") 2,3,5,11
73 23416|_("Al Ma'az")
74 23416|_("Alanz")
75 23767|_("Haedus II") 5,11
76 28380|_("Mahasim") 11
77 24813|_("Alhiba II") 11
78 24340|_("Alhiba I") 11
79 25292|_("Alhiba III") 11
80 30520|_("Dolones I") 11
81 31832|_("Dolones III") 11
82 31789|_("Dolones II") 11
83 32173|_("Dolones IV") 11
84 32480|_("Dolones V") 11
85 32562|_("Dolones VI") 11
86 32844|_("Dolones VII") 11
87 33133|_("Dolones VIII") 11
88 33377|_("Dolones IX") 11
89# Bootes (Boo)
90 69673|_("Arcturus") 1,2,6,11
91 73555|_("Nekkar") 1,2,6,11
92 71075|_("Seginus") 1,2,5,6,10,11
93 71075|_("Haris")
94 71075|_("Ceginus")
95 72105|_("Izar") 1,2,6,11
96 72105|_("Pulcherrima")
97 67927|_("Muphrid") 1,2,11
98 75411|_("Alkalurops") 1,2,6,11
99 72487|_("Merga") 1,2,11
100 70497|_("Asellus Primus") 2,5,11
101 69713|_("Asellus Secundus") 2,5,11
102 69483|_("Asellus Tertius") 2,5,11
103 74666|_("Thiba") 11
104 69732|_("Aulad Althiba") 11
105 76534|_("Ceginus") 11
106 73745|_("Aulad Alnathlat") 11
107# Camelopardalis (Cam)
108 58952|_("Tonatiuh") 4,6
109# Cancer (Cnc)
110 44066|_("Acubens") 1,2,6,11
111 44066|_("Sertan")
112 42806|_("Asellus Borealis") 1,5,11
113 42806|_("Ascellus Borealis")
114 42911|_("Asellus Australis") 1,5,11
115 42911|_("Ascellus Australis")
116 40167|_("Tegmine") 1,2,11
117 40526|_("Al Tarf") 2,3,5,10,11
118 40526|_("Altarf")
119 43587|_("Copernicus") 4,6
120 42556|_("Almalaf") 11
121 43103|_("Zubanah") 11
122 40881|_("Piautos") 11
123 44946|_("Nahn") 11
124# Canes Venatici (CVn)
125 63125|_("Cor Caroli") 1,2,6,11
126 61317|_("Chara") 1,2,6,11
127 62223|_("La Superba") 2,11
128# Canis Major (CMa)
129 32349|_("Sirius") 1,2,6,11
130 30324|_("Mirzam") 1,2,6,11
131 34045|_("Muliphein") 1,2,5,6,11
132 34045|_("Mirza")
133 34444|_("Wezen") 1,2,6,11
134 33579|_("Adhara") 1,2,6,11
135 30122|_("Furud") 1,2,6,11
136 35904|_("Aludra") 1,2,6,11
137 33345|_("Isis") 2,11
138 33152|_("Udra") 11
139 33977|_("Al Zara") 11
140# Canis Minor (CMi)
141 37279|_("Procyon") 1,2,6,11
142 36188|_("Gomeisa") 1,2,6,11
143 36208|_("Luyten's Star") 3
144# Capricornus (Cap)
145100027|_("Prima Giedi") 2,11
146100064|_("Algedi") 1,2,6,10,11
147100064|_("Secunda Giedi")
148100345|_("Dabih") 1,2,6,11
149100345|_("Dabih Major")
150100325|_("Dabih Minor") 2,11
151106985|_("Nashira") 1,2,6,11
152107556|_("Deneb Algedi") 1,2,11
153100310|_("Al Shat") 2,3,5,10,11
154100310|_("Alshat")
155# Carina (Car)
156 30438|_("Canopus") 1,6,11
157 30438|_("Suhel")
158 45238|_("Miaplacidus") 1,6,11
159 41037|_("Avior") 1,6,11
160 45556|_("Aspidiske") 1,6,11
161 55042|_("Innes' Star") 3
162# Cassiopeia (Cas)
163 3179|_("Shedar") 1,2,5,6,10,11
6 3179|_("Shedir")164 3179|_("Shedir")
7 3419|_("Diphda")165 746|_("Caph") 1,2,6,11
8 3821|_("Achird")166 6686|_("Ruchbah") 1,2,6,11
9 3829|_("van Maanen 2")167 6686|_("Ksora")
10 4427|_("Navi")168 3821|_("Achird") 1
169 8886|_("Segin") 1,11
170 5542|_("Marfak") 2,5,11
171 5542|_("Marfak-East")
172 5336|_("Marfak") 2,5,11
173 5336|_("Marfak-West")
174 5336|_("Al Marfak")
175 4427|_("Navi") 11
176# Centaurus (Cen)
177 71683|_("Rigil Kentaurus") 1,2,11
178 71683|_("Toliman")
179 71683|_("Bungula")
180 70890|_("Proxima") 1,6
181 68702|_("Hadar") 1,2,6,11
182 68702|_("Agena")
183 61932|_("Muhlifain") 1,11
184 68002|_("Alnair") 1,11
185 68002|_("Baten Kentaurus")
186 68933|_("Menkent") 1,6,11
187 56709|_("Przybylski's Star") 3
188# Cepheus (Cep)
189105199|_("Alderamin") 1,2,6,11
190106032|_("Alfirk") 1,2,6,11
191116727|_("Errai") 1,2,6,11
192107259|_("The Garnet Star") 1,2,11
193107259|_("Erakis")
194108917|_("Kurhah") 1,2,5,11
195108917|_("Al Kurhah")
196111056|_("Al Kalb al Rai") 2,11
197111056|_("Kalbalrai")
198107418|_("Castula") 2
199110893|_("Kruger 60") 9
200102422|_("Kabalfird") 11
201101093|_("Al Kidr") 11
202 99255|_("Al Aghnam I") 11
203114222|_("Al Aghnam II") 11
204# Cetus (Cet)
205 14135|_("Menkar") 1,2,6,11
206 3419|_("Diphda") 1,2,5,6,11
207 3419|_("Deneb Kaitos")
208 8645|_("Baten Kaitos") 1,2,11
209 10826|_("Mira") 1,2,6,11
210 12706|_("Al Kaff al Jidhmah") 2,5,11
211 12706|_("Kaffaljidhma")
212 12706|_("Kafalgidma")
213 5364|_("Dheneb") 2,5,11
11 5364|_("Deneb Algenubi")214 5364|_("Deneb Algenubi")
12 5447|_("Mirach")215 1562|_("Deneb Kaitos Shemali") 2,10,11
13 5542|_("Marfark")216 1562|_("Schemali")
14 6411|_("Adhil")217 1562|_("Deneb Kaitos")
15 6686|_("Ruchbah")218 13954|_("Menkar") 2,10,11
16 7097|_("Kullat Nunu")219 13954|_("Menkab")
17 7588|_("Achernar")220 12387|_("Al Kaff al Jidhmah III") 11
18 7607|_("Nembus")221 12390|_("Sadr al Kaitos III") 11
19 8198|_("Torcularis Septentrionalis")222 6537|_("Al Naymat I") 11
20 8645|_("Baten Kaitos")223 12828|_("Al Kaff al Jidhmah IV") 11
21 8796|_("Mothallah")224 10324|_("Al Kaff al Jidhmah I") 11
22 8832|_("Mesarthim")225 11484|_("Al Kaff al Jidhmah II") 11
23 8903|_("Sheratan")226 12770|_("Sadr al Kaitos IV") 11
24 9487|_("Alrischa")227 11345|_("Sadr al Kaitos I") 11
25 9640|_("Almaak")228 11783|_("Sadr al Kaitos II") 11
26 9884|_("Hamal")229 8102|_("Al Naymat II") 11
27 10826|_("Mira")230 9347|_("Al Naymat III") 11
28 11767|_("Polaris")231 3455|_("Alnitham I") 11
29 12706|_("Kaffaljidhma")232 3909|_("Alnitham II") 11
30 13268|_("Miram")233 4371|_("Alnitham III") 11
31 13288|_("Angetenar")234 4587|_("Alnitham IV") 11
32 13701|_("Azha")235# Columba (Col)
33 13847|_("Acamar")236 26634|_("Phact") 1,2,6,11
34 13879|_("Gorgonea Secunda")237 27628|_("Wazn") 1,2,6,11
35 14135|_("Menkar")238 29034|_("Kurud I") 11
36 14354|_("Gorgonea Tertia")239 29807|_("Kurud II") 11
37 14576|_("Algol")240# Coma Berenices (Com)
38 14668|_("Misam")241 62763|_("Polaris Galacticum Borealis") 5
39 14817|_("Gorgonea Quarta")242 64241|_("Diadem") 3,5,10,11
40 14838|_("Botein")243 61071|_("Kissin") 11
41 15197|_("Zibal")244 60742|_("Al Dafirah") 11
42 15863|_("Mirphak")245# Corona Australis (CrA)
43 17378|_("Rana")246 94114|_("Alfecca Meridiana") 2,5,10,11
44 17448|_("Atik")247# Corona Borealis (CrB)
45 17489|_("Celaeno")248 76267|_("Alphecca") 1,2,5,6,10,11
46 17499|_("Electra")249 76267|_("Gemma")
47 17531|_("Taygeta")250 76267|_("Alphekka")
48 17573|_("Maia")251 76267|_("Gnosia")
49 17579|_("Asterope")252 75695|_("Nusakan") 1,2,11
50 17608|_("Merope")253 77442|_("Variablis Coronae") 11
51 17702|_("Alcyone")254 78322|_("Blaze Star") 11
52 17847|_("Atlas")255# Corvus (Crv)
53 17851|_("Pleione")256 59199|_("Alchiba") 1,2,11
54 18543|_("Zaurak")257 59199|_("Al Chiba") 1,2
55 18614|_("Menkib")258 59803|_("Gienah Corvi") 1,2,5,10,11
56 19587|_("Beid")259 59803|_("Gienah")
57 19849|_("Keid")260 59803|_("Gienah Ghurab")
58 20205|_("Hyadum I")261 60965|_("Algorab") 1,2,6,11
59 20455|_("Hyadum II")262 61359|_("Kraz") 1,11
60 20648|_("Cleeia")263 59316|_("Minkar") 3,5,10,11
61 20889|_("Ain")264# Crater (Crt)
62 21393|_("Theemim")265 53740|_("Alkes") 1,2,11
63 21421|_("Aldebaran")266 54682|_("Al Sharasif") 2,11
64 21594|_("Sceptrum")267 54682|_("Al Sharasif II")
65 22449|_("Tabit")268# Crux (Cru)
66 23015|_("Hassaleh")269 60718|_("Acrux") 1,2,6,11
67 23203|_("Hind's Crimson Star")270 62434|_("Mimosa") 1,6,11
68 23416|_("Almaaz")271 61084|_("Gacrux") 1,6,11
69 23453|_("Haedus")272# Cygnus (Cyg)
70 23767|_("Hoedus II")273102098|_("Deneb") 1,2,6,11
71 23875|_("Cursa")274102098|_("Arided")
72 24186|_("Kapteyn's Star")275102098|_("Aridif")
73 24436|_("Rigel")276 95947|_("Albireo") 1,2,6,11
74 24608|_("Capella")277100453|_("Sadr") 1,2,6,11
75 25336|_("Bellatrix")278102488|_("Gienah Cygni") 1,2,5,11
76 25428|_("Alnath")279102488|_("Gienah")
77 25606|_("Nihal")280102488|_("Al Janah")
78 25923|_("Thabit")281107136|_("Azelfafage") 1,2,11
79 25930|_("Mintaka")282107136|_("Azelfage")
80 25945|_("Ruby Star")283101138|_("Ruchba") 2,11
81 25985|_("Arneb")284101138|_("Rucba")
82 26207|_("Meissa")285104217|_("Bessel's Star") 7,8
83 26241|_("Hatsya")286104217|_("Piazzi's Flying Star")
84 26311|_("Alnilam")287 96295|_("Campbell's Star") 3
85 26634|_("Phact")288 96295|_("Campbell’s Hydrogen Star")
86 26727|_("Alnitak")289100044|_("Revenate of the Swan") 11
87 27366|_("Saiph")290 97165|_("Fawaris II") 11
88 27628|_("Wazn")291104732|_("Fawaris III") 11
89 27989|_("Betelgeuse")292 94779|_("Fawaris I") 11
90 28360|_("Menkalinan")293# Delphinus (Del)
91 29034|_("Al Kurud")294101958|_("Sualocin") 1,2,11
92 29655|_("Propus")295101958|_("Svalocin")
93 30089|_("Red Rectangle")296101769|_("Rotanev") 1,2,11
94 30122|_("Furud")297103527|_("Musica") 4,6
95 30324|_("Mirzam")298101421|_("Deneb Dulfim") 5,10,11
96 30343|_("Tejat")299102532|_("Al Salib") 11
97 30438|_("Canopus")300102281|_("Al Ukud") 11
98 31646|_("Plaskett's star")301# Draco (Dra)
99 31681|_("Alhena") 302 68756|_("Thuban") 1,2,5,6,11
100 32246|_("Mebsuta")303 68756|_("Adib")
101 32349|_("Sirius")304 68756|_("Al Tinnin")
305 85670|_("Rastaban") 1,2,6,11
306 85670|_("Alwaid")
307 87833|_("Eltanin") 1,2,3,5,6,11
308 87833|_("Etamin")
309 87833|_("Taurt")
310 94376|_("Altais") 1,2,6,11
311 94376|_("Al Tais")
312 75458|_("Edasich") 1,2,6,11
313 56211|_("Giausar") 1,2,11
314 56211|_("Giansar")
315 56211|_("Nodus Secundus")
316 83608|_("Alrakis") 1,2,11
317 83608|_("Arrakis")
318 83608|_("Errakis")
319 87585|_("Grumium") 1,2,11
320 85819|_("Kuma") 1
321 97433|_("Tyl") 1,11
322 96100|_("Alsafi") 2,11
323 86614|_("Dziban I") 2,10,11
324 86614|_("Dsiban")
325 86614|_("Dziban")
326 86620|_("Dziban II") 2,11
327 86620|_("Dsiban")
328 86201|_("Al Dhih") 2,11
329 86201|_("Adfar Aldib II")
330 90344|_("Fafnir") 4,6
331 83895|_("Al Dhibain Posterior") 3,5,10,11
332 83895|_("Aldhibah")
333 83895|_("Dhibah")
334 80331|_("Al Dhibain Prior") 5,11
335 80331|_("Dhibain")
336 85805|_("Adfar Aldib I") 11
337 95081|_("Tais I") 11
338 98702|_("Tais II") 11
339 94648|_("Athafi II") 11
340 92782|_("Athafi I") 11
341 89908|_("Aldhiba") 11
342 89937|_("Alahakan") 11
343# Equuleus (Equ)
344104987|_("Kitalpha") 1,2,6,11
345# Eridanus (Eri)
346 7588|_("Achernar") 1,2,6,11
347 23875|_("Cursa") 1,2,6,11
348 18543|_("Zaurak") 1,2,6,11
349 15197|_("Zibal") 1,11
350 13701|_("Azha") 1,2,11
351 13847|_("Acamar") 1,2,6,11
352 13847|_("Dalim")
353 19587|_("Beid") 1,2,11
354 19849|_("Keid") 1,2,11
355 20535|_("Theemin") 1,2,11
356 20535|_("Theemim")
357 20535|_("Beemim II")
358 13288|_("Angetenar") 2,11
359 21248|_("Beemim") 2,11
360 21248|_("Beemim III")
361 16537|_("Ran") 4,6
362 17378|_("Rana") 3,10,11
363 21594|_("Sceptrum") 3,10,11
364 23972|_("Kursi al Jauzah II") 11
365 14060|_("Aludhi I") 11
366 14168|_("Aludhi II") 11
367 14293|_("Aludhi III") 11
368 20042|_("Beemim I") 11
369 23364|_("Kursi al Jauzah I") 11
370# Gemini (Gem)
371 36850|_("Castor") 1,2,6,11
372 37826|_("Pollux") 1,2,6,11
373 31681|_("Alhena") 1,2,6,11
374 31681|_("Almeisan")
375 35550|_("Wasat") 1,2,6,11
376 32246|_("Mebsuta") 1,2,6,11
377 34088|_("Mekbuda") 1,2,11
378 29655|_("Propus") 1,2,6,10,11
379 29655|_("Tejat Prior")
380 29655|_("Praepes")
381 30343|_("Tejat") 1,2,11
382 30343|_("Tejat Posterior")
383 30343|_("Calx")
384 32362|_("Al Zirr") 2,5,10,11
102 32362|_("Alzirr")385 32362|_("Alzirr")
103 33579|_("Adhara")386 30883|_("Nucatai") 11
104 34045|_("Muliphein")387# Grus (Gru)
105 34088|_("Mekbuda")388109268|_("Alnair") 1,2,6,11
106 34444|_("Wezen")389109268|_("Al Na'ir")
107 35264|_("Tureis")390108085|_("Al Dhanab") 2,11
108 35488|_("Bernes 135")391108085|_("Deneb Hut")
109 35550|_("Wasat")392112122|_("Deneb Alnahr") 11
110 35904|_("Aludra")393# Hercules (Her)
111 36188|_("Gomeisa")394 84345|_("Rasalgethi") 1,2,6,11
112 36208|_("Luyten's Star")395 84345|_("Ras Algethi")
113 36850|_("Castor")396 80816|_("Kornephoros") 1,2,6,11
114 37229|_("Markeb")397 80816|_("Rutilicus")
115 37279|_("Procyon")398 79043|_("Marsic") 1,2,5,11
116 37826|_("Pollux")399 79043|_("Marfik")
117 38170|_("Asmidiske")400 85693|_("Maasym") 1,2,11
118 39429|_("Naos")401 85693|_("Masym")
119 39953|_("Regor")402 80463|_("Cujam") 1,2,11
120 40167|_("Tegmine")403 84379|_("Sarin") 1,11
121 40526|_("Tarf")404 80838|_("Ogma") 4,6
122 41037|_("Avior")405 80170|_("Nasak Shamiya III") 11
123 41075|_("Alsciaukat")406# Hydra (Hya)
124 41704|_("Muscida")407 46390|_("Alphard") 1,2,6,11
125 42402|_("Minchir")408 46982|_("Ukdah III") 11
126 42806|_("Asellus Borealis")409 42313|_("Minazal I") 11
127 42911|_("Asellus Australis")410 43109|_("Minazal III") 11
128 43813|_("Hydrobius")411 43813|_("Minazal V") 11
129 44066|_("Acubens")412 42799|_("Minazal II") 11
130 44127|_("Talitha")413 47431|_("Ukdah IV") 11
131 44816|_("Suhail")414 47452|_("Al Sharasif I") 11
132 45238|_("Miaplacidus")415 43234|_("Minazal IV") 11
133 45556|_("Aspidiske")416 42402|_("Minkalshuja") 11
134 46390|_("Alphard")417 46509|_("Ukdah I") 11
135 46750|_("Alterf")418 46776|_("Ukdah II") 11
136 47508|_("Subra")419# Indus (Ind)
137 47908|_("Algenubi")420101772|_("Persian") 2,5
138 48455|_("Rasalas")421# Lacerta (Lac)
139 48774|_("Tseen Ke")422112247|_("Babcock's Star") 3
140 49669|_("Regulus")423# Leo (Leo)
141 49583|_("Al'dzhabkhakh")424 49669|_("Regulus") 1,2,6,11
142 50335|_("Adhafera")425 57632|_("Denebola") 1,2,6,11
143 50372|_("Tania Borealis")426 50583|_("Algieba") 1,2,6,11
144 50583|_("Algieba")427 54872|_("Zosma") 1,2,6,11
145 50801|_("Tania Australis")428 54872|_("Duhr")
146 53229|_("Praecipua")429 50335|_("Adhafera") 1,2,6,11
147 53740|_("Alkes")430 54879|_("Chertan") 1,2,6,11
148 53910|_("Merak")431 54879|_("Al Haratan")
149 54061|_("Dubhe")432 54879|_("Coxa")
150 54872|_("Zosma")433 46750|_("Alterf") 1,2,11
151 54879|_("Chertan")434 48455|_("Rasalas") 1,2,11
152 55042|_("Innes' Star")435 48455|_("Alshemali")
153 55203|_("Alula Australis")436 47508|_("Subra") 1,11
154 55219|_("Alula Borealis")437 47908|_("Algenubi") 2,11
155 55282|_("Labr")438 46146|_("Al Minlear al Asad") 5,11
156 56211|_("Giausar")439 46146|_("Minkarasad")
157 56709|_("Przybylski's Star")440 54951|_("Zubrah") 11
158 57399|_("Alkaphrah")441 49583|_("Al Jabhah") 11
159 57632|_("Denebola")442# Leo Minor (LMi)
160 57757|_("Zavijava")443 53229|_("Praecipua") 5,10
161 58001|_("Phad")444# Lepus (Lep)
162 59199|_("Alchiba")445 25985|_("Arneb") 1,2,6,11
163 59316|_("Minkar")446 25606|_("Nihal") 1,2,6,11
164 59774|_("Megrez")447 23203|_("Hind's Crimson Star") 2,5,11
165 59803|_("Gienah")448 27072|_("Kursi al Jabbar") 11
166 60129|_("Zaniah")449 27654|_("Arsh al Jauzah") 11
167 60718|_("Acrux")450# Libra (Lib)
168 60965|_("Algorab")451 72603|_("Zubenelgenubi I") 1,2,6,11
169 61084|_("Gacrux")
170 61317|_("Chara")
171 61359|_("Kraz")
172 61941|_("Porrima")
173 62223|_("La Superba")
174 62434|_("Mimosa")
175 62956|_("Alioth")
176 63090|_("Auva")
177 63125|_("Cor Caroli")
178 63608|_("Vindemiatrix")
179 64241|_("Diadem")
180 65378|_("Mizar")
181 65474|_("Spica")
182 65477|_("Alcor")
183 66249|_("Heze")
184 67301|_("Alkaid")
185 67927|_("Muphrid")
186 68702|_("Hadar")
187 68756|_("Thuban")
188 68933|_("Menkent")
189 69673|_("Arcturus")
190 69483|_("Asellus Tertius")
191 69701|_("Syrma")
192 69713|_("Asellus Secundus")
193 69974|_("Khambaliya")
194 70497|_("Asellus Primus")
195 70890|_("Proxima")
196 71075|_("Seginus")
197 71683|_("Rigil Kent")
198 71957|_("Rijl al Awwa")
199 72105|_("Izar")
200 72487|_("Merga")
201 72603|_("Zubenelgenubi")452 72603|_("Zubenelgenubi")
202 72607|_("Kochab")453 72622|_("Zubenelgenubi II") 1,2,6,11
203 72622|_("Zubenelgenubi")454 72622|_("Zubenelgenubi")
204 73473|_("Zuben Elakribi")455 74785|_("Zubeneschamali") 1,2,6,11
205 73555|_("Nekkar")456 73714|_("Brachium") 3,11
206 73714|_("Brachium")457 73714|_("Zuben Acrabi")
207 73945|_("Zuben Hakrabi")458 73473|_("Zuben Elakribi") 10
208 74666|_("Printseps")459 76333|_("Zuben Elakrab") 10
209 74785|_("Zubeneschamali")460 76333|_("Zuben Hakraki")
210 74793|_("Pherkad Minor")461 73945|_("Zuben Hakrabi") 11
211 75097|_("Pherkad")462# Lynx (Lyn)
212 75411|_("Alkalurops")463 41075|_("Alsciaukat") 3,5,10,11
213 75415|_("Inkalunis")464 41075|_("Mabsuthat")
214 75458|_("Edasich")465 41075|_("Shaukah")
215 75695|_("Nusakan")466 33485|_("Dolones X") 11
216 76267|_("Alphekka")467# Lyra (Lyr)
217 76333|_("Zuben Elakrab")468 91262|_("Vega") 1,2,6,11
218 76534|_("Ceginus")469 92420|_("Sheliak") 1,2,6,11
219 77070|_("Unukalhai")470 93194|_("Sulafat") 1,2,6,11
220 78401|_("Dschubba")471 93194|_("Jugum")
221 78727|_("Graffias")472 94481|_("Aladfar") 2,5,11
222 78820|_("Acrab")473 90191|_("Al Athfar") 2,3,5,10,11
223 79043|_("Marsik")474 90191|_("Alathfar")
224 79374|_("Jabbah")475 90191|_("Athfar")
225 79593|_("Yed Prior")476 91919|_("Double Double I") 10,11
226 79882|_("Yed Posterior")477 91926|_("Double Double II") 10,11
478 91971|_("Nasr Alwaki I") 11
479 91973|_("Nasr Alwaki II") 11
480# Monoceros (Mon)
481 31646|_("Plaskett's Star") 3,5
482 30089|_("Red Rectangle") 3
483# Octanus (Oct)
484104382|_("Polaris Australis") 5
485# Ophiuchus (Oph)
486 86032|_("Rasalhague") 1,2,6,11
487 86742|_("Cebalrai") 1,2,6,11
488 79593|_("Yed Prior") 1,2,11
489 79882|_("Yed Posterior") 1,2,11
490 84012|_("Sabik") 1,2,6,11
491 80883|_("Marfik") 1,2,5,11
492 87108|_("Muliphen") 2,5,11
493 87937|_("Barnard's Star") 3
494 81377|_("Saik") 11
495 84970|_("Garafsa") 11
496 84893|_("Aggia") 11
497# Orion (Ori)
498 27989|_("Betelgeuse") 1,2,6,11
499 24436|_("Rigel") 1,2,6,11
500 25336|_("Bellatrix") 1,2,6,11
501 25930|_("Mintaka") 1,2,6,11
502 26311|_("Alnilam") 1,2,6,11
503 26727|_("Alnitak") 1,2,6,11
504 27366|_("Saiph") 1,2,6,11
505 26207|_("Meissa") 1,2,6,11
506 26207|_("Heka")
507 26241|_("Hatysa") 1,3,11
508 25923|_("Thabit") 2,10,11
509 22449|_("Tabit") 3,10,11
510 26237|_("Mizan Batil I") 11
511 26563|_("Mizan Batil III") 11
512 22833|_("Manica") 11
513 25281|_("Saif al Jabbar") 11
514 26220|_("Trapezium") 11
515 26235|_("Mizan Batil II") 11
516 22667|_("Al Kumm I") 11
517 22957|_("Al Kumm II") 11
518 22845|_("Al Taj IV") 11
519 22509|_("Al Taj I") 11
520 22549|_("Al Taj II") 11
521 22797|_("Al Taj III") 11
522 23123|_("Al Taj V") 11
523 26176|_("Heka") 11
524# Pavo (Pav)
525100751|_("Peacock") 1,6,11
526# Pegasus (Peg)
527113963|_("Markab") 1,2,6,11
528113963|_("Yed Alpheras")
529113881|_("Scheat") 1,2,6,11
530 1067|_("Algenib") 1,2,6,11
531107315|_("Enif") 1,2,6,11
532112029|_("Homam") 1,2,3,5,6,10,11
533112158|_("Matar") 1,2,6,11
534109427|_("Biham") 1,2,6,11
535112748|_("Sadalbari") 1,2,6,11
536112748|_("Sa'd al Bari'")
537115250|_("Al Karab") 2
538115250|_("Salma")
539113357|_("Helvetios") 4,6
540112440|_("Sadalnazi") 11
541109068|_("Fum al Faras") 11
542112447|_("Suudalnujum") 11
543112051|_("Sadalmatar") 11
544# Perseus (Per)
545 15863|_("Mirfak") 1,2,6,11
546 15863|_("Algenib")
547 14576|_("Algol") 1,2,6,11
548 14576|_("Gorgonea Prima")
549 18614|_("Menkib") 1,2,11
550 17448|_("Ati") 1,2,11
551 17448|_("Atik")
552 17448|_("Alatik")
553 18246|_("Atik") 1,2,11
554 13879|_("Gorgonea Secunda") 2,5,11
555 14354|_("Gorgonea Tertia") 2,5,11
556 14817|_("Gorgonea Quarta") 2,11
557 13268|_("Miram") 10,11
558 14668|_("Misam") 3,11
559 10729|_("Misam al Thurayya I") 11
560# Phoenix (Phe)
561 2081|_("Ankaa") 1,6,11
562 2081|_("Nair al Zaurak")
563 5165|_("Alrial III") 11
564 6867|_("Alrial V") 11
565 2071|_("Alrial I") 11
566 3245|_("Alrial II") 11
567 5862|_("Alrial IV") 11
568# Pictor (Pic)
569 24186|_("Kapteyn's Star") 3,11
570# Pisces (Psc)
571 9487|_("Alrescha") 1,2,5,6,10,11
572 9487|_("Al Rescha")
573 9487|_("Alrischa")
574 3829|_("van Maanen's Star") 3
575 3829|_("van Maanen 2")
576 8198|_("Torcularis Septentrionalis") 2,10,11
577 8198|_("Torcular")
578 7097|_("Kullat Nunu") 2
579113889|_("Fum al Samakah") 5,10,11
580 3786|_("Kuton I") 11
581 5737|_("Kuton II") 11
582 5743|_("Kuton III") 11
583# Piscis Austrinus (PsA)
584113368|_("Fomalhaut") 1,2,6,11
585113368|_("Thalim")
586111188|_("Fum al Hui") 11
587# Puppis (Pup)
588 39429|_("Naos") 1,6,11
589 39757|_("Tureis") 1,5
590 35488|_("Bernes 135") 3
591 38170|_("Asmidiske") 3,5,11
592# Sagitta (Sge)
593 96757|_("Sham") 1,5,11
594# Sagittarius (Sgr)
595 95347|_("Rukbat") 1,2,6,11
596 95347|_("Alrami")
597 95241|_("Arkab") 1,2,5,11
598 95241|_("Arkab Prior")
599 95294|_("Arkab Posterior") 2,5,11
600 88635|_("Alnasl") 1,2,5,6,10,11
601 88635|_("Nushaba")
602 88635|_("Al Nasl")
603 88635|_("Nash")
604 89931|_("Kaus Media") 1,2,5,6,11
605 89931|_("Kaus Meridionalis")
606 90185|_("Kaus Australis") 1,2,5,6,11
607 93506|_("Ascella") 1,2,11
608 90496|_("Kaus Borealis") 1,2,5,6,11
609 90496|_("Al Thalimain") 2
610 92855|_("Nunki") 1,2,6,11
611 89341|_("Polis") 2,5,11
612 89341|_("Al Thalimain")
613 89341|_("Alnam")
614 94141|_("Albaldah") 3,10,11
615 94141|_("Al Baldah")
616 98066|_("Terebellum I") 10,11
617 98162|_("Terebellum II") 10,11
618 98353|_("Terebellum III") 10,11
619 98688|_("Terebellum IV") 10,11
620 89642|_("Hamalwarid") 11
621 92761|_("Ain al Rami I") 11
622 92845|_("Ain al Rami II") 11
623 93864|_("Namalsadirah II") 11
624 92041|_("Namalsadirah I") 11
625 95477|_("Namalsadirah III") 11
626 95503|_("Namalsadirah IV") 11
627 94643|_("Al Kiladah") 11
628# Scorpius (Sco)
629 80763|_("Antares") 1,2,6,11
630 78820|_("Acrab") 1,2,5,6,10,11
631 78820|_("Graffias")
632 78401|_("Dschubba") 1,2,6,11
633 86228|_("Sargas") 1,6,11
634 86228|_("Girtab")
635 85927|_("Shaula") 1,2,6,11
636 80112|_("Alniyat I") 1,2,5,10,11
227 80112|_("Al Niyat")637 80112|_("Al Niyat")
228 80463|_("Cujam")638 81266|_("Alniyat II") 2,5,10,11
229 80763|_("Antares")639 81266|_("Al Niyat")
230 80816|_("Kornephoros")640 85696|_("Lesath") 1,2,6,11
231 80883|_("Marfik")641 79374|_("Jabbah") 2,11
232 81266|_("Alniyat")642 78727|_("Grafias") 10,11
233 81377|_("Han")643 78727|_("Grassias")
234 82273|_("Atria")644 87073|_("Girtab") 11
235 82729|_("Grafias")645 87294|_("Vanant") 11
236 83608|_("Arrakis")646 86670|_("Mula") 11
237 83895|_("Aldhibah")647 82514|_("Tali al Shaulah I") 11
238 84012|_("Sabik")648 82545|_("Tali al Shaulah II") 11
239 84345|_("Rasalgethi")649 78265|_("Nur") 11
240 84379|_("Sarin")650 78104|_("Iolil") 11
241 85670|_("Rastaban")651 78933|_("Jabhat Acrabi I") 11
242 85693|_("Maasym")652 78990|_("Jabhat Acrabi II") 11
243 85696|_("Lesath")653# Serpens (Ser)
244 85819|_("Kuma")654 77070|_("Unukalhai") 1,2,6,11
245 85822|_("Yildun")655 92946|_("Alya") 1,2,6,11
246 85927|_("Shaula")656 77233|_("Nasak Shamiya I") 11
247 86032|_("Rasalhague")657 78072|_("Nasak Shamiya II") 11
248 86228|_("Sargas")658 76276|_("Nasak Yamani I") 11
249 86614|_("Dziban")659 77622|_("Nasak Yamani II") 11
250 86742|_("Cebalrai")660# Taurus (Tau)
251 87585|_("Grumium")661 21421|_("Aldebaran") 1,2,6,11
252 87833|_("Etamin")662 25428|_("Elnath") 1,2,3,6,11
253 87937|_("Barnard's Star")663 25428|_("El Nath")
254 88048|_("Sinistra")664 20889|_("Ain") 1,2,6,11
255 88567|_("Nash")665 20889|_("Oculus Boreus")
256 88635|_("Alnasl")666 17702|_("Alcyone") 1,2,6,11
257 89341|_("Polis")667 17489|_("Celaeno") 1,2,6,11
258 89931|_("Kaus Media")668 17499|_("Electra") 1,2,6,11
259 90185|_("Kaus Australis")669 17531|_("Taygeta") 1,2,6,11
260 90191|_("Alathfar")670 17573|_("Maia") 1,2,6,11
261 90496|_("Kaus Borealis")671 17579|_("Asterope") 1,2,6,11
262 91262|_("Vega")672 17579|_("Sterope I")
263 92420|_("Sheliak")673 17608|_("Merope") 1,2,6,11
264 92855|_("Nunki")674 17847|_("Atlas") 1,2,6,11
265 92946|_("Alya")675 17851|_("Pleione") 1,2,6,11
266 93194|_("Sulafat")676 20205|_("Hyadum I") 2,11
267 93506|_("Ascella")677 20205|_("Prima Hyadum")
268 93683|_("Manubrij")678 20455|_("Hyadum II") 2,11
269 93747|_("Deneb el Okab")679 25945|_("The Ruby Star")
270 93805|_("Al Thalimain Prior")680 17588|_("Sterope II") 11
271 94114|_("Alphekka Meridiana")681 20885|_("Hyadum III") 11
272 94141|_("Albaldah")682 20894|_("Hyadum IV") 11
273 94376|_("Altais")683 20635|_("Alkalbain III") 11
274 95241|_("Arkab")684 20641|_("Alkalbain IV") 11
275 95347|_("Rukbat")685 20711|_("Alkalbain V") 11
276 95501|_("Deneb Okab")686 20250|_("Alkalbain I") 11
277 95771|_("Lukida")687 20430|_("Alkalbain II") 11
278 95947|_("Albireo")688# Triangulum (Tri)
279 96100|_("Alsafi")689 8796|_("Mothallah") 1,6,11
280 96295|_("Campbell's Star")690 8796|_("Caput Trianguli")
281 96468|_("Al Thalimain")691 10064|_("Mizan") 11
282 96757|_("Sham")692# Triangulum Australe (TrA)
283 97165|_("Rukh")693 82273|_("Atria") 1,6,11
284 97278|_("Tarazed")694# Ursa Major (UMa)
285 97433|_("Tyl")695 54061|_("Dubhe") 1,2,6,11
286 97649|_("Altair")696 53910|_("Merak") 1,2,6,11
287 98036|_("Alshain")697 58001|_("Phecda") 1,2,6,11
288 98066|_("Terebellum I")698 58001|_("Phad")
289 98162|_("Terebellum II")699 59774|_("Megrez") 1,2,6,11
290 98353|_("Terebellum III")700 59774|_("Kaffa")
291 98688|_("Terebellum IV")701 62956|_("Alioth") 1,2,6,11
292100027|_("Algedi")702 65378|_("Mizar") 1,2,6,11
293100310|_("Alshat")703 67301|_("Alkaid") 1,2,6,11
294100345|_("Dabih")704 67301|_("Benetnasch")
295100453|_("Sadr")705 44127|_("Talitha") 1,2,6,11
296100751|_("Peacock")706 50372|_("Tania Borealis") 1,2,6,11
297100881|_("Okul")707 50801|_("Tania Australis") 1,2,6,11
298101421|_("Deneb Dulfim")708 55219|_("Alula Borealis") 1,2,6,11
299101769|_("Rotanev")709 55203|_("Alula Australis") 1,2,6,11
300101958|_("Sualocin")710 41704|_("Muscida") 1,2,6,11
301102098|_("Deneb")711 65477|_("Alcor") 1,2,6,11
302102488|_("Gienah")712 57939|_("Groombridge 1830") 2,11
303102618|_("Albali")713 57939|_("Flying Star")
304104019|_("Armus")714 57939|_("Runaway Star")
305104214|_("Bessel's Star")715 46471|_("Intercrus") 4,6
306104382|_("Polaris Australis")716 53721|_("Chalawan") 4,6
307104987|_("Kitalpha")717 57399|_("Al Kaphrah") 3,5,11
308105199|_("Alderamin")718 57399|_("Alkafzah")
309106032|_("Alfirk")719 14590|_("Althiba I") 11
310106278|_("Sadalsuud")720 46977|_("Althiba VII") 11
311106723|_("Castra")721 45493|_("Alhaud III") 11
312106985|_("Nashira")722 44901|_("Alhaud I") 11
313107136|_("Azelfafage")723 46733|_("Alhaud IV") 11
314107259|_("The Garnet Star")724 46853|_("Alhaud V") 11
315107315|_("Enif")725 44471|_("Kafzatania") 11
316107354|_("Jih")726 42438|_("Althiba II") 11
317107533|_("Pennae Caudalis")727 42527|_("Althiba III") 11
318107556|_("Deneb Algedi")728 44390|_("Althiba IV") 11
319108085|_("Al Dhanab")729 44857|_("Althiba V") 11
320108917|_("Kurhah")730 45038|_("Althiba VI") 11
321109074|_("Sadalmelik")731 45075|_("Alhaud II") 11
322109268|_("Alnair")732 48319|_("Alhaud VI") 11
323109427|_("Biham")733 48402|_("Alhaud VII") 11
324110003|_("Ancha")734# Ursa Minor (UMi)
325110395|_("Sadachbia")735 11767|_("Polaris") 1,2,6,11
326110893|_("Kruger 60")736 11767|_("Alrucaba")
327110960|_("Sadaltager")737 11767|_("Cinosura")
328111056|_("Al Kalb al Rai")738 72607|_("Kochab") 1,2,6,11
329111710|_("Situla")739 75097|_("Pherkad") 1,2,6,11
330112029|_("Homan")740 75097|_("Pherkad Major")
331112158|_("Matar")741 74793|_("Pherkad Minor") 2,10,11
332112247|_("Babcock's Star")742 85822|_("Yildun") 1,2,6,11
333112748|_("Sadalbari")743 82080|_("Circitores") 11
334113136|_("Skat")744 77055|_("Akfa Farkadain") 11
335113368|_("Fomalhaut")745 79822|_("Anwa Farkadain") 11
336113881|_("Scheat")746# Vela (Vel)
337113889|_("Fum al Samakah")747 39953|_("Regor") 1,11
338113963|_("Markab")748 45941|_("Markeb") 1,11
339116727|_("Errai")749 44816|_("Suhail") 1,6,11
750# Virgo (Vir)
751 65474|_("Spica") 1,2,6,11
752 65474|_("Azimech")
753 57757|_("Zavijava") 1,2,6,11
754 61941|_("Porrima") 1,2,6,11
755 61941|_("Antevorta")
756 63608|_("Vindemiatrix") 1,2,6,11
757 63608|_("Almuredin")
758 60129|_("Zaniah") 1,2,11
759 69701|_("Syrma") 1,2,11
760 61941|_("Arich") 1
761 66249|_("Heze") 1,11
762 63090|_("Minelauva") 3,10,11
763 63090|_("Auva")
764 69974|_("Khambaliya") 3,11
765 69974|_("Kambalia")
766 71957|_("Rijl al Awwa") 5,10,11
767 71957|_("Rigilawwa")
768 69427|_("Algafar I") 11
769 70755|_("Algafar II") 11
770# Vulpecula (Vul)
771 95771|_("Anser") 3,5,10,11
340772
=== modified file 'src/core/StelSkyCultureMgr.cpp'
--- src/core/StelSkyCultureMgr.cpp 2016-06-03 17:40:43 +0000
+++ src/core/StelSkyCultureMgr.cpp 2016-09-14 16:38:20 +0000
@@ -49,7 +49,7 @@
49 }49 }
50 QSettings pd(pdFile, StelIniFormat);50 QSettings pd(pdFile, StelIniFormat);
51 dirToNameEnglish[dir].englishName = pd.value("info/name").toString();51 dirToNameEnglish[dir].englishName = pd.value("info/name").toString();
52 dirToNameEnglish[dir].author = pd.value("info/author").toString();52 dirToNameEnglish[dir].author = pd.value("info/author").toString();
53 } 53 }
54}54}
5555
@@ -104,9 +104,20 @@
104 return true;104 return true;
105}105}
106 106
107QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const {return q_(currentSkyCulture.englishName);}107QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const
108108{
109QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const {return currentSkyCulture.englishName;}109 return q_(currentSkyCulture.englishName);
110}
111
112QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const
113{
114 return currentSkyCulture.englishName;
115}
116
117bool StelSkyCultureMgr::setCurrentSkyCultureNameI18(const QString& cultureName)
118{
119 return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName));
120}
110121
111//! returns newline delimited list of human readable culture names in english122//! returns newline delimited list of human readable culture names in english
112QString StelSkyCultureMgr::getSkyCultureListEnglish(void)123QString StelSkyCultureMgr::getSkyCultureListEnglish(void)
113124
=== modified file 'src/core/StelSkyCultureMgr.hpp'
--- src/core/StelSkyCultureMgr.hpp 2016-05-09 16:33:06 +0000
+++ src/core/StelSkyCultureMgr.hpp 2016-09-14 16:38:20 +0000
@@ -71,7 +71,7 @@
71 QString getCurrentSkyCultureNameI18() const;71 QString getCurrentSkyCultureNameI18() const;
72 //! Set the sky culture from i18n name.72 //! Set the sky culture from i18n name.
73 //! @return true on success; false and doesn't change if skyculture is invalid.73 //! @return true on success; false and doesn't change if skyculture is invalid.
74 bool setCurrentSkyCultureNameI18(const QString& cultureName) {return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName));}74 bool setCurrentSkyCultureNameI18(const QString& cultureName);
75 75
76 //! Get the current sky culture ID.76 //! Get the current sky culture ID.
77 QString getCurrentSkyCultureID() const {return currentSkyCultureDir;}77 QString getCurrentSkyCultureID() const {return currentSkyCultureDir;}
7878
=== modified file 'src/core/modules/StarMgr.cpp'
--- src/core/modules/StarMgr.cpp 2016-07-11 07:39:54 +0000
+++ src/core/modules/StarMgr.cpp 2016-09-14 16:38:20 +0000
@@ -71,8 +71,12 @@
71bool StarMgr::flagSciNames = true;71bool StarMgr::flagSciNames = true;
72QHash<int,QString> StarMgr::commonNamesMap;72QHash<int,QString> StarMgr::commonNamesMap;
73QHash<int,QString> StarMgr::commonNamesMapI18n;73QHash<int,QString> StarMgr::commonNamesMapI18n;
74QHash<int,QString> StarMgr::additionalNamesMap;
75QHash<int,QString> StarMgr::additionalNamesMapI18n;
74QMap<QString,int> StarMgr::commonNamesIndexI18n;76QMap<QString,int> StarMgr::commonNamesIndexI18n;
75QMap<QString,int> StarMgr::commonNamesIndex;77QMap<QString,int> StarMgr::commonNamesIndex;
78QMap<QString,int> StarMgr::additionalNamesIndex;
79QMap<QString,int> StarMgr::additionalNamesIndexI18n;
76QHash<int,QString> StarMgr::sciNamesMapI18n;80QHash<int,QString> StarMgr::sciNamesMapI18n;
77QMap<QString,int> StarMgr::sciNamesIndexI18n;81QMap<QString,int> StarMgr::sciNamesIndexI18n;
78QHash<int,QString> StarMgr::sciAdditionalNamesMapI18n;82QHash<int,QString> StarMgr::sciAdditionalNamesMapI18n;
@@ -85,6 +89,7 @@
85QMap<int, int> StarMgr::saoStarsIndex;89QMap<int, int> StarMgr::saoStarsIndex;
86QHash<int, int> StarMgr::hdStarsMap;90QHash<int, int> StarMgr::hdStarsMap;
87QMap<int, int> StarMgr::hdStarsIndex;91QMap<int, int> StarMgr::hdStarsIndex;
92QHash<int, QString> StarMgr::referenceMap;
8893
89QStringList initStringListFromFile(const QString& file_name)94QStringList initStringListFromFile(const QString& file_name)
90{95{
@@ -180,6 +185,22 @@
180 return QString();185 return QString();
181}186}
182187
188QString StarMgr::getAdditionalNames(int hip)
189{
190 QHash<int,QString>::const_iterator it(additionalNamesMapI18n.find(hip));
191 if (it!=additionalNamesMapI18n.end())
192 return it.value();
193 return QString();
194}
195
196QString StarMgr::getAdditionalEnglishNames(int hip)
197{
198 QHash<int,QString>::const_iterator it(additionalNamesMap.find(hip));
199 if (it!=additionalNamesMap.end())
200 return it.value();
201 return QString();
202}
203
183QString StarMgr::getCommonEnglishName(int hip)204QString StarMgr::getCommonEnglishName(int hip)
184{205{
185 QHash<int,QString>::const_iterator it(commonNamesMap.find(hip));206 QHash<int,QString>::const_iterator it(commonNamesMap.find(hip));
@@ -609,8 +630,12 @@
609{630{
610 commonNamesMap.clear();631 commonNamesMap.clear();
611 commonNamesMapI18n.clear();632 commonNamesMapI18n.clear();
633 additionalNamesMap.clear();
634 additionalNamesMapI18n.clear();
612 commonNamesIndexI18n.clear();635 commonNamesIndexI18n.clear();
613 commonNamesIndex.clear();636 commonNamesIndex.clear();
637 additionalNamesIndex.clear();
638 additionalNamesIndexI18n.clear();
614639
615 qDebug() << "Loading star names from" << QDir::toNativeSeparators(commonNameFile);640 qDebug() << "Loading star names from" << QDir::toNativeSeparators(commonNameFile);
616 QFile cnFile(commonNameFile);641 QFile cnFile(commonNameFile);
@@ -632,7 +657,7 @@
632 // " 677|_("Alpheratz")"657 // " 677|_("Alpheratz")"
633 // "113368|_("Fomalhaut")"658 // "113368|_("Fomalhaut")"
634 // Note: Stellarium doesn't support sky cultures made prior version 0.10.6 now!659 // Note: Stellarium doesn't support sky cultures made prior version 0.10.6 now!
635 QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*\\n");660 QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*([\\,\\d\\s]*)\\n");
636661
637 while(!cnFile.atEnd())662 while(!cnFile.atEnd())
638 {663 {
@@ -667,13 +692,45 @@
667 continue;692 continue;
668 }693 }
669694
670 const QString commonNameI18n = englishCommonName;695 const QString englishNameCap = englishCommonName.toUpper();
671 QString commonNameI18n_cap = commonNameI18n.toUpper();696 if (commonNamesMap.find(hip)!=commonNamesMap.end())
672697 {
673 commonNamesMap[hip] = englishCommonName;698 if (additionalNamesMap.find(hip)!=additionalNamesMap.end())
674 commonNamesMapI18n[hip] = commonNameI18n;699 {
675 commonNamesIndexI18n[commonNameI18n_cap] = hip;700 QString sname = additionalNamesMap[hip].append(" - " + englishCommonName);
676 commonNamesIndex[englishCommonName.toUpper()] = hip;701 QString snamecap = sname.toUpper();
702 additionalNamesMap[hip] = sname;
703 additionalNamesMapI18n[hip] = sname;
704 additionalNamesIndex.remove(englishNameCap);
705 additionalNamesIndexI18n.remove(englishNameCap);
706 additionalNamesIndex[snamecap] = hip;
707 additionalNamesIndexI18n[snamecap] = hip;
708 }
709 else
710 {
711 additionalNamesMap[hip] = englishCommonName;
712 additionalNamesMapI18n[hip] = englishCommonName;
713 additionalNamesIndex[englishNameCap] = hip;
714 additionalNamesIndexI18n[englishNameCap] = hip;
715 }
716 }
717 else
718 {
719 commonNamesMap[hip] = englishCommonName;
720 commonNamesMapI18n[hip] = englishCommonName;
721 commonNamesIndexI18n[englishNameCap] = hip;
722 commonNamesIndex[englishNameCap] = hip;
723 }
724
725 QString reference = recordRx.capturedTexts().at(3).trimmed();
726 if (!reference.isEmpty())
727 {
728 if (referenceMap.find(hip)!=referenceMap.end())
729 referenceMap[hip] = referenceMap[hip].append("," + reference);
730 else
731 referenceMap[hip] = reference;
732 }
733
677 readOk++;734 readOk++;
678 }735 }
679 }736 }
@@ -1143,6 +1200,8 @@
1143 const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();1200 const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
1144 commonNamesMapI18n.clear();1201 commonNamesMapI18n.clear();
1145 commonNamesIndexI18n.clear();1202 commonNamesIndexI18n.clear();
1203 additionalNamesMapI18n.clear();
1204 additionalNamesIndexI18n.clear();
1146 for (QHash<int,QString>::ConstIterator it(commonNamesMap.constBegin());it!=commonNamesMap.constEnd();it++)1205 for (QHash<int,QString>::ConstIterator it(commonNamesMap.constBegin());it!=commonNamesMap.constEnd();it++)
1147 {1206 {
1148 const int i = it.key();1207 const int i = it.key();
@@ -1150,6 +1209,19 @@
1150 commonNamesMapI18n[i] = t;1209 commonNamesMapI18n[i] = t;
1151 commonNamesIndexI18n[t.toUpper()] = i;1210 commonNamesIndexI18n[t.toUpper()] = i;
1152 }1211 }
1212 for (QHash<int,QString>::ConstIterator ita(additionalNamesMap.constBegin());ita!=additionalNamesMap.constEnd();ita++)
1213 {
1214 const int i = ita.key();
1215 QStringList a = ita.value().split(" - ");
1216 QStringList tn;
1217 foreach(const QString &str, a)
1218 {
1219 tn << trans.qtranslate(str);
1220 }
1221 const QString r = tn.join(" - ");
1222 additionalNamesMapI18n[i] = r;
1223 additionalNamesIndexI18n[r.toUpper()] = i;
1224 }
1153}1225}
11541226
1155// Search the star by HP number1227// Search the star by HP number
@@ -1208,6 +1280,13 @@
1208 return searchHP(it.value());1280 return searchHP(it.value());
1209 }1281 }
12101282
1283 // Search by I18n additional common names
1284 QMap<QString,int>::const_iterator ita(additionalNamesIndexI18n.find(objw));
1285 if (ita!=additionalNamesIndexI18n.end())
1286 {
1287 return searchHP(ita.value());
1288 }
1289
1211 // Search by sci name1290 // Search by sci name
1212 QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw);1291 QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw);
1213 if (it2!=sciNamesIndexI18n.end())1292 if (it2!=sciNamesIndexI18n.end())
@@ -1274,13 +1353,20 @@
1274 }1353 }
1275 }1354 }
12761355
1277 // Search by I18n common name1356 // Search by English common name
1278 QMap<QString,int>::const_iterator it(commonNamesIndex.find(objw));1357 QMap<QString,int>::const_iterator it(commonNamesIndex.find(objw));
1279 if (it!=commonNamesIndex.end())1358 if (it!=commonNamesIndex.end())
1280 {1359 {
1281 return searchHP(it.value());1360 return searchHP(it.value());
1282 }1361 }
12831362
1363 // Search by English additional common names
1364 QMap<QString,int>::const_iterator ita(additionalNamesIndex.find(objw));
1365 if (ita!=additionalNamesIndex.end())
1366 {
1367 return searchHP(ita.value());
1368 }
1369
1284 // Search by sci name1370 // Search by sci name
1285 QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw);1371 QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw);
1286 if (it2!=sciNamesIndexI18n.end())1372 if (it2!=sciNamesIndexI18n.end())
@@ -1310,6 +1396,7 @@
1310 QString objw = objPrefix.toUpper();1396 QString objw = objPrefix.toUpper();
13111397
1312 QMap<QString, int> cNamesIdx = inEnglish ? commonNamesIndex : commonNamesIndexI18n;1398 QMap<QString, int> cNamesIdx = inEnglish ? commonNamesIndex : commonNamesIndexI18n;
1399 QMap<QString, int> aNamesIdx = inEnglish ? additionalNamesIndex : additionalNamesIndexI18n;
13131400
1314 // Search for common names1401 // Search for common names
1315 if (useStartOfWords)1402 if (useStartOfWords)
@@ -1326,6 +1413,19 @@
1326 else1413 else
1327 break;1414 break;
1328 }1415 }
1416 for (QMap<QString,int>::const_iterator ita(aNamesIdx.lowerBound(objw)); ita!=aNamesIdx.end(); ++ita)
1417 {
1418 if (ita.key().startsWith(objw))
1419 {
1420 if (maxNbItem<=0)
1421 break;
1422 result.append(inEnglish ? getAdditionalEnglishNames(ita.value()) : getAdditionalNames(ita.value()));
1423 --maxNbItem;
1424 }
1425 else
1426 break;
1427 }
1428
1329 }1429 }
1330 else1430 else
1331 {1431 {
@@ -1341,6 +1441,19 @@
1341 --maxNbItem;1441 --maxNbItem;
1342 }1442 }
1343 }1443 }
1444 QMapIterator<QString, int> j(aNamesIdx);
1445 while (j.hasNext())
1446 {
1447 j.next();
1448 if (j.key().contains(objw))
1449 {
1450 if (maxNbItem<=0)
1451 break;
1452 result.append(inEnglish ? getAdditionalEnglishNames(j.value()) : getAdditionalNames(j.value()));
1453 --maxNbItem;
1454 }
1455 }
1456
1344 }1457 }
13451458
1346 // Search for sci names1459 // Search for sci names
13471460
=== modified file 'src/core/modules/StarMgr.hpp'
--- src/core/modules/StarMgr.hpp 2016-07-11 07:39:54 +0000
+++ src/core/modules/StarMgr.hpp 2016-09-14 16:38:20 +0000
@@ -234,6 +234,18 @@
234 //! @return common name of star (from skyculture file star_names.fab)234 //! @return common name of star (from skyculture file star_names.fab)
235 static QString getCommonEnglishName(int hip);235 static QString getCommonEnglishName(int hip);
236236
237 //! Get the (translated) additional names for a star with a specified
238 //! Hipparcos catalogue number.
239 //! @param hip The Hipparcos number of star
240 //! @return translated additional names of star
241 static QString getAdditionalNames(int hip);
242
243 //! Get the English additional names for a star with a specified
244 //! Hipparcos catalogue number.
245 //! @param hip The Hipparcos number of star
246 //! @return additional names of star
247 static QString getAdditionalEnglishNames(int hip);
248
237 //! Get the cross-identification designations for a star with a specified249 //! Get the cross-identification designations for a star with a specified
238 //! Hipparcos catalogue number.250 //! Hipparcos catalogue number.
239 //! @param hip The Hipparcos number of star251 //! @param hip The Hipparcos number of star
@@ -403,6 +415,11 @@
403 static QMap<QString, int> commonNamesIndexI18n;415 static QMap<QString, int> commonNamesIndexI18n;
404 static QMap<QString, int> commonNamesIndex;416 static QMap<QString, int> commonNamesIndex;
405417
418 static QHash<int, QString> additionalNamesMap; // additional names
419 static QHash<int, QString> additionalNamesMapI18n;
420 static QMap<QString, int> additionalNamesIndex;
421 static QMap<QString, int> additionalNamesIndexI18n;
422
406 static QHash<int, QString> sciNamesMapI18n; 423 static QHash<int, QString> sciNamesMapI18n;
407 static QMap<QString, int> sciNamesIndexI18n;424 static QMap<QString, int> sciNamesIndexI18n;
408425
@@ -420,6 +437,8 @@
420 static QHash<int, int> hdStarsMap;437 static QHash<int, int> hdStarsMap;
421 static QMap<int, int> hdStarsIndex;438 static QMap<int, int> hdStarsIndex;
422439
440 static QHash<int, QString> referenceMap;
441
423 QFont starFont;442 QFont starFont;
424 static bool flagSciNames;443 static bool flagSciNames;
425 Vec3f labelColor;444 Vec3f labelColor;
426445
=== modified file 'src/core/modules/StarWrapper.cpp'
--- src/core/modules/StarWrapper.cpp 2016-07-11 07:39:54 +0000
+++ src/core/modules/StarWrapper.cpp 2016-09-14 16:38:20 +0000
@@ -106,6 +106,7 @@
106 oss << "<h2>";106 oss << "<h2>";
107107
108 const QString commonNameI18 = StarMgr::getCommonName(s->getHip());108 const QString commonNameI18 = StarMgr::getCommonName(s->getHip());
109 const QString additionalNameI18 = StarMgr::getAdditionalNames(s->getHip());
109 const QString sciName = StarMgr::getSciName(s->getHip());110 const QString sciName = StarMgr::getSciName(s->getHip());
110 const QString addSciName = StarMgr::getSciAdditionalName(s->getHip());111 const QString addSciName = StarMgr::getSciAdditionalName(s->getHip());
111 const QString varSciName = StarMgr::getGcvsName(s->getHip());112 const QString varSciName = StarMgr::getGcvsName(s->getHip());
@@ -140,6 +141,9 @@
140 if (!commonNameI18.isEmpty())141 if (!commonNameI18.isEmpty())
141 oss << commonNameI18;142 oss << commonNameI18;
142143
144 if (!additionalNameI18.isEmpty())
145 oss << " (" << additionalNameI18 << ")";
146
143 if (!commonNameI18.isEmpty() && !designationsList.isEmpty() && flags&CatalogNumber)147 if (!commonNameI18.isEmpty() && !designationsList.isEmpty() && flags&CatalogNumber)
144 oss << "<br>";148 oss << "<br>";
145 }149 }
146150
=== modified file 'stars/default/name.fab'
--- stars/default/name.fab 2015-11-21 09:22:55 +0000
+++ stars/default/name.fab 2016-09-14 16:38:20 +0000
@@ -3692,7 +3692,6 @@
3692 80763|α_Sco3692 80763|α_Sco
3693 78820|β1_Sco3693 78820|β1_Sco
3694 78821|β2_Sco3694 78821|β2_Sco
3695 73714|γ_Sco
3696 78401|δ_Sco3695 78401|δ_Sco
3697 82396|ε_Sco3696 82396|ε_Sco
3698 82671|ζ1_Sco3697 82671|ζ1_Sco