[Pcb-src-changes] pcb.git: branch: master updated (520177fc69554ce68c0b242e3c0fec5945c10ed9)

[<gi...@gp...>]

The branch, master has been updated
       via  520177fc69554ce68c0b242e3c0fec5945c10ed9 (commit)
      from  bf9aa530be0cd35dcf12e64f5bad6315652bff11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/pcb-printf.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


=================
 Commit Messages
=================

commit 520177fc69554ce68c0b242e3c0fec5945c10ed9
Author: Andrew Poelstra (local) <apo...@wp...>
Commit: Andrew Poelstra (local) <apo...@wp...>

    Move pcb-printf #if 0 guards for %mr specifier to fix internationalization
    
    Since the previous version of pcb cannot read files with suffixes
    on its measures, right now the %mr specifier outputs measures in
    cmils, no suffix.
    
    The future behavior would be to select appropriate units and use
    those, but for now this is disabled by an #if 0 block around the
    relevant call to CoordToString.
    
    This patch moves the #if 0 block to the suffix-specific part of
    the code, since we DO want the other behavior of the %mr spec,
    specifically, the forcing of '.' as a decimal separator.

:100644 100644 88c98ee... 20d5c9e... M	src/pcb-printf.c

=========
 Changes
=========

commit 520177fc69554ce68c0b242e3c0fec5945c10ed9
Author: Andrew Poelstra (local) <apo...@wp...>
Commit: Andrew Poelstra (local) <apo...@wp...>

    Move pcb-printf #if 0 guards for %mr specifier to fix internationalization
    
    Since the previous version of pcb cannot read files with suffixes
    on its measures, right now the %mr specifier outputs measures in
    cmils, no suffix.
    
    The future behavior would be to select appropriate units and use
    those, but for now this is disabled by an #if 0 block around the
    relevant call to CoordToString.
    
    This patch moves the #if 0 block to the suffix-specific part of
    the code, since we DO want the other behavior of the %mr spec,
    specifically, the forcing of '.' as a decimal separator.

diff --git a/src/pcb-printf.c b/src/pcb-printf.c
index 88c98ee..20d5c9e 100644
--- a/src/pcb-printf.c
+++ b/src/pcb-printf.c
@@ -412,7 +412,9 @@ static gchar *CoordsToString(Coord coord[], int n_coords, const char *printf_spe
           g_string_append_printf (buff, " %s", suffix);
           break;
         case FILE_MODE:
+#if 0
           g_string_append_printf (buff, "%s", suffix);
+#endif
           break;
         }
     }
@@ -549,11 +551,7 @@ gchar *pcb_vprintf(const char *fmt, va_list args)
                 case 'S': unit_str = CoordsToString(value, 1, spec->str, mask & ALLOW_ALL, suffix); break;
                 case 'M': unit_str = CoordsToString(value, 1, spec->str, mask & ALLOW_METRIC, suffix); break;
                 case 'L': unit_str = CoordsToString(value, 1, spec->str, mask & ALLOW_IMPERIAL, suffix); break;
-#if 0
                 case 'r': unit_str = CoordsToString(value, 1, spec->str, ALLOW_READABLE, FILE_MODE); break;
-#else
-                case 'r': unit_str = CoordsToString(value, 1, spec->str, ALLOW_READABLE, NO_SUFFIX); break;
-#endif
                 /* All these fallthroughs are deliberate */
                 case '9': value[count++] = va_arg(args, Coord);
                 case '8': value[count++] = va_arg(args, Coord);