diff --git a/.gitignore b/.gitignore index c36c451..d262cab 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ debian/*.tmp debian/errors *.tmp errors -test.tcl +test.* diff --git a/debian/changelog b/debian/changelog index 3a50e1a..ff3847f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +projman (2.0.0-beta6) stable; urgency=medium + + * Добавил отображение цитат. + + -- Sergey Kalinin Wed, 8 Apr 2026 19:55:34 +0300 + projman (2.0.0-beta6) stable; urgency=medium * Добавил обновление информации в просмотрщике MD при сохранении открытого в редакторе файла. @@ -559,4 +565,5 @@ projman (2.0.0-alfa0) stable; urgency=medium + diff --git a/lib/editor.tcl b/lib/editor.tcl index c316fd8..edaad56 100644 --- a/lib/editor.tcl +++ b/lib/editor.tcl @@ -1462,7 +1462,25 @@ namespace eval Editor { } set fileType [string toupper [string trimleft [file extension $fileFullPath] "."]] - if {$fileType eq ""} {set fileType "Unknown"} + # Set file type if file extention is digits + switch -regexp -- $fileType { + [[:digit:]]+ { + if {[FileOper::GetFileMimeType $fileFullPath] eq "troff"} { + set fileType TROFF + } else { + set fileType "Unknow" + } + } + ^$ { + if {[FileOper::GetFileMimeType $fileFullPath] eq "troff"} { + set fileType TROFF + } else { + set fileType "Unknow" + } + } + } + DebugPuts "Editor::Editor: file type is \"$fileType\"" + # if {$fileType eq ""} {set fileType "Unknown"} ExecutorCommandPathSetting $fileType @@ -1510,7 +1528,7 @@ namespace eval Editor { puts $fileFullPath } # puts [$w.panelTxt panes] - DebugPuts "$w $fileType $nb $fileFullPath" + DebugPuts "Editor::SplitEditorForExecute: $w $fileType $nb $fileFullPath" # set fileType [string toupper [string trimleft [file extension $filePath] "."]] diff --git a/lib/files.tcl b/lib/files.tcl index 3f67ab1..0569b73 100644 --- a/lib/files.tcl +++ b/lib/files.tcl @@ -76,7 +76,13 @@ namespace eval FileOper { } # линуксовый file не всегда корректно определяет тип файла # используем пакет из tcl - lassign [::fileutil::fileType $fileFullPath] fType fBinaryType fBinaryInterp + if { $fType eq "text" && $fExt eq "troff"} { + set fType $fExt + set fBinaryType "text" + set fBinaryInterp "groff" + } else { + lassign [::fileutil::fileType $fileFullPath] fType fBinaryType fBinaryInterp + } DebugPuts "File type is $fType, $fBinaryType, $fBinaryInterp" set ext [string tolower [file extension $fileFullPath]] @@ -140,6 +146,9 @@ namespace eval FileOper { } } } + "troff" { + return troff + } "empty" { return text } @@ -536,7 +545,7 @@ namespace eval FileOper { set fileType [FileOper::GetFileMimeType $fileFullPath] } - # puts "$fileType <<<<<<<<<<<" + DebugPuts "FileOper::Edit: file type is \"$fileType\"" switch $fileType { "text" { diff --git a/lib/procedure.tcl b/lib/procedure.tcl index 1801695..eef1b36 100644 --- a/lib/procedure.tcl +++ b/lib/procedure.tcl @@ -925,6 +925,22 @@ proc Execute {filePath w activeEditor} { # Added executor from config set fileType [string toupper [string trimleft [file extension $filePath] "."]] + switch -regexp -- $fileType { + [[:digit:]]+ { + if {[FileOper::GetFileMimeType $filePath] eq "troff"} { + set fileType TROFF + } else { + set fileType "Unknow" + } + } + ^$ { + if {[FileOper::GetFileMimeType $filePath] eq "troff"} { + set fileType TROFF + } else { + set fileType "Unknow" + } + } + } if {[info exists cfgVariables($fileType)] != 0 && $cfgVariables($fileType) ne ""} { $w.frame.text insert end "$cfgVariables($fileType) %f" } @@ -1131,7 +1147,7 @@ proc ExecutorCommandPathSetting {fileType} { } if {[info exists cfgVariables($fileType)] == 0} { set cfgVariables($fileType) "" - DebugPuts $cfgVariables($fileType) + DebugPuts "ExecutorCommandPathSetting: cfgVariables($fileType) = $cfgVariables($fileType)" } } diff --git a/projman.tcl b/projman.tcl index 6e1e702..761e8da 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish8.6 "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: beta6 -# Build: 08042026181732 +# Build: 08042026195602 ###################################################### # определим текущую версию, релиз и т.д.