Skip to content

Commit 9fc759a

Browse files
urbanjosturbanjost
committed
white-space adjustments to help to conform to txt2man(1) utility
A few lines in the help text no longer conformed to the rules used by txt2man(1), causing errors in generating man-pages and an HTML version of the documentation available via the "help" subcommand.
1 parent c5ef60d commit 9fc759a

File tree

1 file changed

+30
-31
lines changed

1 file changed

+30
-31
lines changed

‎src/fpm_command_line.f90

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,25 @@ module fpm_command_line
121121

122122
! '12345678901234567890123456789012345678901234567890123456789012345678901234567890',&
123123
character(len=80), parameter :: help_text_compiler(*) = [character(len=80) :: &
124-
' --compiler NAME Specify a compiler name. The default is "gfortran"',&
125-
' unless set by the environment variable FPM_FC.',&
126-
' --c-compiler NAME Specify the C compiler name. Automatically determined by ',&
127-
' default unless set by the environment variable FPM_CC.',&
128-
' --archiver NAME Specify the archiver name. Automatically determined by ',&
129-
' default unless set by the environment variable FPM_AR.'&
124+
' --compiler NAME Specify a compiler name. The default is "gfortran" ',&
125+
' unless set by the environment variable FPM_FC. ',&
126+
' --c-compiler NAME Specify the C compiler name. Automatically determined by ',&
127+
' default unless set by the environment variable FPM_CC. ',&
128+
' --archiver NAME Specify the archiver name. Automatically determined by ',&
129+
' default unless set by the environment variable FPM_AR. '&
130130
]
131131

132+
! '12345678901234567890123456789012345678901234567890123456789012345678901234567890',&
132133
character(len=80), parameter :: help_text_flag(*) = [character(len=80) :: &
133-
' --flag FFLAGS selects compile arguments for the build, the default',&
134-
' value is set by the FPM_FFLAGS environment variable.', &
135-
' These are added to the profile options if --profile', &
136-
' is specified, else these options override the defaults.',&
137-
' Note object and .mod directory locations are always',&
138-
' built in.',&
134+
' --flag FFLAGS selects compile arguments for the build, the default value is',&
135+
' set by the FPM_FFLAGS environment variable. These are added ',&
136+
' to the profile options if --profile is specified, else these ',&
137+
' these options override the defaults. Note object and .mod ',&
138+
' directory locations are always built in. ',&
139139
' --c-flag CFLAGS selects compile arguments specific for C source in the build.',&
140-
' The default value is set by the FPM_CFLAGS environment',&
141-
' variable.',&
142-
' --link-flag LDFLAGS',&
143-
' select arguments passed to the linker for the build. The',&
140+
' The default value is set by the FPM_CFLAGS environment ',&
141+
' variable. ',&
142+
' --link-flag LDFLAGS select arguments passed to the linker for the build. The ',&
144143
' default value is set by the FPM_LDFLAGS environment variable.'&
145144
]
146145

@@ -705,15 +704,15 @@ subroutine set_help()
705704
'SUBCOMMANDS ', &
706705
' Valid fpm(1) subcommands are: ', &
707706
' ', &
708-
' + build Compile the packages into the "build/" directory. ', &
709-
' + new Create a new Fortran package directory with sample files. ', &
710-
' + update Update the project dependencies. ', &
711-
' + run Run the local package binaries. defaults to all binaries for ', &
712-
' that release. ', &
713-
' + test Run the tests. ', &
714-
' + help Alternate to the --help switch for displaying help text. ', &
715-
' + list Display brief descriptions of all subcommands. ', &
716-
' + install Install project ', &
707+
' + build Compile the packages into the "build/" directory. ', &
708+
' + new Create a new Fortran package directory with sample files. ', &
709+
' + update Update the project dependencies. ', &
710+
' + run Run the local package binaries. defaults to all binaries ', &
711+
' for that release. ', &
712+
' + test Run the tests. ', &
713+
' + help Alternate to the --help switch for displaying help text. ', &
714+
' + list Display brief descriptions of all subcommands. ', &
715+
' + install Install project ', &
717716
' ', &
718717
' Their syntax is ', &
719718
' ', &
@@ -758,7 +757,7 @@ subroutine set_help()
758757
' directory. ', &
759758
' ', &
760759
' If "file" does not exist or cannot be read, then an error occurs and', &
761-
' the program stops. Each line of the file is prefixed with "options"', &
760+
' the program stops. Each line of the file is prefixed with "options" ', &
762761
' and interpreted as a separate argument. The file itself may not ', &
763762
' contain @file arguments. That is, it is not processed recursively. ', &
764763
' ', &
@@ -932,11 +931,11 @@ subroutine set_help()
932931
' default. ',&
933932
help_text_compiler, &
934933
help_text_flag, &
935-
' --list list candidates instead of building or running them ', &
936-
' --tests build all tests (otherwise only if needed) ', &
937-
' --show-model show the model and exit (do not build) ', &
938-
' --help print this help and exit ', &
939-
' --version print program version information and exit ', &
934+
' --list list candidates instead of building or running them ', &
935+
' --tests build all tests (otherwise only if needed) ', &
936+
' --show-model show the model and exit (do not build) ', &
937+
' --help print this help and exit ', &
938+
' --version print program version information and exit ', &
940939
' ', &
941940
help_text_environment, &
942941
' ', &

0 commit comments

Comments
 (0)