Commit 52d68a63f8878930b90adbbf4dcdb3753addef12 | snowbound

author	clover caruso <git@paperclover.net> 2026-09-30 13:02:51-07:00
committer	clover caruso <git@paperclover.net> 2026-09-30 13:36:50-07:00
log	52d68a63f8878930b90adbbf4dcdb3753addef12
tree	d378e222fa69a760d4e07df8d12e0cf401ec903f
parent	3c0f71aec0443df1823c3d81c1f020949bbb169e
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

fix(windows): acrylic and Mica show through the row, live theme switching, Windows 7 glass through the toolbar

- The title bar no longer paints an opaque fill over a translucent surface, so
  Acrylic on 10 and Mica on 11 show.
- A system theme change re-reads the app colour mode before winit handles it;
  the acrylic tint follows.
- On Windows 7 glass the sidebar stays opaque and toolbar fields and buttons
  get light faces.
- Tests that assumed Unix paths or permission bits are portable or Unix-only.

Assisted-by: claude-opus-5.5

12 files changed, 139 insertions(+), 53 deletions(-)

arc
- platforms.md
crates
- notebook
  - tests
    discovery.rs
    session.rs
    structure.rs
- snowbound
  - src
    library.rs
    linux.rs
    macos.rs
    main.rs
    sidebar.rs
    windows.rs
- ui
  - src
    shell.rs
    theme.rs

arc/platforms.md+6-3

 @@ -114,9 +114,12 @@ keyboard, the toolbar and the macOS menu bar all run commands from it.
   them over the glass; 11 doesn't over the Direct3D surface, so the row
   draws them as 11 does, lit where the system reports the pointer. On 8
   and 10, whose frames are opaque, the window has no system frame and the
