Gemara:

Berachot,  Shabbat 

Halacha:

Shabbat,  Tefillah,  Yom Tov 

Machshava:

Shabbat,  Yom Tov 

Collections: R' Grunstein Happy on Shabbat

References: Shabbat: 119A ,  Berachot: 63A  

Description

After all is said and done, it seems that the major codes of Jewish law decided that Shabbat is not a day of SIMCHA/HAPPINESS but rather just ONEG/ENJOYMENT and more. Thus, at the end of "Lecha Dodi", the proper thing to say is ברינה ובצהלה and reserve בשמחה ובצהלה for a Yom Tov that falls out on Shabbat