From 01ee141eef08dc3fd47abebca84cfef29ed79eb8 Mon Sep 17 00:00:00 2001 From: Stephen Mildenhall Date: Tue, 10 Jun 2025 21:50:06 +0100 Subject: [PATCH] LPS formatter induced errors... --- doc-test.bat | 27 ++++++++++++++------------- greater_tables/greater_tables.py | 6 ++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/doc-test.bat b/doc-test.bat index bb202e8..d9f0149 100644 --- a/doc-test.bat +++ b/doc-test.bat @@ -3,7 +3,7 @@ setlocal :: --- Configuration --- set "PYTHON_VERSION=3.10" -set "PROJECT_NAME="greater_tables_project" +set "PROJECT_NAME=greater_tables_project" REM set "PROJECT_REPO=https://github.com/mynl/%PROJECT_NAME%.git" set "PROJECT_REPO=c:\s\telos\python\greater_tables_project" set "BUILD_DIR=C:\tmp\%PROJECT_NAME%_rtd_build" @@ -20,6 +20,7 @@ mkdir "%BUILD_DIR%" :: --- Clone Repository --- echo Cloning repository... git clone --depth 1 "%PROJECT_REPO%" "%BUILD_DIR%" +rem git clone "%PROJECT_REPO%" "%BUILD_DIR%" if %ERRORLEVEL% NEQ 0 ( echo Git clone failed. Exiting. exit /b %ERRORLEVEL% @@ -28,20 +29,20 @@ if %ERRORLEVEL% NEQ 0 ( cd "%BUILD_DIR%" :: --- Fetch latest changes --- -echo Fetching latest changes... -git fetch origin --force --prune --prune-tags --depth 50 refs/heads/master:refs/remotes/origin/master -if %ERRORLEVEL% NEQ 0 ( - echo Git fetch failed. Exiting. - exit /b %ERRORLEVEL% -) +rem echo Fetching latest changes... +rem git fetch origin --force --prune --prune-tags --depth 50 refs/heads/master:refs/remotes/origin/master +rem if %ERRORLEVEL% NEQ 0 ( +rem echo Git fetch failed. Exiting. +rem exit /b %ERRORLEVEL% +rem ) :: --- Checkout master branch --- -echo Checking out master branch... -git checkout --force origin/master -if %ERRORLEVEL% NEQ 0 ( - echo Git checkout failed. Exiting. - exit /b %ERRORLEVEL% -) +rem echo Checking out master branch... +rem git checkout --force origin/master +rem if %ERRORLEVEL% NEQ 0 ( +rem echo Git checkout failed. Exiting. +rem exit /b %ERRORLEVEL% +rem ) :: --- Setup Virtual Environment --- echo Creating virtual environment for Python %PYTHON_VERSION%... diff --git a/greater_tables/greater_tables.py b/greater_tables/greater_tables.py index b6a8cc2..0ca4f10 100644 --- a/greater_tables/greater_tables.py +++ b/greater_tables/greater_tables.py @@ -977,8 +977,7 @@ class GT(object): if self.table_width_mode == 'explicit': # target width INCLUDES padding and column marks | target_width = self.max_table_width - (PADDING + 1) * n_col - 1 - logger.info(f'Col padding effect { - self.max_table_width=} ==> {target_width=}') + logger.info(f'Col padding effect {self.max_table_width=} ==> {target_width=}') elif self.table_width_mode == 'natural': target_width = natural + (PADDING + 1) * n_col + 1 elif self.table_width_mode == 'breakable': @@ -2076,8 +2075,7 @@ class GT(object): if i == 1: # first column sets row height for entire row sio.write(f'\tcolumn {i:>2d}/.style={{' - f'nodes={{align={ - ad[al]:<6s}}}, text height=0.9em, text depth=0.2em, ' + f'nodes={{align={ad[al]:<6s}}}, text height=0.9em, text depth=0.2em, ' f'inner xsep={column_sep}em, inner ysep=0, ' f'text width={max(2, 0.6 * w):.2f}em}},\n') else: