Heat capacity of untwinned YBa2Cu3O7-x in magnetic fields: Dimensional cross-over near Tc