You are correct. I didn't mention that point. Here are the exact official rules from 1958 and 1908, which agree with each other principally, but have some different explanations and emphases:
FASTING AND ABSTINENCE IN THE UNITED STATES 1958
ABSTINENCE: All Catholics seven years old and over are obliged to observe the Law of Abstinence.
On days of complete abstinence flesh meat, soup or gravy made from meat, are not permitted at all. On days of partial abstinence flesh meat, soup or gravy made from meat, are permitted once a day at the principal meal.
Complete abstinence is to be observed on all Fridays; Ash 'Wednesday; Vigils of Immaculate Conception and Christmas; an Holy Saturday. Partial abstinence is to be observed on Ember Wednesdays and Saturdays and on the Vigil of Pentecost.
FASTING: All Catholics from the completion of their twenty first to the beginning of their sixtieth year are bound to observe the Law of Fast. The days of Fast are the weekdays of Lent; Ember Days; the Vigils of Pentecost, Immaculate Conception and Christmas.
Only one full meal is permitted on a day of Fast. Two other meatless meals are permitted. These meals should be sufficient to maintain strength in accordance with each ones needs. Both of these meals, or "collations," together should not equal one full meal.
It is permissible to eat meat at the principal meal on a Fast Day except on Fridays, Ash Wednesday and the Vigils of the Immaculate Conception and Christmas and on Holy Saturday.
Solid food between meals is not permitted. Liquids, including coffee, tea, milk and fruit juices, are allowed.
In connection with problems arising from the Laws of Fast and Abstinence, a confessor or priest should be consulted. Dispensations may be granted for a serious reason concerning health or the ability to work.
The Church Law of Abstinence and Fast 1908
1. The Law of Abstinence forbids the use of flesh meat and of the juice thereof (soup, etc.). Eggs, cheese, butter and seasonings of food are permitted. The Law of Fasting forbids more than one full meal a day, but does not forbid a small amount of food in the morning and in the evening.
2. All Catholics seven years old and over are obliged to abstain. All Catholics from the completion of their twenty-first to the beginning of their sixtieth year, unless lawfully excused, are bound to fast.
3. Abstinence alone is prescribed every Friday, unless a holy-day falls thereon. Fasting and abstinence are prescribed in the United States on:
the Wednesdays and Fridays of Lent and Holy Saturday forenoon (on all other days of Lent fasting alone is prescribed and meat is allowed once a (day),
the Ember days. viz.: the Wednesday, Friday and Saturday following the first Sunday of Lent, Pentecost, the 14th of September. and the third Sunday of Advent;
the vigils of Pentecost, Assumption, All Saints and Christmas.
There is no fast or abstinence if a vigil falls on a Sunday. Whenever meat is permitted, fish may be taken at the same meal. A dispensation is granted to the laboring classes and their families on all days of fast and abstinence except Fridays, Ash Wednesday, in Holy Week, Holy Saturday forenoon, and the vigil of Christmas. When any member of such a family lawfully uses this privilege all the other members may avail themselves of it also; but those who fast may not eat meat more than once a day.