-  row draws and runs caption buttons as 10 does, over acrylic on 10. With
+  row draws and runs caption buttons as 10 does, over acrylic on 10. Over
-  Windows 7's basic or classic theme the system draws the title bar and
+  7's glass the sidebar stays opaque, and fields and tool buttons take white
-  the row lies beneath it, as on KDE.
+  faces, as Internet Explorer's do there. The theme and material follow the
+  system's colour mode as it changes. With Windows 7's basic or classic
+  theme the system draws the title bar and the row lies beneath it, as on
+  KDE.
 - A notebook on a share opens by its UNC path through Windows' own SMB
   client, which takes OneNote's opens and locks natively: `onestore` opens a
   section as OneNote does (a reader shares it with everyone, a writer denies

crates/notebook/tests/discovery.rs+3

...	@@ -463,8 +463,10 @@ fn local_access_stays_inside_the_selected_root() {	...	@@ -463,8 +463,10 @@ fn local_access_stays_inside_the_selected_root() {
463	}	463	}
464		464
465	/// Restores permissions a test took away, so the temporary directory can be removed.	465	/// Restores permissions a test took away, so the temporary directory can be removed.
		466	#[cfg(unix)]
466	struct Restore(Vec<(std::path::PathBuf, u32)>);	467	struct Restore(Vec<(std::path::PathBuf, u32)>);
467		468
		469	#[cfg(unix)]
468	impl Drop for Restore {	470	impl Drop for Restore {
469	fn drop(&mut self) {	471	fn drop(&mut self) {
470	use std::os::unix::fs::PermissionsExt;	472	use std::os::unix::fs::PermissionsExt;
...	@@ -474,6 +476,7 @@ impl Drop for Restore {	...	@@ -474,6 +476,7 @@ impl Drop for Restore {
474	}	476	}
475	}	477	}
476		478
		479	#[cfg(unix)]
477	#[test]	480	#[test]
478	fn unreadable_children_are_listed_as_unavailable_and_retried() {	481	fn unreadable_children_are_listed_as_unavailable_and_retried() {
479	use std::os::unix::fs::PermissionsExt;	482	use std::os::unix::fs::PermissionsExt;

crates/notebook/tests/session.rs+6-4

 @@ -196,9 +196,10 @@ fn saves_wait_for_an_unreachable_file_and_publish_after_relaunch() {
     let (section, _) = open(&file, &cache);
     let space = section.pages().unwrap()[0].0;
     let before = section.page(space).unwrap();
-    use std::os::unix::fs::PermissionsExt;
     let permissions = std::fs::metadata(&file).unwrap().permissions();
-    std::fs::set_permissions(&file, std::fs::Permissions::from_mode(0o444)).unwrap();
+    let mut read_only = permissions.clone();
+    read_only.set_readonly(true);
+    std::fs::set_permissions(&file, read_only).unwrap();
     let after = edited(&before, "Offline ");
     let id = typed(&section, space, &before, 0..0, "Offline ");
     wait(&section, |event| matches!(event, Event::Unreachable(_)));
 @@ -721,9 +722,10 @@ fn a_conflicting_save_keeps_the_native_page_and_a_conflict_page_the_session_dele
     let space = section.pages().unwrap()[0].0;
     let before = section.page(space).unwrap();
     let text = first_text(&before);
-    use std::os::unix::fs::PermissionsExt;
     let permissions = std::fs::metadata(&file).unwrap().permissions();
-    std::fs::set_permissions(&file, std::fs::Permissions::from_mode(0o444)).unwrap();
+    let mut read_only = permissions.clone();
+    read_only.set_readonly(true);
+    std::fs::set_permissions(&file, read_only).unwrap();
     let mut local = before.clone();
     model_ops::replace_text(&mut local, text, 0..8, "Local");
     let id = typed(&section, space, &before, 0..8, "Local");

crates/notebook/tests/structure.rs+17-15

 @@ -260,7 +260,6 @@ fn file_id(path: &std::path::Path) -> [u8; 16] {
 #[test]
 fn a_page_delete_lists_the_recycle_bin_it_finds_or_makes_and_leaves_an_unreadable_one() {
-    use std::os::unix::fs::PermissionsExt;
     let temporary = tempfile::tempdir().unwrap();
     let root = temporary.path().join("notebook");
     let bin = root.join("OneNote_RecycleBin");
 @@ -318,19 +317,22 @@ fn a_page_delete_lists_the_recycle_bin_it_finds_or_makes_and_leaves_an_unreadabl
     if let Some(directory) = std::env::var_os("NOTEBOOK_RECYCLE_EXPORT") {
         copy_dir(&root, std::path::Path::new(&directory));
     }
-    // Permission bits do not bind the superuser.
-    if unsafe { libc::geteuid() } == 0 {
-        return;
-    }
     // A bin that cannot be read is neither replaced nor added to.
-    std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o000)).unwrap();
+    #[cfg(unix)]
-    let denied = notebook.refresh().and_then(|_| recycle(&mut notebook));
+    {
-    std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).unwrap();
+        use std::os::unix::fs::PermissionsExt;
-    assert!(denied.is_err());
+        // Permission bits do not bind the superuser.
-    let names: Vec<_> = std::fs::read_dir(&bin)
+        if unsafe { libc::geteuid() } == 0 {
-        .unwrap()
+            return;
-        .map(|entry| entry.unwrap().file_name().into_string().unwrap())
+        }
-        .collect();
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o000)).unwrap();
-    assert_eq!(names.len(), 2, "{names:?}");
+        let denied = notebook.refresh().and_then(|_| recycle(&mut notebook));
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).unwrap();
+        assert!(denied.is_err());
+        let names: Vec<_> = std::fs::read_dir(&bin)
+            .unwrap()
+            .map(|entry| entry.unwrap().file_name().into_string().unwrap())
+            .collect();
+        assert_eq!(names.len(), 2, "{names:?}");
+    }
 }

crates/snowbound/src/library.rs+2-4

 @@ -1060,10 +1060,8 @@ mod tests {
         );
         assert_eq!(shown("", "Group/New Section 1.one"), under);
         assert_eq!(shown("notes/lab", "elsewhere/New Section 1.one"), None);
-        assert_eq!(
+        let elsewhere = std::env::temp_dir().join("Section.one");
-            shown("notes/lab", "/tmp/Section.one"),
+        assert_eq!(library("notes/lab").local(&elsewhere), Some(elsewhere));
-            Some(PathBuf::from("/tmp/Section.one"))
-        );
     }
     #[test]

crates/snowbound/src/linux.rs+5

 @@ -253,6 +253,11 @@ fn desktop() -> Desktop {
     })
 }
+/// The theme over the window's backdrop, as the kit draws it.
+pub fn over_backdrop(theme: ui::Theme) -> ui::Theme {
+    theme.over_backdrop()
+}
 /// Menus in `appearance` as the desktop draws its own: libadwaita's popover menus on GNOME
 /// and Breeze's on KDE, each moving as that desktop moves them.
 pub fn menu(appearance: Theme) -> Option<ui::Menu> {

crates/snowbound/src/macos.rs+5

 @@ -246,6 +246,11 @@ pub fn represent(window: &Window, file: Option<&std::path::Path>) {
     }
 }
+/// The theme over the window's backdrop, as the kit draws it.
+pub fn over_backdrop(theme: ui::Theme) -> ui::Theme {
+    theme.over_backdrop()
+}
 /// None: the kit's own menus stand in for AppKit's.
 pub fn menu(_: winit::window::Theme) -> Option<ui::Menu> {
     None

crates/snowbound/src/main.rs+7-3

crates/snowbound/src/sidebar.rs+2-2

...	@@ -584,7 +584,7 @@ fn tree_row(ui: &mut Ui, tree: &mut Tree, id: Id, row: Row) -> (Signal, bool) {	...	@@ -584,7 +584,7 @@ fn tree_row(ui: &mut Ui, tree: &mut Tree, id: Id, row: Row) -> (Signal, bool) {
584	flags: Flags::CLICKABLE,	584	flags: Flags::CLICKABLE,
585	size: [fill(), px(ROW)],	585	size: [fill(), px(ROW)],
586	fill: lit,	586	fill: lit,
587	hover_fill: Some(ui::mix(lit.unwrap_or(theme.strip), theme.hover(), 0.6)),	587	hover_fill: Some(ui::mix(lit.unwrap_or(theme.sidebar), theme.hover(), 0.6)),
588	radius: 4.0,	588	radius: 4.0,
589	pad: [6.0 + INDENT * row.depth as f32, 0.0],	589	pad: [6.0 + INDENT * row.depth as f32, 0.0],
590	// The field's text stands where the label did.	590	// The field's text stands where the label did.
...	@@ -681,7 +681,7 @@ impl crate::State {	...	@@ -681,7 +681,7 @@ impl crate::State {
681	Spec {	681	Spec {
682	flags: Flags::CLIP,	682	flags: Flags::CLIP,
683	size: [px(width), fill()],	683	size: [px(width), fill()],
684	fill: Some(theme.strip),	684	fill: Some(theme.sidebar),
685	..Spec::default()	685	..Spec::default()
686	},	686	},
687	);	687	);

crates/snowbound/src/windows.rs+65-17

 @@ -234,6 +234,12 @@ unsafe extern "system" fn frame_procedure(
     match message {
         // Accent colours and transparency effects reach the window only as settings.
         wm::WM_SETTINGCHANGE | wm::WM_DWMCOLORIZATIONCOLORCHANGED => {
+            if message == wm::WM_SETTINGCHANGE && setting(lparam) == "ImmersiveColorSet" {
+                refresh_color_policy();
+                if ACRYLIC.load(Ordering::Relaxed) {
+                    accent(hwnd, Accent::Acrylic);
+                }
+            }
             if let Some(proxy) = QUIT.get() {
                 let _ = proxy.send_event(crate::UserEvent::Appearance);
             }
 @@ -252,6 +258,33 @@ unsafe extern "system" fn frame_procedure(
     result.unwrap_or_else(|| previous(message, wparam, lparam))
 }
+/// The setting a `WM_SETTINGCHANGE` names, if any.
+fn setting(lparam: LPARAM) -> String {
+    if lparam == 0 {
+        return String::new();
+    }
+    let text = lparam as *const u16;
+    let length = (0..).take_while(|&i| unsafe { *text.add(i) } != 0).count();
+    String::from_utf16_lossy(unsafe { std::slice::from_raw_parts(text, length) })
+}
+/// Has uxtheme read the apps' colour mode again: it answers winit's `ShouldAppsUseDarkMode`
+/// from a cache that a change of mode otherwise leaves stale.
+fn refresh_color_policy() {
+    // RefreshImmersiveColorPolicyState is exported by ordinal alone, and 104 only from 1809.
+    if version() < (10, 0, 17763) {
+        return;
+    }
+    let refresh = unsafe {
+        let module = LoadLibraryW(wide("uxtheme.dll").as_ptr());
+        GetProcAddress(module, 104 as *const u8)
+    };
+    if let Some(refresh) = refresh {
+        let refresh: unsafe extern "system" fn() = unsafe { std::mem::transmute(refresh) };
+        unsafe { refresh() };
+    }
+}
 type Procedure<'a> = &'a dyn Fn(u32, WPARAM, LPARAM) -> LRESULT;
 /// The frame over glass or Mica: the system's frame keeps its sides and bottom, the caption
 @@ -383,7 +416,7 @@ fn drawn_frame(
             None
         }
         wm::WM_EXITSIZEMOVE if ACRYLIC.load(Ordering::Relaxed) => {
-            accent(hwnd, Accent::Acrylic(ACRYLIC_TINT.load(Ordering::Relaxed)));
+            accent(hwnd, Accent::Acrylic);
             None
         }
         _ => None,
 @@ -409,15 +442,13 @@ pub fn cuts_corners() -> bool {
     false
 }
-/// Whether Windows 10 shows acrylic under the window, which a drag swaps for plain blur,
+/// Whether Windows 10 shows acrylic under the window, which a drag swaps for plain blur.
-/// and the tint it shows it with.
 static ACRYLIC: AtomicBool = AtomicBool::new(false);
-static ACRYLIC_TINT: AtomicU32 = AtomicU32::new(0);
 enum Accent {
     Blur,
-    /// Acrylic tinted with an `0xAABBGGRR` colour.
+    /// Acrylic in the shell's own tints: Windows 10's light and dark flyouts.
-    Acrylic(u32),
+    Acrylic,
 }
 /// Windows 10's accent under the window, through the undocumented
 @@ -448,10 +479,15 @@ fn accent(hwnd: HWND, accent: Accent) -> bool {
             tint: 0,
             animation: 0,
         },
-        Accent::Acrylic(tint) => Policy {
+        Accent::Acrylic => Policy {
             state: 4,
             flags: 2,
-            tint,
+            // 0xAABBGGRR, after the apps' colour mode.
+            tint: if registry_dword(PERSONALIZE, "AppsUseLightTheme") == Some(0) {
+                0xcc20_2020
+            } else {
+                0xccf3_f3f3
+            },
             animation: 0,
         },
     };
 @@ -466,12 +502,11 @@ fn accent(hwnd: HWND, accent: Accent) -> bool {
 /// Whether Personalization's transparency effects are on, as acrylic and Mica need.
 fn transparency() -> bool {
-    registry_dword(
+    registry_dword(PERSONALIZE, "EnableTransparency") != Some(0)
-        r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
-        "EnableTransparency",
-    ) != Some(0)
 }
+const PERSONALIZE: &str = r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
 /// Lays the system's material under the window, which shows through the app's transparent
 /// pixels: Aero glass on Windows 7 while the desktop composes, acrylic on Windows 10 (blur
 /// before its April 2018 update) and Mica on 11. Windows 8 has none.
 @@ -504,11 +539,7 @@ pub fn install_backdrop(window: &Window) -> bool {
             }
         }
         Caption::Drawn if build >= 17134 => {
-            // The shell's own acrylic tints: Windows 10's light and dark flyouts.
+            let shown = accent(hwnd, Accent::Acrylic);
-            let dark = appearance(window) == Theme::Dark;
-            let tint = if dark { 0xcc20_2020 } else { 0xccf3_f3f3 };
-            ACRYLIC_TINT.store(tint, Ordering::Relaxed);
-            let shown = accent(hwnd, Accent::Acrylic(tint));
             ACRYLIC.store(shown, Ordering::Relaxed);
             shown
         }
 @@ -543,6 +574,23 @@ pub fn titlebar(appearance: Theme) -> Option<[[f32; 4]; 2]> {
     })
 }
+/// The theme over the window's material. Over Windows 7's glass, fields and tool buttons
+/// take white faces, as Internet Explorer's do there, so their text and icons stay legible,
+/// and the sidebar stays opaque.
+pub fn over_backdrop(theme: ui::Theme) -> ui::Theme {
+    let sidebar = theme.sidebar;
+    let theme = theme.over_backdrop();
+    if caption() != Caption::Glass || eleven() {
+        return theme;
+    }
+    ui::Theme {
+        sidebar,
+        base: [1.0, 1.0, 1.0, 0.8],
+        tool: [1.0, 1.0, 1.0, 0.35],
+        ..theme
+    }
+}
 /// None: the kit's own menus.
 pub fn menu(_: Theme) -> Option<ui::Menu> {
     None

crates/ui/src/shell.rs+10-3

...	@@ -270,7 +270,7 @@ pub fn tool_button(	...	@@ -270,7 +270,7 @@ pub fn tool_button(
270	size: [px(TOOL), px(TOOL)],	270	size: [px(TOOL), px(TOOL)],
271	icon: Some(icon),	271	icon: Some(icon),
272	color: Some(tint),	272	color: Some(tint),
273	fill: (on == Some(true)).then_some(hover),	273	fill: (on == Some(true)).then_some(hover).or(rest(&ui.theme)),
274	hover_fill: Some(hover),	274	hover_fill: Some(hover),
275	radius: 4.0,	275	radius: 4.0,
276	center: true,	276	center: true,
...	@@ -283,6 +283,11 @@ pub fn tool_button(	...	@@ -283,6 +283,11 @@ pub fn tool_button(
283	ui.signal(id)	283	ui.signal(id)
284	}	284	}
285		285
		286	/// A tool button's face at rest, where the theme gives it one.
		287	fn rest(theme: &crate::Theme) -> Option<[f32; 4]> {
		288	(theme.tool[3] > 0.0).then_some(theme.tool)
		289	}
		290
286	/// Shows button `id` as a toggle, pressed or not, where `on` is given.	291	/// Shows button `id` as a toggle, pressed or not, where `on` is given.
287	fn press_state(ui: &mut Ui, id: Id, on: Option<bool>) {	292	fn press_state(ui: &mut Ui, id: Id, on: Option<bool>) {
288	if let Some(on) = on	293	if let Some(on) = on
...	@@ -404,7 +409,7 @@ pub fn split_button(	...	@@ -404,7 +409,7 @@ pub fn split_button(
404	Spec {	409	Spec {
405	flags: Flags::FLOAT,	410	flags: Flags::FLOAT,
406	size: [px(TOOL + RADIUS), px(TOOL)],	411	size: [px(TOOL + RADIUS), px(TOOL)],
407	fill: fade(lit),	412	fill: fade(lit).or(rest(&ui.theme)),
408	radius: RADIUS,	413	radius: RADIUS,
409	..Spec::default()	414	..Spec::default()
410	},	415	},
...	@@ -476,7 +481,9 @@ pub fn menu_button(	...	@@ -476,7 +481,9 @@ pub fn menu_button(
476	Spec {	481	Spec {
477	flags: Flags::CLICKABLE,	482	flags: Flags::CLICKABLE,
478	size: [px(TOOL + ARROW), px(TOOL)],	483	size: [px(TOOL + ARROW), px(TOOL)],
479	fill: (ui.popup_open(menu) \|\| on == Some(true)).then(\|\| theme.hover()),	484	fill: (ui.popup_open(menu) \|\| on == Some(true))
		485	.then(\|\| theme.hover())
		486	.or(rest(&theme)),
480	hover_fill: Some(theme.hover()),	487	hover_fill: Some(theme.hover()),
481	radius: 4.0,	488	radius: 4.0,
482	role: Some(Role::Button),	489	role: Some(Role::Button),

crates/ui/src/theme.rs+11-2

 @@ -8,9 +8,13 @@ pub struct Theme {
     pub base: [f32; 4],
     /// Side panels.
     pub panel: [f32; 4],
-    /// The window's title bar, toolbar, tab row and sidebar; transparent where the system's
+    /// The window's title bar, toolbar and tab row; transparent where the system's backdrop
-    /// backdrop shows through them.
+    /// shows through them.
     pub strip: [f32; 4],
+    /// The notebook sidebar: the strip's colour, unless kept opaque over a backdrop.
+    pub sidebar: [f32; 4],
+    /// Toolbar buttons at rest: clear, or a face where the backdrop would hide their icons.
+    pub tool: [f32; 4],
     pub accent: [f32; 4],
     /// The text caret, and selected text's fill with and without keyboard focus; the
     /// platform's own where it has them.
 @@ -139,6 +143,8 @@ impl Theme {
             base: srgb(0x19, 0x1b, 0x1c),
             panel: srgb(0x1f, 0x22, 0x23),
             strip: srgb(0x27, 0x2a, 0x2b),
+            sidebar: srgb(0x27, 0x2a, 0x2b),
+            tool: [0.0; 4],
             accent: srgb(0x00, 0x79, 0xa6),
             caret,
             selection,
 @@ -168,6 +174,8 @@ impl Theme {
             base: srgb(0xfc, 0xfc, 0xfd),
             panel: srgb(0xf4, 0xf5, 0xf7),
             strip: srgb(0xeb, 0xed, 0xf0),
+            sidebar: srgb(0xeb, 0xed, 0xf0),
+            tool: [0.0; 4],
             accent: srgb(0x00, 0x79, 0xa6),
             caret,
             selection,
 @@ -196,6 +204,7 @@ impl Theme {
         let text = |alpha| [self.text[0], self.text[1], self.text[2], alpha];
         Self {
             strip: [0.0; 4],
+            sidebar: [0.0; 4],
             text_dim: text(0.5),
             chip: text(0.1),
             base: text(0.05),

...	@@ -876,7 +876,9 @@ impl State {	...	@@ -876,7 +876,9 @@ impl State {
876	theme(appearance, stored.light_pages, backdrop),	876	theme(appearance, stored.light_pages, backdrop),
877	platform::double_click_interval(),	877	platform::double_click_interval(),
878	);	878	);
879	let titlebar = platform::titlebar(appearance).unwrap_or([ui.theme.strip; 2]);	879	let titlebar = platform::titlebar(appearance)
		880	.filter(\|_\| !backdrop)
		881	.unwrap_or([ui.theme.strip; 2]);
880	// A window shown but never focused hears no focus event; a hidden one draws as focused.	882	// A window shown but never focused hears no focus event; a hidden one draws as focused.
881	ui.window_focused = !visible \|\| window.has_focus();	883	ui.window_focused = !visible \|\| window.has_focus();
882	platform::system_interface(&mut ui);	884	platform::system_interface(&mut ui);
...	@@ -1118,7 +1120,9 @@ impl State {	...	@@ -1118,7 +1120,9 @@ impl State {
1118	/// Takes `appearance`'s colours.	1120	/// Takes `appearance`'s colours.
1119	fn set_appearance(&mut self, appearance: winit::window::Theme) {	1121	fn set_appearance(&mut self, appearance: winit::window::Theme) {
1120	self.ui.theme = theme(appearance, self.light_pages, self.surface.translucent());	1122	self.ui.theme = theme(appearance, self.light_pages, self.surface.translucent());
1121	self.titlebar = platform::titlebar(appearance).unwrap_or([self.ui.theme.strip; 2]);	1123	self.titlebar = platform::titlebar(appearance)
		1124	.filter(\|_\| !self.surface.translucent())
		1125	.unwrap_or([self.ui.theme.strip; 2]);
1122	}	1126	}
1123		1127
1124	/// Takes the colour scheme chosen, or the system's where it follows the system.	1128	/// Takes the colour scheme chosen, or the system's where it follows the system.
...	@@ -3702,7 +3706,7 @@ fn theme(appearance: winit::window::Theme, light_pages: bool, backdrop: bool) ->	...	@@ -3702,7 +3706,7 @@ fn theme(appearance: winit::window::Theme, light_pages: bool, backdrop: bool) ->
3702	[theme.paper, theme.paper_ink] = [light.paper, light.paper_ink];	3706	[theme.paper, theme.paper_ink] = [light.paper, light.paper_ink];
3703	}	3707	}
3704	if backdrop {	3708	if backdrop {
3705	theme.over_backdrop()	3709	platform::over_backdrop(theme)
3706	} else {	3710	} else {
3707	theme	3711	theme
3708	}	3712	}