Remove additional Typeset screen and surface typesets in the typograp…

…hy panel (WordPress#65579)

* Remove additional Typeset screen and surface typesets in the typography panel.

* Merge custom and theme font families in getFontFamilyFromSetting.

packages/edit-site/src/components/global-styles/screen-typography.js

@@ -11,8 +11,8 @@ import { store as editorStore } from '@wordpress/editor';
  */
 import TypographyElements from './typography-elements';
 import ScreenHeader from './header';
+import TypographyVariations from './variations/variations-typography';
 import FontSizesCount from './font-sizes/font-sizes-count';
-import TypesetButton from './typeset-button';
 import FontFamilies from './font-families';
 
 function ScreenTypography() {
@@ -32,7 +32,7 @@ function ScreenTypography() {
 			/>
 			<div className="edit-site-global-styles-screen">
 				<VStack spacing={ 7 }>
-					<TypesetButton />
+					<TypographyVariations title={ __( 'Typesets' ) } />
 					{ fontLibraryEnabled && <FontFamilies /> }
 					<TypographyElements />
 					<FontSizesCount />

packages/edit-site/src/components/global-styles/ui.js

@@ -32,7 +32,6 @@ import {
 } from './screen-block-list';
 import ScreenBlock from './screen-block';
 import ScreenTypography from './screen-typography';
-import ScreenTypeset from './screen-typeset';
 import ScreenTypographyElement from './screen-typography-element';
 import FontSize from './font-sizes/font-size';
 import FontSizes from './font-sizes/font-sizes';
@@ -312,10 +311,6 @@ function GlobalStylesUI() {
 				<FontSize />
 			</GlobalStylesNavigationScreen>
 
-			<GlobalStylesNavigationScreen path="/typography/typeset">
-				<ScreenTypeset />
-			</GlobalStylesNavigationScreen>
-
 			<GlobalStylesNavigationScreen path="/typography/text">
 				<ScreenTypographyElement element="text" />
 			</GlobalStylesNavigationScreen>