Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Tue, Nov 16, 2021 at 12:50:29AM +, Thomas Adam wrote: > For the current documentation work you're sending patches for, I'm doing the > same thing, but I presume if you're squashing or editing changes together, it > makes it harder for me to know what I'm supposed to be tracking, that's all. Actually, I didn't edit patches until half an hour ago, and I'm not sure why you got a conflict. Well, I had two more unrelated patches at the bottom of the stack, and for the style manpage I moved roughly 2000 lines around in the source file. I have just a local master with a pile of patches, multiple topics in the same branch. The branch is rebased to origin/master once in a while, and certainly before sending patches. If you get conflicts, just ask for new patches. It's not worth the effort that you try to repair anything. Things will get much simpler with the big man page restructuring done. In any case, it's a good if another person looks at patches, not just me. Ciao Dominik ^_^ ^_^ -- Dominik Vogt
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Tue, Nov 16, 2021 at 01:32:11AM +0100, Dominik Vogt wrote: > Sorry, won't work, I've already reordered, merged and edited > patches. I don't want to commit a pile of junk like in CVS times. > With Git I want much higher patch quality. :) I understand that -- I suppose I'm not following your development workflow. When you're sending patches through to the list, I'm taking them as-is and applying them on a branch from master. For the current documentation work you're sending patches for, I'm doing the same thing, but I presume if you're squashing or editing changes together, it makes it harder for me to know what I'm supposed to be tracking, that's all. Kindly, Thomas
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Tue, Nov 16, 2021 at 12:26:45AM +, Thomas Adam wrote: > On Tue, Nov 16, 2021 at 01:13:24AM +0100, Dominik Vogt wrote: > > On Tue, Nov 16, 2021 at 12:09:41AM +, Thomas Adam wrote: > > > On Mon, Nov 15, 2021 at 11:57:54PM +0100, Dominik Vogt wrote: > > > > On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > > > > > 0001: Some man page cleanup. > > > > > 0002: New man page fvwm3menus.1 > > > > > > > > 0003: Fix list formatting (attached). > > > > > > I've applied these three patches now, thanks. > > > > > > They still did not apply cleanly on top of ta/dv-manpage-sections, so I > > > had to > > > manually modify a few sections with the .rej file. > > > > > > Can you check I've not mangled anything? I do note some formatting > > > inconsistencies when viewing fvwm3menus.1 but I don't think that's > > > related to > > > any changes made so far. > > > > Just ignore it, I'll make a cleaned up series later, so we can > > dump the branch. > > That's fine. I'm using that branch to collect all the documentation changes > you're sending through as it's easier to manage -- so if those patches could > be based from that branch, it would certainly help. :) Sorry, won't work, I've already reordered, merged and edited patches. I don't want to commit a pile of junk like in CVS times. With Git I want much higher patch quality. :) Ciao Dominik ^_^ ^_^ -- Dominik Vogt
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Tue, Nov 16, 2021 at 01:13:24AM +0100, Dominik Vogt wrote: > On Tue, Nov 16, 2021 at 12:09:41AM +, Thomas Adam wrote: > > On Mon, Nov 15, 2021 at 11:57:54PM +0100, Dominik Vogt wrote: > > > On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > > > > 0001: Some man page cleanup. > > > > 0002: New man page fvwm3menus.1 > > > > > > 0003: Fix list formatting (attached). > > > > I've applied these three patches now, thanks. > > > > They still did not apply cleanly on top of ta/dv-manpage-sections, so I had > > to > > manually modify a few sections with the .rej file. > > > > Can you check I've not mangled anything? I do note some formatting > > inconsistencies when viewing fvwm3menus.1 but I don't think that's related > > to > > any changes made so far. > > Just ignore it, I'll make a cleaned up series later, so we can > dump the branch. That's fine. I'm using that branch to collect all the documentation changes you're sending through as it's easier to manage -- so if those patches could be based from that branch, it would certainly help. :) Kindly, Thomas
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Tue, Nov 16, 2021 at 12:09:41AM +, Thomas Adam wrote: > On Mon, Nov 15, 2021 at 11:57:54PM +0100, Dominik Vogt wrote: > > On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > > > 0001: Some man page cleanup. > > > 0002: New man page fvwm3menus.1 > > > > 0003: Fix list formatting (attached). > > I've applied these three patches now, thanks. > > They still did not apply cleanly on top of ta/dv-manpage-sections, so I had to > manually modify a few sections with the .rej file. > > Can you check I've not mangled anything? I do note some formatting > inconsistencies when viewing fvwm3menus.1 but I don't think that's related to > any changes made so far. Just ignore it, I'll make a cleaned up series later, so we can dump the branch. Ciao Dominik ^_^ ^_^ -- Dominik Vogt
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Mon, Nov 15, 2021 at 11:57:54PM +0100, Dominik Vogt wrote: > On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > > 0001: Some man page cleanup. > > 0002: New man page fvwm3menus.1 > > 0003: Fix list formatting (attached). I've applied these three patches now, thanks. They still did not apply cleanly on top of ta/dv-manpage-sections, so I had to manually modify a few sections with the .rej file. Can you check I've not mangled anything? I do note some formatting inconsistencies when viewing fvwm3menus.1 but I don't think that's related to any changes made so far. Kindly, Thomas
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Mon, Nov 15, 2021 at 11:01:53PM +, Thomas Adam wrote: > On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > > 0001: Some man page cleanup. > > 0002: New man page fvwm3menus.1 > > Are these patches based off the ta/dv-manpage-sections branch? They don't > apply cleanly via 'git am'. Yes, sorry, forgot to mention that. > > The ending text goes back to the indentation of the section > > heading, or ig "+" is used it's indented like the list text. > > > > The workaround is to start a new list with smaller indentation with > > > > --snip-- > > .:: > > --snip-- > > > > But that creates an additional "." heading. See line 2904. > > Yes. I've not found a good solution to this. I suppose I could ask the > asciidoctor maintainers... It seems that if lists are delimited with "--" lines, the problem goes away. See patch #0003. Ciao Dominik ^_^ ^_^ -- Dominik Vogt
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > 0001: Some man page cleanup. > 0002: New man page fvwm3menus.1 Are these patches based off the ta/dv-manpage-sections branch? They don't apply cleanly via 'git am'. > The ending text goes back to the indentation of the section > heading, or ig "+" is used it's indented like the list text. > > The workaround is to start a new list with smaller indentation with > > --snip-- > .:: > --snip-- > > But that creates an additional "." heading. See line 2904. Yes. I've not found a good solution to this. I suppose I could ask the asciidoctor maintainers... Kindly, Thomas
Re: [PATCH] (2) Split off menu documentation to fvwm3menus.1.
On Mon, Nov 15, 2021 at 11:38:36PM +0100, Dominik Vogt wrote: > 0001: Some man page cleanup. > 0002: New man page fvwm3menus.1 0003: Fix list formatting (attached). Ciao Dominik ^_^ ^_^ -- Dominik Vogt From c23033b58a26b53da0a743c26d8f017719a1d5ac Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Mon, 15 Nov 2021 23:56:39 +0100 Subject: [PATCH 3/3] Fix list formatting. --- doc/fvwm3_manpage_source.adoc | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/fvwm3_manpage_source.adoc b/doc/fvwm3_manpage_source.adoc index ac9d46be..d2bccf28 100644 --- a/doc/fvwm3_manpage_source.adoc +++ b/doc/fvwm3_manpage_source.adoc @@ -2865,44 +2865,37 @@ area. The string consists of spaces, characters and formatting directives beginning with '%'. Any invalid characters and formatting directives are silently ignored: + +-- *%l*, *%c* and *%r*::: Insert the next item label. Up to three labels can be used. The item column is left-aligned (*%l*), centered (*%c*) or right-aligned (*%r*). -+ *%i*::: Inserts the mini icon. -+ *%>* and *%<*::: Insert the sub menu triangle pointing either to the right (*%>*) or to the left (*%<*). -+ *%|*::: The first *%|* denotes the beginning of the area that is highlighted either with a background color or a relief (or both). The second *%|* marks the end of this area. *%|* can be used up to twice in the string. If you do not add one or both of them, fvwm sets the margins to the margins of the whole item (not counting the side picture). -+ *%s*::: Places the side picture either at the beginning or the end of the menu. This directive may be used only once and only as the first or last in the format string. If the *%s* is not at the beginning of the string, menus are not drawn properly. - -+ *Space*, *Tab*, *%Space* and *%Tab*::: Add gap of one space, or a tab, using the width of the menu font. When using a tab, the size of the gap can be one to 8 spaces since the tab position is a multiple of 8 from the edge of the menu. The whole string must be quoted if spaces or tabs are used. -+ *%p*::: Like Space and Tab *%p* inserts an empty area into the item, but with better control of its size (see below). - -.:: - +-- ++ You can define an additional space before and after each of the objects like this + -- 2.30.2
